gentoo auto-resync : 06:06:2024 - 00:07:57

author: V3n3RiX <venerix@koprulu.sector> 2024-06-06 00:07:58 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-06-06 00:07:58 +0100
commit: 44cec61076bf2bbb3cea1fc89943dd6818a5acc5 (patch)
tree: 68f1cddcf97a0d746c1e9c186171b7bd603efccf
parent: 9d1e33edaf09cde926d589461f40e378d4124be9 (diff)
734 files changed, 6330 insertions, 10183 deletions
diff --git a/Manifest b/Manifest
index 2d6de506b2f6..aec7b3b1055b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29802 BLAKE2B d880979941a3e92a37817585000218f3f60fc2aa564fa8d7e4f0e59f53039a88fb83ddda436bbaa461ded2ac9d6cbdbfd97c4b01c096356215791154decf71d8 SHA512 5710b6ef38b0c54e1762afbb4ca4b98ccf44af7b5ea96595c90f1c95aeb30e077919a520767555cc34a4cefe6eef62451c6732edb76fef36d9289b79f60393a4
-TIMESTAMP 2024-06-04T22:40:41Z
+MANIFEST Manifest.files.gz 29760 BLAKE2B 369cf8132074a1fcba1117a98ad314efdde391513c8c6b57e01028c4a7857d95a37559016c8c22816e4b410efd72e2c9d71f8b9e1a70e6e7dcfd7abb076ada6d SHA512 f5ac7bb37f62cb7e73824f722a5d1c37ffbc97b58c864039b3bf0d93d3fcc0beb9e342acf6291c92b77834872c6cb5772eac54b2869af61031fce9631308d5cd
+TIMESTAMP 2024-06-05T22:40:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZfl+lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZg6W5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCumQ/9Gk5MqmEM+tzKBamM6lJ2P+thpI0yvghYIQKXsBZwBpjyJhQATFbmyRxi
-A6DyQgVDw8xSiJvNmxClk6BEtxqCqubc4AOKC3WxCPNPgmkYZMc4CjmunBXCzOje
-dfiUz/l97xnSGEz8b/i3adp9joeAnNyui6iuSbQmkjJKrdpKgCT5+ePxYLUvJdEo
-rttaui6yVxjKMRsnd5X7vmHaZ/FSCIlRo7yqGp2WjW2hi5Sc1PEZMkMBDluBqqzk
-o0Mq9FYNMTT7RGFcQU1YbMZ9qP4cODWMgtNirzugMRME6GixZNqJYwUtvqjQb6tM
-mxcaWNvtPzAtWpgKGisM8PmfREBd4MdZuWZ95IqzVeoyBgOrL9Fgt0OJATEPVyT9
-FaLKAoVwISa5LHAyBeeNP8KZu3c68H5WsTfPtW4cE5rWYJAv8z2ZXMtbKatVN/2S
-+PADCBASFfuiHYHVitZwQFiFlLa2y0UCmN3ih+x/YdiwivdfVj8z95EbI5hUH8LU
-aLmVgVkUVLOBqoxgSWW8HKcuR/kSsa8FrOOeeGxggGP1M+mGpjjBXG90Gw01O5jw
-hx1TH2VOodnGSPZGbJGqTSaYpv/GClGXlakoSnirbQi0tEc1+Z94UvAcMGn91/8E
-hvGiCpQa1nWesYIdWdsgnDNmgLu2H+7zL64mrHJ+oz6Z8qnP4Uk=
-=1qV+
+klD1qw/+O9FhGMR1S4RClII96tu6kl20xNugScUelcolLduKd0SEta4IWeVJ/RPP
+kT5Irw1/Lk9Non2MsJOfPMDDRHwE2kROFUvnAo7BVa5BYy862rd4zuvoJ3ZAHVuR
+vVuLjT+27Dz5UmSQgqu8LDSltyAsY60dd6O8sm/+Y7sTlConC9RKG/GNBB2z5Qem
+frS11EBhRTBMZp10/q1xk2vHVrWltef2MAFcVMinkXDIN3BtkcOXcZ8sD6rcG1B1
+u/78t+b2W6BCpBE4yLZlJMlidRKWn8+hj1JhM1UL8mqi1uJbEFVIoGJROVzKtwE/
+gKsua9+MYno4AxLY4xxInGW4w0L4OqRW5qxzHkYkqzfBoBwMmkgaM50dRgFPLxEU
+tk1NFbtt5iVFGsVmGYNmo4Tr+6vTc575ORPL8Xv3ekKRQLM/IoQOd62ZY37TkwBf
+bouiSnYI6gsPXNSz+xubq6wOeJNBly3xHBNE0JwF4qd6Z9lWPVwZIz3cFjNQ25BB
+/VtOfPaADT5MfNq/WBWX7Al1QOA/a9NH51zD4ODIEKT4Pkco9D20dvqu80xT42Et
+nHMG6vm4k3JP1ho5DDTM6tBUmsT+pSEzCKEFeUpp2Kn8G3Rb1LQY1CJsnsDqt2X6
+j0/CLbxy096lq76oQExqAEFTOdLEcbG7eb464Xm6fOsCBWw+msU=
+=wQmk
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e4aab3056e0e..401f5aa62461 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 0cd4accc6f90..59f420dd97d8 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index da7b581c6bcf..1c8a6dc254bd 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -35,5 +35,5 @@ DIST cmu_us_slp.flitevox 7280743 BLAKE2B 99d5270f55374cad466de01b1764d1ffd072cd7
 DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230 SHA512 a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41
 DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
 EBUILD flite-2.2-r1.ebuild 4549 BLAKE2B ac7b566c232fef4685b541507faf80a5c084564553eb511d1f700cc4b1af96f72666f7e07143a21d614e089d41d0ae71a6541f82e59c00946a1749b2e4fd17e6 SHA512 9b41f9fdb285329bac07a14a119d3c3e1a0950f9e319425615686a6274bba39ebe0f3f0f746ec0f66729ef5f08ed0b7ca756448ab870d86cf7a515bd727c4e6f
-EBUILD flite-2.2-r2.ebuild 4498 BLAKE2B 4da8768c800927817842aad1e4f19fd5aaa7c295aac5bd725d94221db3aa03b8363193b8b648913aca54e969652789ae6975d2daad8e7228a688539f30cd00b7 SHA512 21149ca0c4f0af4d78a561b2debe98621132c98211adc516192f772974debbf483f4be6ab7cac2b088b0ad26349bd17982d81f263073ca2e9083126c8953a403
+EBUILD flite-2.2-r2.ebuild 4496 BLAKE2B 383bb1b8732745ce3188322e849e949ca380ee3be4f67b501f5958075e66e65430f02bd3da6699779c88c1999bfa81c494a37ee1bf7673c0672c618393d32374 SHA512 25389bc9cec431c21e98e6d0b211c870f73363405a9283980804467f749c54b08db9aea0a27088cba16fdbff2adce126b894173588d48a2c98a8e6a71ed8b348
 MISC metadata.xml 517 BLAKE2B e91b1a0a5e78284d318a97b13637c13666520a280afa818bb7bacabd73d0f8406a6da66899ea4607d1ef3c13f858242e2239eb176dfe24e859c391d16ebed018 SHA512 e9fcd43288f59205389fa9cd35be1da34f014bdbf078891b1f1c51154262562e6ff986a6367035d9ddbfa856c198ba96ed2240b085cdb12ecb746d6b67ad271f
diff --git a/app-accessibility/flite/flite-2.2-r2.ebuild b/app-accessibility/flite/flite-2.2-r2.ebuild
index 985793209a49..f1823711b0dd 100644
--- a/app-accessibility/flite/flite-2.2-r2.ebuild
+++ b/app-accessibility/flite/flite-2.2-r2.ebuild
@@ -44,7 +44,7 @@ SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="alsa oss pulseaudio test voices"
 REQUIRED_USE="test? ( alsa )"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 97e98d00c9e4..aed47c9877a3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6af76661a636..9e59af29954b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.32.108.gh.tar.gz 2728605 BLAKE2B 83606ebe909a4ee3d4f0d2875f56958b
 DIST aws-cli-1.32.113.gh.tar.gz 2730091 BLAKE2B d7c88dd962f1be64fc57f19a3ad247725efdd14b611f752200d333297f99993f896855bc307fcab8ec76c6c00b982dca2f507023211f6ce54bcb6380f71f9dd3 SHA512 9dcc017e8b8ab9d9aef26c7bcbaaeb7256e20ba4abf4fe80580561cb46a61fd5e79e5057dc38b05b1af22a7b03610c88a1babb63c9503b16176010d2903661cb
 DIST aws-cli-1.32.117.gh.tar.gz 2732508 BLAKE2B 699d7596ea0e417f624f72e801d2c6e5c5b73aa1485f830d09923f12d00091e9252517b8f29f20212ddcb18e13b25b43f9545c759c68246a8a9db0a1abb0b047 SHA512 00731d552b372d7d0cd8213f9d645fdaa1b5691b9ee01a0e09ccfce169c0ca97052c03300e824c2522a3ca98a107a67106a31f818884b0050c0f66ba4131d8cd
 DIST aws-cli-1.33.0.gh.tar.gz 2737941 BLAKE2B 1572e517dd627870611b54bae77bb7c6a3eddcb882af0f18a7da51e302dd4db97609d315416cb0acaa1898e08881779a79f9a22795e99de8aa79577d4b858e61 SHA512 4473b068cfc5848335fbcfa0237f1f00d8bb76cde6936d1f07bc6637c6721c3d6ea0172437fcbc99459a6a2508983d598583c8d80c66573752a80615202abf08
+DIST aws-cli-1.33.1.gh.tar.gz 2738329 BLAKE2B 46aea84b6ca6ca43d74bb24236aa3d8b9dbf71ad0197efb349001a6dfebd1d6309c9ed5b37a241a5b472263b2dd6e54a977b32ad2ff387891af863129089c5cc SHA512 2317c1f6c7b8c766ef381401eb45356cc297b35a9fd6431ba38f56f4b9c8e4880d3a71002bdcde088cb71002608c6ea9f15d5d08c50723f1a2f71d389e19408b
 EBUILD awscli-1.32.108.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.113.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.117.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.33.0.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.1.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.1.ebuild b/app-admin/awscli/awscli-1.33.1.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+1).(z+118), sigh
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 7d8ce56291c7..8c10acbd9ad3 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,5 +1,3 @@
-DIST emacs-updater-1.17.tar.xz 7236 BLAKE2B f39a19eba794cd57b25fbfc38998775a7818d98c81bbbdf485b33ed273815dfb3a74c26ca410f0e3b8e4bd46f2114b96155485cdcf87d5bec70a96dfe1a3a279 SHA512 461f496075bd7fc057290d40d408e5243ec464d8814abbe0c47c77a223b314ba2bcc35e20bf5e22e6dcee485a024ab93ced7155fa5212bc2d9c3b6362f168c52
 DIST emacs-updater-1.18.tar.xz 7360 BLAKE2B ff890584349d87a9cdcfe4576dd3bb1f8fc73b6cb086a5dd09fef3c8bf500a519f1aab810321680a5f5d4f1093455a6c54db42d900ee50fc39fcc03f0d6db69e SHA512 15c3b6e5ea7d1935a7e472d75409c0cb0dc9658142c1270a4a487eba822dbcd3ac32ffe60cb501859a7ccb7441efa1c7dd5d3a6cf481f69a583c5c8d5001051a
-EBUILD emacs-updater-1.17.ebuild 955 BLAKE2B eb95c81056fdb432b288c25e559e73158e51a83e1a16bc5af3b46abe188c30148f15ad01492f118980edff408b4c240cab439062625afb5a86d23c30096647dd SHA512 5e5b8a7e59b599e1f80acb0f6055a0117e3b3116cea445bbdb19750a43a192d2fd0d08671052b72b5b94e587c7d94975f4069fad871433b6fb6dcbec7cb5c2f0
-EBUILD emacs-updater-1.18.ebuild 962 BLAKE2B 6e4c2a9fc6dbc5368eecc6643a1a746b9da3d06de96e89ecfc5611601ee63acbc332727405a0086125793f6a902c2386575c8dd775a0d96343c5fedbbf6605df SHA512 bc61152c7f02913e42a84cef91ac7e2f9a611aa11f89acce38072fe10dc9974ca720aa201c2282945ca4b4cdf206bbd68f8359911c56111733d2a94d5f3adb29
+EBUILD emacs-updater-1.18.ebuild 955 BLAKE2B ea59d1460f3d33ff308c8cc6a60c73f159cc3c13eafd272c9682be9bbe783bb6319c6464298e631d16f0e476bad6d95f40f3cc845bfd876334afd99652665641 SHA512 50cbd869ea825271cc69dadb05e07ce3e37a7651579f9b2be21a7d067161e40a002c7aa1b344d55a763b2756b40d92e6600e3943116be05900befd59302f8571
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-admin/emacs-updater/emacs-updater-1.17.ebuild b/app-admin/emacs-updater/emacs-updater-1.17.ebuild
deleted file mode 100644
index 193e60a52c26..000000000000
--- a/app-admin/emacs-updater/emacs-updater-1.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Rebuild Emacs packages"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
-RDEPEND="${DEPEND}
-	>=app-editors/emacs-23.1:*
-	>=app-portage/portage-utils-0.80"
-
-src_prepare() {
-	default
-
-	if ! has_version sys-apps/util-linux; then
-		# BSD ships a dumb getopt(1), so use getopt-long instead
-		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		sed -i -e "1s:/:${EPREFIX}/:" \
-			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX}/:" \
-			emacs-updater || die
-	fi
-}
-
-src_install() {
-	dosbin emacs-updater
-	doman emacs-updater.8
-}
diff --git a/app-admin/emacs-updater/emacs-updater-1.18.ebuild b/app-admin/emacs-updater/emacs-updater-1.18.ebuild
index f9cebdcb57a7..5c3df85ff7ea 100644
--- a/app-admin/emacs-updater/emacs-updater-1.18.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c62de1616557..d3499c444b6a 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/gaffitter/Manifest b/app-cdr/gaffitter/Manifest
index 1ef6818a13aa..f964e29b30b9 100644
--- a/app-cdr/gaffitter/Manifest
+++ b/app-cdr/gaffitter/Manifest
@@ -1,5 +1,7 @@
 AUX gaffitter-0.6.0-fix-build-system.patch 704 BLAKE2B 74e97a02e2f169a0c30a91f5bbd6f80073ef683d183aa126af5a56b056bea4c43fecb2125e24e43735d59bf1b3cfaa57647b44291df9d93bc863241041c5edfd SHA512 91b0dc7be3329aa408fd4f45f3458a116b8649d238c3a5431ba5b7e847451f9ae4d342fce8a284b30605c8628ca608ee877b4ee63add4b946db6f36ba6ddc263
 DIST gaffitter-0.6.0.tar.bz2 44433 BLAKE2B 8ae8fb68711168619e69b79c8544dcb926e984ed3e311062060c71f691588c581fb90744c3e984847bd3061e6ed18e6ae07896af8812d6896fb27291af9450e0 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6
+DIST gaffitter-1.0.0.tar.gz 50827 BLAKE2B 0056ece791fa5531087d35ac3282087bbacc7c0c8bf362986e964b46262213ffd5b1a03392cbb4efa97264ca4d5203126c67cc5f0980034304245c25189f4c8d SHA512 86d90d03b06346333f6770f81b5cd0916180f12e77b1ee491a75190a24c584ecfbb2d2b85bbb8c271a122ad6309ba13acb3bcdfa6b96a38083fe68bf7e8433ff
 DIST scripts-0.1.0.tar.bz2 5859 BLAKE2B fa774440d9f5b1e8c3a1b4cfd2d65d1d943a904d196df2657ff12e079266b211476bd61b2514be9f629522106ef0b1ef2b21fbb8e0431bf4c6a04273fe3d8a83 SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20
 EBUILD gaffitter-0.6.0-r2.ebuild 906 BLAKE2B f6d58909c66467efb09bc2cd4312911472db4a39479d0de633740dee16998384d63f60af101f07a0eec274822d8de72c756ca38331d1efa505636b57a42f2125 SHA512 0b645ab23affd721695dedfaa7be6b59b9d7d772ff655ab7e96bae5cf0e2790a619aecc4708cac93f87537d3b107fe7407b052f0e4b3b2298ceef8ff2a372cc1
+EBUILD gaffitter-1.0.0.ebuild 879 BLAKE2B 7d0a04a81e59e204fb113dce13689559cead4cb313143ba2559b7e23c08f4950162e9cbe14a4b21ba57da5687a31c6dc1c371fed9c6727453f9d37d74bdd4dbc SHA512 75879d7e54a46ebd0df19a3a709db25d344f40086ab39b170796f49337cd6885f30a30e0f634607d7fd7a94ffe4cc5a6a9f25e1b3b162a8570cab25cd6e39709
 MISC metadata.xml 351 BLAKE2B 4cc047b7c07fe53d30b4f7fbc28d758c4904183e3c53487907966a8b7fce51f40931d78503f2f79e60c05f99614bbf0b82b19457f3df88ebdeeeb0c1a1a080e1 SHA512 2d92ff63dfa00d8300b4c7dc8ced295640fdc48f7b256c2639e4c43d7e0552fb81d9c93b7f8c1c0b922abf7c94f03127b4d621c0e6f7ccc662dcb680ba5d5d5c
diff --git a/app-cdr/gaffitter/gaffitter-1.0.0.ebuild b/app-cdr/gaffitter/gaffitter-1.0.0.ebuild
new file mode 100644
index 000000000000..9a4bedbd6d77
--- /dev/null
+++ b/app-cdr/gaffitter/gaffitter-1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+SV="0.1.0"
+SCRIPTS="scripts-${SV}"
+
+DESCRIPTION="Genetic Algorithm File Fitter"
+HOMEPAGE="https://gaffitter.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/${PN}/${P}.tar.gz
+	scripts? ( https://downloads.sourceforge.net/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scripts"
+
+src_prepare() {
+	default
+	if use scripts; then
+		sed -i -re "s:--data((cd)|(dvd)):--data:" "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-k3b || die
+	fi
+	cmake_src_prepare
+}
+
+src_install() {
+	newbin "${BUILD_DIR}"/fit ${PN}
+	einstalldocs
+
+	if use scripts; then
+		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-{brasero,iso,k3b}
+		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-gaff-k3b-{cd{,-split},dvd{,-split}}
+	fi
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 021b5175e250..d960d9f2528f 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index e4fa2f723e5c..59b078a57d2c 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -8,7 +8,7 @@ DIST tpm2-tss-4.0.2.tar.gz 1833499 BLAKE2B 91e70bcc66099fe5d7d53cf98a2c46582e96f
 DIST tpm2-tss-4.1.3.tar.gz 1902009 BLAKE2B d8592f4797a4254883667476efb2fdf3c95547d9c472fe3557031e934c725e20e3cc70a9b7b41eaddac71e8d9f94beb5fbb39aec5d81b3eeb1b612df27312923 SHA512 c9a5e1e90f6545a466d43790ab2d67c52c4b788a0b21f8212575e27e04e0ac663105863fe00824e08a4e56a4f8c6b00c48c1a1c132531b8569cd5042c3bb9e69
 EBUILD tpm2-tss-4.0.1-r1.ebuild 2588 BLAKE2B b9a58449aa540dd800e5453091c464edeba60987e0119044cf0caccfbb14ef7d15c7fc28ee27d45d80044f4b6d4df9c56cbead18fffd4819afd53dde921692f0 SHA512 bad17cc8511c05ff8295c1812ac78f48c097563efe2224d9bcf6d3f1cd131149571596f1fc47a7423ee10b88b7221ae8f52bbe05a01ab402369a66ba0a8e62d5
 EBUILD tpm2-tss-4.0.1.ebuild 2492 BLAKE2B a31affba60e4b53ba69ba9bc3dece3bfca550cad98eb21d5cabb4b24e427b321fdb4104cabe6676e8128719d1e0dbf8992ad778df025f2709aefe078e01c3458 SHA512 502461ec7f03aba7d346ede6db2b0f365f16c5e37d4272f27467f62d84c09c12258994f22733f33e3869fa90fefe1fb2e3004e4ec38e5276a67f1ada32442749
-EBUILD tpm2-tss-4.0.2-r1.ebuild 2645 BLAKE2B ae4b32081dd9628b72daea77600cf15e891d6644923f75124fd5d8343972843a3fbb1d749745aa2af1980dd347506ca834c153bd45e119ee8ba6aadac65b3b8d SHA512 bf6340799f4d3abeb3c012e56f861cab2579a3eefd0c5804997c6e257bc2bd1b789464023b282dc3d3bee1a77f021801ecfdd091c4281b5fdc7d2849fb5cc3d4
+EBUILD tpm2-tss-4.0.2-r1.ebuild 2641 BLAKE2B 905a3a7bdb7998b284c5641236279bde75e02caf751199264f2912707455a13eac628db46fa29589b8b5b0cf2a08163eafa331b86f012d3b9aa244ddcfd30f56 SHA512 0f4c9b2c9a157f170bc3fdb8f9982845391a1fa2ec0f1a5a87ffacf06261d3e1e00a7cc905975148e5433a68e9276fb247a0ce51acdd698d33761ce09964c969
 EBUILD tpm2-tss-4.0.2.ebuild 2583 BLAKE2B dddc3558af2f942663de1157c99fb4d26a845d51684f94b9c2d95b3af82cd1744852fe69c45d7aeedf45e68a334f76ddb081b1fd1fe5db8208d5dd64ebac0afb SHA512 7df61c8d336026c2679071571ed48143d5a4c367677f2b40b514832a15d468c1d8bc03f0bea61922a42faf304b5743f000cce6903193b16ad63d72679eb7c873
 EBUILD tpm2-tss-4.1.3.ebuild 2514 BLAKE2B c669ba0828072e0c664492e697bbad79f8d4167e5f533db041e44c89714f3ff002a651b795eea31a5de310cbb9d0b47097c6680d55bab268cb5fab2b24355e4d SHA512 0edda24ab12c9599e7826d8c62841d71e69cd5de4751faad15e5b470a6b97c5bd93af5dd2410fd6bf994b79bbb84f36c92e1d18c8d58dd08a0196c3b8a228a5f
 MISC metadata.xml 835 BLAKE2B 58fcbb63b8fd77dd42f081e060cec1fc5593d13ad9237bd644462fd839a1fea9936342d5339a3ec8d339106ca6074c73ac31e7546feb0f1c5f0f212b21831d8a SHA512 941bfce986619b387410d49fe046218a388243c257a3164293033f8ebb4e2d64d7ff06d35dd4ef770a9e9194035839d68dcf1f00edbe439272c2e9c01ecb3c6b
diff --git a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
index 1ada848dd5d2..c1a6fac42473 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-4.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc +fapi +openssl mbedtls +policy static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 75c20d464410..dd4c45ca7f4f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/cider/Manifest b/app-emacs/cider/Manifest
index 02734dc04e4f..67276bc5d1c9 100644
--- a/app-emacs/cider/Manifest
+++ b/app-emacs/cider/Manifest
@@ -2,5 +2,5 @@ AUX 50cider-gentoo.el 213 BLAKE2B 5dfecdc5467e5e359be87197388c33ad5d12f58772755c
 DIST cider-1.13.1.tar.gz 7315314 BLAKE2B 81a0436ccb4a5e0d13e89587d55b4d63da3bca401ef95f995b20a58b8b0a1ed29b81df545135bccecfa601a33ccbad33478658afe612b179bbb3c38e5f6f60c4 SHA512 2d689f0e6bdcf778d86052c3d06e2e68e8ea37f4550979fb760ba57d1f0c6a9f3833d4c8ba265ddb641330cb22058abf095f87dd0bd93b40341c77be286ed5ad
 DIST cider-1.14.0.tar.gz 7324413 BLAKE2B 6340b222e4cac6c9fb05d409380d766e497321e161a70cfdc29db78cc253cf39d4275ee9d8caaa825fe164fd251b2e64b76bf53bfea6671ea1b871ef91b31454 SHA512 b88b75547ee807e072a8e56471ce4a9c79a8c9a32c5c2fa0d5a4ad6527c94a0d409c3f5a89daa49024bcd0fb16f6bc8bbd3985cacc20cdba50e3675e7e995145
 EBUILD cider-1.13.1.ebuild 1177 BLAKE2B e8790f99f11a1abc9477cf4967fc65ca263d6807d15f4f11e015028610daf441df5961ecc7fc7a80f0985d44e82e7752ef4e5ffa63e3e78066b2569d58cc6aa5 SHA512 aa12fc65f169b14ddb46f7fd8f05f32bf2661f720175c24711d650f5c6ee872aef8a8d531c2c7b351d317ac49aab4963db4aafa94242fe18f6cc1bf762f9abfc
-EBUILD cider-1.14.0.ebuild 1178 BLAKE2B eb32e32d02fcdaecdf2a015d9569742d8f5ad7e52c6600b67530d7864ca6a2ab1dfffdf762bfc444f7638494361b5c2038978ad408b73432f38e9a117924dedd SHA512 51cc1b71bbcfc9e3018681cbddc5d8a7c6068eec578cd2a78f8c7df82d1d304e0383f2989b5f42946c0fe0f261e43f7273f952fb80e3123dab4ee7953c3d8917
+EBUILD cider-1.14.0.ebuild 1379 BLAKE2B 62e3534bde258908b4aaa3abd5c776871543b95886a36ecef54ea691f298b829a4ef2b2165fceb7eeae1d529e60eaf6cfbfe3d8f1d5fbdfedb8fc6163c8b6c6a SHA512 43b5d3f7297ac1ca09a88c79f1c1390167723c3074b3b390aef395efbe7ef143d71cb2b0c06dde6dc46d88d79634148148b4ee3b516212534c27dc7ac2c88210
 MISC metadata.xml 935 BLAKE2B 866459527ea892f48cad2d9e72a5795360e541f5be6c805f0d4fe406244cb63bed93744630c0c4bc75fdd4bed3e2b86af2621deba1d6361787bcfba0b0217abb SHA512 76ed7275992cb1d0c9021ebb646768a76f60b5ffe303659c6f8579d86c4617c916ccacc0bd33a4582cd17bca941f5480d68a19879231622ac20af402f3d29458
diff --git a/app-emacs/cider/cider-1.14.0.ebuild b/app-emacs/cider/cider-1.14.0.ebuild
index ed8a5e1da7ca..ae265c008537 100644
--- a/app-emacs/cider/cider-1.14.0.ebuild
+++ b/app-emacs/cider/cider-1.14.0.ebuild
@@ -39,17 +39,20 @@ BDEPEND="
 	test? ( app-emacs/buttercup )
 "
 
+# The "clojure-ts-mode" is currently unpackaged, so remove related tests.
 ELISP_REMOVE="
 	test/${PN}-jar-tests.el
+	test/${PN}-repl-tests.el
+	test/clojure-ts-mode/${PN}-connection-ts-tests.el
+	test/clojure-ts-mode/${PN}-selector-ts-tests.el
+	test/clojure-ts-mode/${PN}-util-ts-tests.el
 	test/enrich/${PN}-docstring-tests.el
 	test/integration/integration-tests.el
 "
 DOCS=( CHANGELOG.md README.md ROADMAP.md refcard )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	buttercup -L . -L test --traceback full || die "tests failed"
-}
+elisp-enable-tests buttercup test
 
 src_install() {
 	elisp_src_install
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7511e5cd6063..6a411f83e6df 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 165c2fd2ecf7..349dafa4552b 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -3,6 +3,6 @@ DIST cloud-init-22.4.tar.gz 1494295 BLAKE2B 5f961c895c0d6c78a7cee47d2b52acd57d95
 DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359 SHA512 34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13
 EBUILD cloud-init-22.2.2.ebuild 2349 BLAKE2B 7d07d812fd91251e685abc7896c27d37f6b73c8fe6459fbb844e009fac79b29621f4f6dfc1e5f53f62dea78f3e49ebf44fc27ba486e3d0df0ba59978a60e3608 SHA512 561c83ee47dbb3ea4c6265cfcf79b10e9feff76a1ed3c9a7cc6d09e7b1cb730e3684c89bc12eff0d3cd943cc0529aad469aeedf2a953f86782cbe363d6103982
 EBUILD cloud-init-22.4.ebuild 2360 BLAKE2B 40394aaadaacb9b629b521f612aac61bb995f4d179c324ed20f5fcd479d42356af2ec1a8f5476cbed047d8d590a4c2925aeac42b16f8701eef526c72a1b5da58 SHA512 a9a56b8d950bb123b4dc634da1b532ab529c963433e0295b9c5e03536abe288f51cfa37cb3a4d0720fdfae199d20e73c85d6f860e8b0fa9dd6d4ba9a39616f92
-EBUILD cloud-init-23.4.ebuild 2365 BLAKE2B d85524509daaab0c9aab97da1ae3cc23d818c80a524d42e219282ab6bd60ec94adb885906842e52ebc87a23ada6bc2788521fd77916222a0bf70c9f7e095827e SHA512 2c541f842cd337846495f2d905f9ebc953cd553c445376927dadfce0c7602e89a1545888231bf3418fd3b00a703a30c12e7d6ce6f6f6fba894ecb04f25746569
+EBUILD cloud-init-23.4.ebuild 2364 BLAKE2B a9a9989139ac462dfd1946adf8fb40c84ea60450477db2201d0264d1b79b1e01d57ee72ba3152b534708da9bc1ce8993685de0dc379f8e1c1a9c6a24d5f54aba SHA512 4c46248313482d5d774d2401cad716e860987dc6b6219100116de6209e0194c60e2192457573c73237600d31b56d3f90c8811f861f18f671692bfb184d0904d4
 EBUILD cloud-init-9999.ebuild 2327 BLAKE2B 3da5e804a5e009d0cb3181c9e70bcf9a3dbbcb234fbc0f29fc3418d467ec09aa98ee101f9562ac792f03a6ea0c2e0eaea40d1d7f6f4d51bd5417f16a5bd5dfac SHA512 7f5179f3c0d3433415f9a84b744fda5b09d6feb8b2bdb4bf134f27e23ebde917baae5ebdaa482e68e65da433031160b644268e7c90660fecc796622ca1a97610
 MISC metadata.xml 714 BLAKE2B 22888016216cea9e471f7cef63e94022c344961263a3319508d5b23db64eeaaeb34a470fc51482bf7a0a4cb658dd814f5655393ee4498a7212ccec28caee5256 SHA512 3bd7be60f29d5a1e4a830577c0afc8c5925123f1258a78b82dbc36c8f76f096149db8bcebfaf3b6db5feeab0bc82ccb65d7d71ec12feb4f56027f05eeb930401
diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index eba8a0ee55f0..d9af1ace0ad9 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
 else
 	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 86b4d0a3d0c5..528cb21e4d3f 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,7 +1,5 @@
 DIST VBoxGuestAdditions_6.1.50.iso 64051200 BLAKE2B 9eff4a3643579ee0426dbe2b62247b8c89321be495e61469628574445fedc06ff2fb9afa108705cbaf24a13db99b4e6e850c61e5c97343095549f444831fcf62 SHA512 d74ce912dbbcef7f644a9f3ba9917782336cbee8e0756727a8753ffc17486a75e833adaa869e205531bc3b81b9cb26aa9b50f44210e78dceece966687122f6c6
-DIST VBoxGuestAdditions_7.0.14.iso 53526528 BLAKE2B 2ec95d9261d3a7f762f333c1e3eb36f7b75cfd7cf722d1bdcd5c0b38a3a311db82b728fe800aed79b41b979ec345cd2586e3fd8c2d2c54f8b83516061d81d304 SHA512 5aa80b04c567d383793c560eb535babd1ebc4f472aaa51753867dbee00e1f5a3efeb5dd4c9eb1a48149ff0fa2e7598aa68792d3da9959709b619d234c2b57544
 DIST VBoxGuestAdditions_7.0.18.iso 52887552 BLAKE2B 03c2b6a777f37286f97d5e2b3f90bf9592e72f5df45f05dd9ae532c092cc38120475795821a31b6106579e49f86ad0e598b15b63ff52107794d0403fdf617ed9 SHA512 21bac2c7c10b0900c0e29cebd546a31cfb058ce0567166c71d45f150824a8818f739284787181678076982dcf40a2e62578b7a5baf19eabcab4f7385e17d2b44
 EBUILD virtualbox-additions-6.1.50.ebuild 567 BLAKE2B cfacfeed3e15bb0407abaf7b9584d37054ed47cff35bdc80b71f9a97af7a49534ec4ade228ea39e3801f94a25fe6fd872c698d811f14f7ae744e816a0ead9061 SHA512 1fd1aa81f3ff55ca2d71ca5384fdb2bf46c9cdf5bce89917089743a86b92caaf06ffc1e1cf844a10bd2259ebfb59417850eeabd75653cd613c3f64f85ce30c70
-EBUILD virtualbox-additions-7.0.14.ebuild 555 BLAKE2B 2b0398d65ffbc61bb3a6f5833ae5f5fc3bf4582df3caa78007b3da03d840cd2e455cd5bbbe81cbe6b0652613dd7d75acb7d0e0e04312b419717ac7c473ae6163 SHA512 7f10e29a7ee72d988c92228b64a769e00ef42292b26ce61e62182af93938f63489615009f8224b4fef8bd927ee6d24c6301496be50cc3efaa817423b4ac54e84
 EBUILD virtualbox-additions-7.0.18.ebuild 555 BLAKE2B 2b0398d65ffbc61bb3a6f5833ae5f5fc3bf4582df3caa78007b3da03d840cd2e455cd5bbbe81cbe6b0652613dd7d75acb7d0e0e04312b419717ac7c473ae6163 SHA512 7f10e29a7ee72d988c92228b64a769e00ef42292b26ce61e62182af93938f63489615009f8224b4fef8bd927ee6d24c6301496be50cc3efaa817423b4ac54e84
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.14.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.14.ebuild
deleted file mode 100644
index 1cb70c695bbd..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022-2024 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 779dccbfa487..f7810cc28a75 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,7 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.50.tar.gz 11175855 BLAKE2B 898ef92a91dbfb39079f8dfa5f4c1e6d91df66e92deb00849ba1da8a2278e3adcfd5754bf70acc6d8b6d7d6273923999860b71c01de3eaabf4d487d718aa14ef SHA512 818f0564a8ee1266f2d03d6e0d5df44278746067ae86279f6e884f519ad3e923382c7b987b3a58fe95e2aa4f0a53b98d553106b0250923e88989e5fdaa9dc3ae
-DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.14.tar.gz 18331089 BLAKE2B 278341be074c7bb276b90034355da3a55e2ef5efd89ad9a26a8f53b6743890772e1486ed5552ec131a8c80a710405dac284789d71a6c3bbec2dd79cf0e7e0459 SHA512 9301300dd1c2a178c730045128574b99a4a6cd1c2dd3f6a5782a78fa08588a4c5fd9c9ff6b2dbeba04747de915e3342ebbd08a4b9ed4641ff60f90f6a5c7fc3d
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.18.tar.gz 18264093 BLAKE2B 4cd3f87b02f0340e0b226a68a595fd947de490a0eae36471beedb7f154529bc8f095f7512486660c4373a612608f42cbf6764dc84407143a4db9b1b9e684f754 SHA512 c83bdb6de0c98d558b66eaacdcf07baf004559c436201105e97bbdf387743dcefad285528a7de15c75162b38cd3b13d95155304da744a205661adfb692c6d958
 EBUILD virtualbox-extpack-oracle-6.1.50.ebuild 742 BLAKE2B 687dfef72959968f610b73f55ad028e00e59fd9bf4ff7d9d60b77e704bf61395ff1680958455619c5afd2867be365e161e5845b03a53902a7a14f88b7887815a SHA512 00fd45d6068420328b559d7ab7ca491b8dde2b8b96e5bd8a7e46108cf980e38c660425020de6a58501d6b119443f80cbd64fc52ed223f5c9f3ecf8834cf52d02
-EBUILD virtualbox-extpack-oracle-7.0.14-r1.ebuild 797 BLAKE2B 04bab98e17dd3519b1de3a2644a1f150f07bb1b555fb0b65bd8022fd99b71e5631dae91862847feecebb99d7ddac5656fac69e17ab33bb63be5a9c9bbb9a8aa5 SHA512 f28316b58160fcb3e55c72c928974dd1db6239220cc9f61510b9a6408adea2de0cc13faee7e91dcdbe5240eb19f542c85a78c0fea2ac2a2efd37ab0779d05d38
 EBUILD virtualbox-extpack-oracle-7.0.18.ebuild 797 BLAKE2B 04bab98e17dd3519b1de3a2644a1f150f07bb1b555fb0b65bd8022fd99b71e5631dae91862847feecebb99d7ddac5656fac69e17ab33bb63be5a9c9bbb9a8aa5 SHA512 f28316b58160fcb3e55c72c928974dd1db6239220cc9f61510b9a6408adea2de0cc13faee7e91dcdbe5240eb19f542c85a78c0fea2ac2a2efd37ab0779d05d38
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.14-r1.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.14-r1.ebuild
deleted file mode 100644
index 14864047f715..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.14-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2024 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}*
-		=app-emulation/virtualbox-kvm-${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 04c4cbfaf230..b54c3017e76f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -7,15 +7,10 @@ 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.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
-DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
 DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 EBUILD virtualbox-guest-additions-6.1.50-r1.ebuild 7489 BLAKE2B 777c460693bb72400c5b287cee323b572fa4d0bbf758346e1059c7db0cd73f1520893e79df1698095fd05d662947630bda85266eef38b0f4e0f1eefafdb4305a SHA512 f7acd23993f08d31ff55d927d5a1576247e6894d517827f0b24cfee38cfc7d62c27fa8b18ca251a859656247e2dc2d595a2405747443f0ec45b25f9631705d49
 EBUILD virtualbox-guest-additions-6.1.50.ebuild 7515 BLAKE2B c431547ddba5da48b1adf38c5586b0716f35bcef669584928e5d8e0611b47afedbf7e928f173d69b40891bd992e394630386587fcf05504bbc03d14251f42b75 SHA512 9c345dff47ab1aecede001e780f61cd51dbd0b4edd6a67491d410d964a387defdb282e13feaf14336291b58c9fb23532c5a438ffa26af7b60d63f75cbb931343
-EBUILD virtualbox-guest-additions-7.0.14-r1.ebuild 7840 BLAKE2B cdb22c8beaea77c064182ecd677087df80a3c282aceb08705fd1024c77bb3ff25fd123b02b7352212d324eabdc5cf779a3b4f9422d27c8f93aed40c52451f74f SHA512 ab436ba5896e7cc44b7d230639e3035519178ebcf06d9d20748dd0f994151056067bd81a5d2a95f518ba9793cc38abfa2cd17e77852db06599d604c1d43447ea
-EBUILD virtualbox-guest-additions-7.0.14-r2.ebuild 7866 BLAKE2B 04d6051b866043522464dcae776474e5776709169745c7a283b7dc3f309ed2f5fddd97680a5b7527427d722c7615f889538cfd95b0fc9ea97657095654692772 SHA512 c4356da414c11158bcae40e46e04cd62afeb6b474cbd1261f45cef8275a658368e51f09d380c72140f0a0c67a1b014b7eebb2500b6781831d4dfba6d605e6753
-EBUILD virtualbox-guest-additions-7.0.14-r3.ebuild 7808 BLAKE2B f93356b04394c3eaa560afced18de849a99006b3d913f6aecbce9cd4f4dbfeac359133c73fe71a2515759176e99c4adf3336769fcbdda75bb0e8bfed936425b4 SHA512 65f6933ff83baaf62b979e685631dbc0b80663fadc39915df41663bd1f647ccf922dfabcd2d850c664b28244a1b2c4318e95a833b24e02e02c5f1ae318b8de74
 EBUILD virtualbox-guest-additions-7.0.18.ebuild 7680 BLAKE2B 8cc5ae244e163327285b9e3dea9387c84d19182237818c173ac031e879ae9ca77b7e9643ec04f396ca8553086cfbdb975f36307f9b847f7fe024729ccb16202c SHA512 272b689ded7bdeafb259e8139f8c932a40b1e0ee7211636a2fe565cbc88a49dc87cecfd5c060fc5e4f0d0c9063bf9fb85fb9b661b66419cbd19c43a630bef50c
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r1.ebuild
deleted file mode 100644
index dc971ed17c12..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 2022-2024 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.14.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-build/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.14/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-guest-additions/virtualbox-guest-additions-7.0.14-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r2.ebuild
deleted file mode 100644
index 80b4916cfe74..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r2.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 2022-2024 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.14.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-build/kbuild-0.1.9998.3127
-	sys-devel/bin86
-	sys-power/iasl
-"
-PDEPEND="
-	gui? ( x11-drivers/xf86-video-vboxvideo )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.8-fix-gcc13.patch
-	"${FILESDIR}"/${PN}-7.0.14-kernel-6.8.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.14/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-guest-additions/virtualbox-guest-additions-7.0.14-r3.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r3.ebuild
deleted file mode 100644
index 92c9fb95c5c6..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.14-r3.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo linux-mod-r1 readme.gentoo-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.14.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-build/kbuild-0.1.9998.3127
-	sys-devel/bin86
-	sys-power/iasl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.8-fix-gcc13.patch
-	"${FILESDIR}"/${PN}-7.0.14-kernel-6.8.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 ~DRM_VMWGFX"
-WARNING_DRM_TTM="DRM_TTM is needed for running the vboxvideo driver."
-WARNING_DRM_VMWGFX="DRM_VMWGFX is the recommended driver for VMSVGA."
-
-DOC_CONTENTS="\n
-Please add users to the \"vboxguest\" group so they can\n
-benefit from seamless mode, auto-resize and clipboard.\n
-\n
-The vboxsf group has been added to make automount services work.\n
-These services are part of the shared folders support.\n
-\n
-Please add:\n
-	/etc/init.d/virtualbox-guest-additions\n
-to the default runlevel in order to start\n
-needed services.\n
-\n
-An autostart .desktop file has been installed to start\n
-VBoxClient in desktop sessions.\n
-\n
-You can mount shared folders with:\n
-	mount -t vboxsf <shared_folder_name> <mount_point>\n
-\n
-Warning:\n
-	this ebuild is only needed if you are running gentoo\n
-	inside a VirtualBox Virtual Machine, you don't need\n
-	it to run VirtualBox itself.\n
-\n"
-
-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.14/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"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-	udev_reload
-
-	if ! use gui ; then
-		elog "The use flag \"gui\" is off, enable it to install the"
-		elog "X Window System drivers and integration."
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-emulation/virtualbox-kvm/Manifest b/app-emulation/virtualbox-kvm/Manifest
index 0817e4837481..130fb0e5bafb 100644
--- a/app-emulation/virtualbox-kvm/Manifest
+++ b/app-emulation/virtualbox-kvm/Manifest
@@ -7,17 +7,12 @@ AUX virtualbox-5-localconfig 1554 BLAKE2B 94526262468f955be321afe21649c1adc38f48
 AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725a247e9c84999786c27398ee9bdc4dd6f62f153202ab2f281ca8fb8445aa369aa1270a00acc6ba7f709f4d7923eea1acf02779827ba9ae2c2fa9 SHA512 d79b5be03417fbbf90634da5c63ac8975a950f559e42ed97a556edce28ada4d592b1807e89145e58caea1648486916bf0b7bf96e0843bad1cc3cace9048a3a4b
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
 DIST VirtualBox-7.0.16.tar.bz2 170897951 BLAKE2B 6b436c38df632222621723db94677a0efef5de2ac1eacec73571bc658955f23fff347fa60c37ec78c58bf94b82b8f9a95fb26c07ef4becc7e9f535af069151f5 SHA512 1b8ba08bec144cbd1f2e9aa0929cdf60a0b99930f1dd80567094fba75097d87661aef3da2cc24f4abff6b6db8f186e251c5f693a2a93943cc39909d5f1e1bce5
 DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
-DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779a6c2587e0e8af7956ca551cb5a4c0f36f313189dfe08afba83a0c32886866a7f9903b5e370008d6b3ce6283fb2288866b06 SHA512 e2f1acdd7577a93047e220300b1996d2855ddef20053c01294f8295fde0840645c41b75632d71dd2fc276219084fe4105fd057623f39375542358796425a2d03
 DIST virtualbox-help-7.0.16.tar.xz 3948696 BLAKE2B 5c5937313ea0e5cb4764b8a61fd1587e88a4afc965ef00862c5a265a15253929d35e0635231b6be5656f26f600bc4b70a2fa2ebc0f33b35d35c184b57e5acef8 SHA512 b9baca57118a82e3489c8445f0988671f16f75de60cc2d929d5e3b0c4c9e3ceacd796a72a81bba88d69eb4b4559835a13775c18d7782ae7dbe8ad202e247db0c
 DIST virtualbox-help-7.0.18.tar.xz 3948116 BLAKE2B 5715a7e609297387b5fccce0951c62e5969fd68adeecb869712e69f5e90daef97384bd3ff3c39de40903a1fabe7ac6d2f8ecdbb40de16abe955d40e49b962eec SHA512 ec0f915b7221bc40d02f5f1675eb0defb5506b2f2bd96c063a96a9346e1c82428ccdda8b3adac43238c451ae185ac31af4a186da17ffe091469e14e696388b3a
-DIST virtualbox-kvm-7.0.14_pre20240502.tar.gz 141218 BLAKE2B fd78db709a37fd5239e52a71a5690073631c9376a0a2d6ab9a885a5892ff272d432adeabf03c3317556a9d76cc6819cc5dcd44cd19bd18bd338bb1b84bda5dae SHA512 650bbe3a8c51d7373c25834be129888b624c2d99baebe4105c2a70b1a013cdb7527224778a78f6901b91dea6e22129354ba9269bcd365b9956df5c5b8a77869b
 DIST virtualbox-kvm-7.0.18_pre20240515.tar.gz 114604 BLAKE2B 6db426693022c09bce2d562ee2b8f5ef83eec45b2481e45bc62fe1993b5cd93d83c26c248427515a3f7bd5c3e244d79b2b03bfafd7eaf6256796e3384f1c06d9 SHA512 63e07ce15330714508848b489361650b74970c97e964beef7d4ff5f23c2ad53d3f37860c5297ceae4dfc9d198df94d9531882bb1e870e34ec69494882a4db882
-DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
-EBUILD virtualbox-kvm-7.0.14_pre20240502.ebuild 21650 BLAKE2B 085bb497aa67cede3d87b9f6cd5d23b18220afa081b90f0ef610d2844820f55b920d056227da6f7470067ebfd8bd758a7067b3c653edaeddf35b6646495d0cca SHA512 142b8fa9a5c24bcb1003070dd6ce290ec5f0e9ed1e31d318d251e7924993062105d9cccbe827cb7413ae200e2ae4cacf1f4cc2b339a1f7789427cc8a4b3ddcc5
 EBUILD virtualbox-kvm-7.0.18_pre20240515.ebuild 21701 BLAKE2B e37d74a207002d68163452e35926302a5e8e0ccf7ef75d19d4829d457025c4445c230b22c6716507bd534a040b5b118636c1f6dbe2efe1e1925c1751d21f5ed7 SHA512 88a73cc66119a4b21aa094111e7e59cbacfe634242622c00df7fc723dd07f5176e0d0cd2e5076e134a1a95e898df5751e687a477918ad0561d1865d06d8d2bb3
 EBUILD virtualbox-kvm-9999.ebuild 21690 BLAKE2B cffc5291611fb24a82de0b9eeae15b5a762123595518821be8d8cf2566821668cbad2f14e8c04ed93f06f448e00ae96477b1f62715bfc54917f2315debbdd683 SHA512 aac9d44496e4f63c14a0110f58e46b5a2536f6fee3b71f0b8c541eb0db49a1321660075b82e6efc56a40677837525719a23ba3831b88fe06da3ec6db800b01fb
 MISC metadata.xml 825 BLAKE2B 380d7acae6669eb133e4e430cc4df85e9ee43798e836c60b26a7b06a0e550f01f007bbab93d7ce0d5eb53e4b32c3d0c30fb9d0593513c30111dd23686d58fa84 SHA512 01b64b0a2dd969d19014db69d0b58c019c6aeca6b8fac60d7591ddd817fe0a75d64e6f84b8c08c5de2f8de75b8750a5803246c48d407f91c4c69433264b5bda1
diff --git a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.14_pre20240502.ebuild b/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.14_pre20240502.ebuild
deleted file mode 100644
index 4c808e1dce9f..000000000000
--- a/app-emulation/virtualbox-kvm/virtualbox-kvm-7.0.14_pre20240502.ebuild
+++ /dev/null
@@ -1,767 +0,0 @@
-# Copyright 2022-2024 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
-
-PATCHES_PV="7.0.14"
-ORIGIN_PN="VirtualBox"
-ORIGIN_PV=${PATCHES_PV}
-
-MY_PN=virtualbox
-MY_PV=${PV#*_pre}
-
-PATCHES_DIR="${WORKDIR}"/${PN}-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/ https://github.com/cyberus-technology/virtualbox-kvm"
-SRC_URI="https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-${PATCHES_PV}.tar.bz2"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-
-	ORIGIN_PV=${PATCHES_PV}
-	EGIT_REPO_URI="https://github.com/cyberus-technology/virtualbox-kvm"
-else
-	ORIGIN_PV=${PV%_pre*}
-	PATCHES_DIR="${WORKDIR}"/${PN}-dev-${MY_PV}
-	SRC_URI+=" https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-${MY_PV}.tar.gz -> ${P}.tar.gz"
-fi
-MY_P=${ORIGIN_PN}-${ORIGIN_PV}
-SRC_URI+="
-	https://download.virtualbox.org/virtualbox/${ORIGIN_PV}/${MY_P}.tar.bz2
-	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${MY_PN}/${MY_PN}-help-${ORIGIN_PV}.tar.xz ) )
-"
-S="${WORKDIR}/${ORIGIN_PN}-${ORIGIN_PV}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0"
-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
-	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="
-	!app-emulation/virtualbox
-	${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-build/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=(
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-${PATCHES_PV}/patches
-	"${PATCHES_DIR}"/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_unpack() {
-	[[ ${PV} == *9999* ]] && git-r3_src_unpack
-	default
-}
-
-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}"/${MY_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
-
-	# bug #916002, #488176
-	tc-ld-force-bfd
-
-	# 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}"/${MY_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-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-		--with-kvm
-
-		# this is required for kvm to work.
-		# also this prohibits installation with suid.
-		--disable-hardening
-
-		$(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)/${MY_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}/${MY_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}/${MY_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
-
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 0750
-	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 0750
-		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 0750
-		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
-
-		newmenu ${MY_PN}.desktop ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${MY_PN}-${size}px.png ${PN}.png
-		done
-		newicon ${MY_PN}-48px.png ${PN}.png
-		newicon -s scalable ${MY_PN}.svg ${PN}.png
-		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="${MY_PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${MY_PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 0750
-		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)/${MY_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}/UserManual.q{ch,hc}
-	elif use gui; then
-		dodoc "${WORKDIR}"/${MY_PN}-help-${ORIGIN_PV}/UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}/UserManual.q{ch,hc}
-	fi
-	dodoc ${PATCHES_DIR}/README.*
-
-	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}"/${MY_PN}-vboxusb_tmpfilesd virtualbox-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/${ORIGIN_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 ${MY_PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 16177a060047..1ba7da681238 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,10 +1,7 @@
-AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox-modules-7.0.14-kernel-6.6-warning.patch 1110 BLAKE2B c66ec49874e6778d7b74bced6469ff255cd9bdf566f2180095fbb98e6cce1cb0698b4d89eba1702c3fcee7bb0f666cabd190f6b4f555cce931a2623d1e50adce SHA512 a902813dfcad7e8aabcd85164dc553f13b60c8e9cd70e45d61465ebaff26fc43811918f65f21828f41f5e30f40044003851024db32e645ac85352148ce0375c2
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.50.tar.xz 680700 BLAKE2B c3a10ce8f3eb7e6c0c05f81cd3c072296557b9f9f6f501bb0aec3f04aabfe1fbb67b553510104139cef290c09ff9e67161085781b8d28c968dfafd15958a1b1a SHA512 7822e421b595263cbdaae08103255742360ca7ab0c385818ec895f10570c5b9ed5c7614742d8fa8bc2414cd426907cd1c49d735cde8caf9d2b7692898058f592
-DIST vbox-kernel-module-src-7.0.14.tar.xz 718532 BLAKE2B 64df92802ab5e9fa3fdf9ba3e3b13004dc687dd2d5f3d41d24354f116a79000fe6ea07bfa8877113ab263d4f75210b600e61d983616f66b6e96324b3ea6a4b2d SHA512 2a0b9a0bbcb0a21a580000309be3a71722ee3cb9a63a5e12cd0d8a391b3832a6cc92ff806f8ca4b5fcb80fed02a44aa4de6a2d49f4583d704cec0902572a68bb
 DIST vbox-kernel-module-src-7.0.18.tar.xz 719604 BLAKE2B 44e9d895791a7ff50681dd8860456a87078b41a4eb3005a6b249f9b34c37de709e190cbd6f352d21010ddcb9d8d1c35303bafd765e999664288df9e0ead94e6c SHA512 1cc17e302ef8251abd08a078abf11fede242154b0bb78d03f8d7c2821ba7cff410bd255802316a2f13100884b35a6f14fdf0b594304bd041521b66d264f51b77
 EBUILD virtualbox-modules-6.1.50-r1.ebuild 1007 BLAKE2B 35da91688a97c03ca0ac189e152e3e86d7ee2b17f48028da50e19b8ed755c6c555ebc32f2d86941a8da4409fde376a3b7db84c3b53bdb069e434502f27cce09e SHA512 0966575ad55dce2ffe6408504fe234d86d586b348ff5279655805a7ceda7af4b5ef9ec213f100c188216fb11c9f1ed2426d396054a02937900825de407a0ce4c
-EBUILD virtualbox-modules-7.0.14-r1.ebuild 999 BLAKE2B f40c4f2d49b9444347de78b789b84f9039b4e2d6a592e9d65acea37a4c956d110dd28531c52747b7a269260858f694c6a0b4e8242465bb54f88cde75825442b5 SHA512 e5c7d30934fd2e079667d456c2f665ddf108ff76a56ebd8e360accfc372438864fe639d4dec38bc7a10f184ce5cc80b2051eb32dafd4cf89d9d51f6bd5f0c5ef
 EBUILD virtualbox-modules-7.0.18.ebuild 941 BLAKE2B 23539d6f2c798b730f2f9afb007158672cabb6e199356b104c5e34b4f8e819e55f77ae1f303d655333cbc4351b67dc44735c131d59bb04031bc7c1b900d49c7b SHA512 379c3e216af76612970ca077c29a3c750de40c9a91dd288754cf55e7612e64227c261ffe2b0ccb8aef21f47ed1afac713295d6f7b063f27fa083715d311f7c75
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh b/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
deleted file mode 100755
index 756d243542bc..000000000000
--- a/app-emulation/virtualbox-modules/files/create_vbox_modules_tarball.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Create a virtualbox modules tarball from a VirtualBox binary package.
-# We cannot download the package by this script because of the unpredictable 
-# build number being in the filename.
-# 
-# usage: create_vbox_modules_tarball.sh VirtualBox-4.1.18-78361-Linux_amd64.run
-
-[ -f "$1" ] || exit 1
-
-VBOX_PACKAGE="$1"
-VERSION_SUFFIX=""
-
-if [[ ${VBOX_PACKAGE} = *_BETA* ]] || [[ ${VBOX_PACKAGE} = *_RC* ]] ; then
-	VERSION_SUFFIX="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-[[:digit:]\.]\+\(_[[:alpha:]]\+[[:digit:]]\).*@\L\1@')"
-	
-fi
-
-VBOX_VER="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-\([[:digit:]\.]\+\).*@\1@')${VERSION_SUFFIX}"
-
-
-sh ${VBOX_PACKAGE} --noexec --keep --nox11 || exit 2
-cd install || exit 3
-tar -xaf VirtualBox.tar.bz2 || exit 4
-cd src/vboxhost || exit 5
-tar -cvJf ../../../vbox-kernel-module-src-${VBOX_VER}.tar.xz . || exit 6
-cd ../../.. && rm install -rf
-
-exit 0
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild
deleted file mode 100644
index 83f50d5bdec4..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.14-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2024 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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-kernel-6.6-warning.patch
-)
-
-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 28bd4cde0247..fa62acdab155 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,18 +13,13 @@ AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
-DIST VirtualBox-7.0.14.tar.bz2 175654864 BLAKE2B 99f4942b864ce481d69983af31393d763452c5b55697ab642b43c155f5fbc2a9963fbe1b7744baef620d0b351e1ac73c1ef978698b9a7e77897bb9cbc18dc17c SHA512 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
 DIST VirtualBox-7.0.18.tar.bz2 173295159 BLAKE2B 1371d54d648aafbad3814d55d495836ce7a6f9ca955aeb71e24c57a27ed8acae8c020b8094ca7386d341d5e7460b9b0823cc01e7e69dd3cdadaadee1bc608bd1 SHA512 e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4
-DIST virtualbox-help-7.0.14.tar.xz 3944832 BLAKE2B 95079e4da8c960c41cee799142779a6c2587e0e8af7956ca551cb5a4c0f36f313189dfe08afba83a0c32886866a7f9903b5e370008d6b3ce6283fb2288866b06 SHA512 e2f1acdd7577a93047e220300b1996d2855ddef20053c01294f8295fde0840645c41b75632d71dd2fc276219084fe4105fd057623f39375542358796425a2d03
 DIST virtualbox-help-7.0.16.tar.xz 3948696 BLAKE2B 5c5937313ea0e5cb4764b8a61fd1587e88a4afc965ef00862c5a265a15253929d35e0635231b6be5656f26f600bc4b70a2fa2ebc0f33b35d35c184b57e5acef8 SHA512 b9baca57118a82e3489c8445f0988671f16f75de60cc2d929d5e3b0c4c9e3ceacd796a72a81bba88d69eb4b4559835a13775c18d7782ae7dbe8ad202e247db0c
 DIST virtualbox-help-7.0.18.tar.xz 3948116 BLAKE2B 5715a7e609297387b5fccce0951c62e5969fd68adeecb869712e69f5e90daef97384bd3ff3c39de40903a1fabe7ac6d2f8ecdbb40de16abe955d40e49b962eec SHA512 ec0f915b7221bc40d02f5f1675eb0defb5506b2f2bd96c063a96a9346e1c82428ccdda8b3adac43238c451ae185ac31af4a186da17ffe091469e14e696388b3a
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-DIST virtualbox-patches-7.0.14.tar.bz2 6937 BLAKE2B da5f18efbba2a8f4701b3d29dc00784e4e80e18a18b029e5dce8c142eb4dc97637069bfc5081422064a7dc59dfacf503ebbdc3421caa96430dc53fa72988aa20 SHA512 57cc34b92e4626de5c445e34ae025da7ec0d752a60618c619a55c28bf7d6b1cc9dc81ea059b949b0f3e625568207e8084f9462faf487ca0daf2794e7f1feac36
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.1.0_pre20240419.tar.bz2 5316 BLAKE2B 1a890b7d19cb252c7801b68c299676e2cd7a209a57a03cb39025e1a969a1c73142eb96154dae8469405f93d61969154428ea0fe3950a00d8a0a69dc8aefb4fc9 SHA512 ce4f850ce87652ef4eab039332048333949c94f0627bec8eb00d9689d7f8edcce372e2185ef8bbda9aef97781a2008b7c6464468cc38f3454dee862efc0ecdc9
 EBUILD virtualbox-6.1.50-r3.ebuild 18929 BLAKE2B 5361667320ccdc5534959f12f40665f7a8a19e8b09b0b172c3537bb0d93a7bb0117dc35114e27e7a6de35eefb0811aaf94c54568b32cd1dcc62524ec22d7b393 SHA512 54719ef39276acff779d399ed744d5aef88e6275dce7d06cec9fc611335d243b8dd1b817aea56fa5b93b96345f7b19dccdf8facdfc49e58d42524f9050ba7776
-EBUILD virtualbox-7.0.14-r2.ebuild 20784 BLAKE2B 371f4187b624e402d1de061c61e935abaab1901bd260449e57d0566e73e6578e23dfe3430ecff1906fe1e0f1a314c8990294a08cd6bb144bd330835cfb71e174 SHA512 237c0e6140d13a87ebcdeb32412d7da0885cc8d0814344cd7d194463c312214173ffc3c5b1064ac8076d6934c239bafc19f4fe4d9cf1dd073855c8b43298c706
 EBUILD virtualbox-7.0.18-r1.ebuild 20842 BLAKE2B 041bb2782ffabb3ce830a94b3d98abec6214eb6fcecc7fe073e9156b9b74f4487d9f6a0ac7bc9f77933322ef66ce0c8536c9347766ad1bb50dee33d645adc315 SHA512 7e45639ca8255febea8a766d906d3730ec9d229834b3a3fe76cb5fc0fe2adaa909db6cb45c5cac3ed33f5af25a49b0270228bd75f3d5a1e5bf5cec9587fe2e26
-EBUILD virtualbox-7.0.18.ebuild 20836 BLAKE2B fc5a6c5796354b3eecf4e5a2f6e11f363b3cfd6753f5e73a885d78e39783eab2102358886fd08aac2aff2e1e79405a854e564251458703f6576efa2d4b00280e SHA512 dcdc6a069c3a0f88d1257d7606a8a9a3d7b009e413dbb2a45c9c0b98722d3ffa1ce7b34dcd1ee48f3993be86a123e243964235ef50e28bfdcbd427a469ec45b5
 EBUILD virtualbox-9999.ebuild 21626 BLAKE2B 001008613b2f24006cff0ddf9f5758d37d248541edb6a20c1d8942129987a82a3eafb4db19a2e7a32daae7b4de03d82b0a7a6b78b119f15201e64b783ea5531f SHA512 d42bed323f570e022f75c579e92fc220e8c5a344d9289d83a7b3f1a9a92cb8905935bd6e486e5bf29143fcdea13dc7b30adb74a5d4bf6759b193fea1523bfa4c
 MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9
diff --git a/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild
deleted file mode 100644
index 5b6ec05dfcd1..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.0.14-r2.ebuild
+++ /dev/null
@@ -1,740 +0,0 @@
-# Copyright 2022-2024 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.14.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-build/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=(
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.0.14/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
-
-	# bug #916002, #488176
-	tc-ld-force-bfd
-
-	# 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-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-emulation/virtualbox/virtualbox-7.0.18.ebuild b/app-emulation/virtualbox/virtualbox-7.0.18.ebuild
deleted file mode 100644
index bf56c96cb843..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.0.18.ebuild
+++ /dev/null
@@ -1,741 +0,0 @@
-# Copyright 2022-2024 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.16.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-build/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=(
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.0.16/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
-
-	# bug #916002, #488176
-	tc-ld-force-bfd
-
-	# 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-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
-		sed -e "1 i\#! ${PYTHON}" -i vboxshell.py || 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-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 27ab8cedd760..f89a1581cc84 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 481bebbb5f12..e7e9fff1043e 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,4 +1,6 @@
 AUX ibus-hangul-test.patch 446 BLAKE2B 06a83c8701e803f97b5755215488639b77c3be819b39932e6d6e957467eec482f32bf0477d84e7ec552a495f2e5b56f4dc730c27851cff2f252b0b36152d19f6 SHA512 3171d14b3eb495f09c5a90cee9fc85d87a5b773452367f1ed1bd33eaa3a220658052f6edef53fc7585292b0811f5b04b53eade0175d609dadcee0d29ea3506ac
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
+DIST ibus-hangul-1.5.5.tar.xz 356120 BLAKE2B 8f2186d19598927c8c824dbd036cfb997db95eae08c4a59489e3be987b5445cb7dffe5bfe766b339c60ea0a892130a0269522f00c8dfd910011b7a0eefc087b5 SHA512 c95900b8f47fc69dda04b6a41a1965a6d3a293727749b72bd234d6e899558dffce669df29a4e8c9dcc53d9f7b6cb18e84c4b0c55ef143731a894e0b5693c0722
 EBUILD ibus-hangul-1.5.4.ebuild 1221 BLAKE2B d46ad40c590652e0520b4dd3160fba207321ecc8ac2140a37359082f71e1109e73870bb9f15ce32ffd686e8f663dedc5e7d06452c8d004a6c3b38b22626c4441 SHA512 a1df418c8599e6ff129cc26765a80f8d8d03f73759a80e09d46c0e48e36701991432b7049b662cb2e601a0c60f972591e0546b66c8391abc6f81122684a2702d
+EBUILD ibus-hangul-1.5.5.ebuild 1274 BLAKE2B a9ee0a26e09ecf342d713282d489e2b24ec9e75afe7b9e7a3a728d9083b46f248cb42234e8d376b7844062b3bb0b65e9802467327f55a9269cb0653a00b9f1f3 SHA512 baaffdcf46dd871afbf13c4d427e8c3542b0535fb5492ff445452b171cd6ac3051b6208c54b4a7a6f23d95113d18ffa1a592698540ab20d2ab276e7c40b69a42
 MISC metadata.xml 321 BLAKE2B d336297b96a4ba3ae1e2c8bf3b1493717b49ce42c85cb0748af54c7bf6be4a1c74461c122dbbfc9b107fa02f4e83800798dd61c1bba74426bb7a2487e0d8fef9 SHA512 d05f79c856e4e579d1f98cd7c9869294f1906fa7e73eeae7120ee6af710d5f16f103d63f1261a9d798ba5584fa8e6f349d73d407a747811515280c736b43eb48
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.5.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.5.ebuild
new file mode 100644
index 000000000000..3d3cbefc5d2e
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit autotools gnome2-utils python-single-r1 xdg virtualx
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${S}"/data || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	virtx default
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d9b551c380c7..00cbe878d845 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6d7ec17c7190..b3a224eeb7b5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -34,12 +34,12 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
 DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
 DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b
-DIST libreoffice-24.2.4.1.tar.xz 279904088 BLAKE2B 082f3a65a6ab7bfa2a871c18300eba62b963ca83c4eda42cea2048fe1f1f8b87fdcecc63a5d0d7d90ca91bfc014ecbadf840e71e7b3919ddbb92d24c940e4133 SHA512 7ea86529b615363e973fbfabf25ea44010691e32e244fa76e554f6f4a0e61480ebc027cf8d578a6d2d01f1a23926a6c606bf9e4d9005250bf19a00444854204d
+DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
 DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-24.2.3.2.tar.xz 167014344 BLAKE2B 93c87d5b0e7d35d3335dcb80868a0ea516378e3c46c56e34a1123661db29ab6215f62074feef1078daad04977726bf226de2a7ad281e8b9900ddd7fb1bc23961 SHA512 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877
-DIST libreoffice-help-24.2.4.1.tar.xz 167013380 BLAKE2B cf6b9524a10cebd5b6c39d07cd03a5dc4f4f64b47b9422a9757209c632a7750112d41287de40ffa00b4856686b214484f49a29397ce505ca00e9e8cb82329073 SHA512 1db7810e518eee4c39355e594e3c7ec03c71e49d42de70573f93fcfaaf7c2594ebc676b4d6f1fe7cf3e984f81cd1c4f6679e67c103a3178e94ac9f2239205138
+DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
 DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
@@ -47,7 +47,7 @@ DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B
 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
 EBUILD libreoffice-24.2.3.2-r1.ebuild 20301 BLAKE2B f2faabc51f9e775fa17d89a6587ada8ee1c5097a8472b457576d006f3919ab67c1f4a44e0ea9b052fdf6e1b0b8dc6a9945648094e8fe4028b5d06aacfa9ba303 SHA512 c13c308db2ba0f8be3e331e761da3455b2aa56256886115dbe219f115320839a2473cc29b9faa654f16ef75d0df12d1d71dd026e4ff96acaa9e442aca1e0efaf
 EBUILD libreoffice-24.2.3.2-r10.ebuild 20711 BLAKE2B 1e924c6da23e41422ad30a87e2ccd0b5ffac9f9613777029ddbba224bdc63fe1fd2b631823f52382d4e3d6aad48c3aadb163593f7dfcc2f0db63510cd9914e86 SHA512 5250383e6283223954a52a76d687107ea5e62f272bb827db7028763162820c8fa750332a5796ab0af64c65d543cb58e490b8e3c0899919072710652082d2ce3b
-EBUILD libreoffice-24.2.4.1.ebuild 20793 BLAKE2B 8dd623634d9e710d9bc8b735fdc6688591e653ee2f6b6b70b5bab3a8bd1bcf55536db1c0f9aea8957353bed62d986c49d4314507ce9eb563977bc14f7973b840 SHA512 1eafc9446d8fcf82e29d3c453d6c357a7e1bcb25037c9d7139eb065599981f822bfa81ea9b5d9e9c31e6df8cdc01c7d90306276e8dec3c0a6c02ec37af9d7691
+EBUILD libreoffice-24.2.4.2.ebuild 20793 BLAKE2B 8dd623634d9e710d9bc8b735fdc6688591e653ee2f6b6b70b5bab3a8bd1bcf55536db1c0f9aea8957353bed62d986c49d4314507ce9eb563977bc14f7973b840 SHA512 1eafc9446d8fcf82e29d3c453d6c357a7e1bcb25037c9d7139eb065599981f822bfa81ea9b5d9e9c31e6df8cdc01c7d90306276e8dec3c0a6c02ec37af9d7691
 EBUILD libreoffice-24.2.9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54
 EBUILD libreoffice-7.6.4.1.ebuild 19678 BLAKE2B 9437af453ccbf75140b39cb37ff2705630a2499295681fa129945ca6ed96b030a832ac997990e80ee3cfb7d7203f5e3a1e4375677e456e1ff11c6a4dce3a3178 SHA512 c8d41e5bbbc9cbf9f2cd1f3d4dd74aca9074287410c4a2e26e789ed939a691385c6d9c3f62c5144ad2f8af15a9be26206f2470e5908ab10f507b423c459873b0
 EBUILD libreoffice-7.6.7.2.ebuild 19801 BLAKE2B 1541d54c3377fc2e16af6b2d3183b822ae4fe5313ac6794db710f8233b1b01ac7ce7be7d8fe21d9c6e0f34a2982ee93724326331647abe6e1aba4c22c91e018d SHA512 80a6c84003a66f7763ea5aeba0c8e81b7e21bb5374f7f7c64e5dfd72b046d59b5f70d17620f6f081ab1c970b0a67ad618a35651450cbe632da39fd35827e9b7c
diff --git a/app-office/libreoffice/libreoffice-24.2.4.1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2.ebuild
index 8abe9f7f02cc..8abe9f7f02cc 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2.ebuild
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index eeaa5f97bd69..e139f2229179 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index ff79c8981c33..d474b1372f63 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -347,5 +347,5 @@ DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a733
 DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD mdbook-0.4.37.ebuild 5578 BLAKE2B d4a2aa6f2e201999cb92ace3e282bd19b4801bc47e9bcae93fcccce28096d1a726665d4da96c7620f9b41584d16839c698fe77d136071e543f7f7276ecf1564d SHA512 a9a80f05c660388807ce2b2133a7bf636a86ccab71fb4b09d20d1bf167a4b71b4b9d3cdbb62d4003cc4e0ce7c1d82b7b01ff820cb3d7e0651c54ec097207da52
-EBUILD mdbook-0.4.40.ebuild 5920 BLAKE2B d2735326c3fd1efa0f859427ff3c2c8f22d87ed3d76e7f7924efdda42b3fcb398d5428288484038945c528f7059161fb8b3a0b8fd564e72045e92efc4e38dafc SHA512 c2eb27e53403bc0d6f014ddc813a3d4c0ab97bc38126b31235295df282dfc24842b8abac1ec843ec12b200a2c48398150d4069b7d2d176f68eafad1c9269f0c7
+EBUILD mdbook-0.4.40.ebuild 5917 BLAKE2B 2e590ade060800f0620020ff1df2953c6323b064732698f574a30b44e610a2adb15df80061c65d121089e1715635477dfe3b0cedb23982fd32d6e063a56f937e SHA512 de1d9f4bb717637493390492a31bbc30eb57031ccc330f2ab4dbc7161c4c924fcccd039694d7f0a08b7677d947c4608662e7b44bed66713b4bb0043f2c3556b6
 MISC metadata.xml 327 BLAKE2B bb56613ec49f3b00a39b3131534cb064154ca05d46fda58d4e1d0c601e49561b4d73bc3d075e378e7ab2df720560d169fbe9fd39b40171184aa8e88d8f7291a4 SHA512 e678a70558e83d27e5c0146174d9e740f3ec2e6bdbbb17e61b71fdea6879d61b7babbd9437ee9928dc0322e65a0863b3909bffc7b3ad9313566c5de5baa17f62
diff --git a/app-text/mdbook/mdbook-0.4.40.ebuild b/app-text/mdbook/mdbook-0.4.40.ebuild
index f99309e84528..8e5ec907ab9a 100644
--- a/app-text/mdbook/mdbook-0.4.40.ebuild
+++ b/app-text/mdbook/mdbook-0.4.40.ebuild
@@ -268,7 +268,7 @@ S="${WORKDIR}/${P/b/B}"
 LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1"
 LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 923d076a44fd..fd2d919f4e91 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,10 +7,13 @@ DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4
 DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28
 DIST poppler-24.05.0.tar.xz 1909164 BLAKE2B 65d5d1509078012a26d0bd97985516a39c49594a3c83016f1b7c7745caf1d13faaa82bbaea62c16466f4b1c159c765fa88f97e20f10a87b08514b00e5bdb1113 SHA512 caa3d31b8f22186a7218831039c2ff7384b07863de04f166980dfe534a7a5f047e7c21e1114b9ed0ef323beb60983b45a36bb906c4189c0828f4119e3e2dbaa1
 DIST poppler-24.05.0.tar.xz.sig 833 BLAKE2B f1125a8b81089a4b8beb9385fa4a9b170b97f08e2bc732fd1cc2671ed43a81bb7b58b9ced61691e55188af94ee6b2c701be0ea1e12feecebbc7c4062a97b76fb SHA512 3010eeda09ff58d9705465bffe4861d9af1f294597b8eec1e1cc90f59008ab146000fcc694b2fad8bb675d89d68b2b78d54236ae6d42411058b9444b87514db3
+DIST poppler-24.06.0.tar.xz 1910016 BLAKE2B cd5f8f127048b15b8630f0ef0ef8382b3c32919a0dd63a94f6e25a1e62277a64115a3d77b627a91d032c2e939adc7c2ebb227369cfc95b5a9126ada19c4d94d1 SHA512 4e69aedcba7ee65de25e107593736f70353b7811b800ef7d0b4d7efe8f8a5a4d0134af5f9bf5cff005d095d02af247bf46c8c53b52958900245a4139d153c1ea
+DIST poppler-24.06.0.tar.xz.sig 833 BLAKE2B d453a7ea8949238ea3b8446eaa77b5efa5d0bb7beb5c53145612d8950bf7b7f2eda4ceb7b61ab177cee4b12c515e5c6592cb770a547834026ab5b517f1fe769b SHA512 34471d4f5c9ea83d545f013d7b6598ce9f5797fa1e68e2d1eff8bc965932d2d087612ff7f4256405687a4858ce7255430509a589033d5b923519009682bbd3d1
 DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.02.0.ebuild 4417 BLAKE2B b40e98b84d176b81769316c3a9ec3ee7094beb3a9dc126095d77bc37a35a2baa5d92a7261ca4ae41bd09b9a159b519bdfabd3d34bf3b957bbc3eb07ccf5c8b9a SHA512 40c8572bcc3740b96ab5d79f503c6004b629d6975db25fa5b6191ad19ba1dd5cec35e9a3cbf56a815d7e1abe70026d4939f89533dafd174754b3f21d65dad9b6
 EBUILD poppler-24.04.0.ebuild 4419 BLAKE2B 3ecb6e104105113d5cd765143826fd57760f2d84b771426c0430a4392ae4047de61d154e35f9489050ba86a037b6a86698fc45985f0306554215241df1020070 SHA512 69a4fe5780410b36a9f69de6e3a44b05d5c7d0fc80cb223e9e38fea2e4a36a147405571da50c4996cc6a5c9f5b1db735e71b86d76ada3ae4c2e102ea8cbbc99d
 EBUILD poppler-24.05.0.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
+EBUILD poppler-24.06.0.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
 EBUILD poppler-9999.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.06.0.ebuild b/app-text/poppler/poppler-24.06.0.ebuild
new file mode 100644
index 000000000000..fe2ff39083f0
--- /dev/null
+++ b/app-text/poppler/poppler-24.06.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SLOT="0/137"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.13
+	>=media-libs/freetype-2.10
+	sys-libs/zlib
+	cairo? (
+		>=dev-libs/glib-2.64:2
+		>=x11-libs/cairo-1.16
+		introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	)
+	curl? ( net-misc/curl )
+	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.49 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		>=dev-qt/qtcore-5.15.2:5
+		>=dev-qt/qtgui-5.15.2:5
+		>=dev-qt/qtxml-5.15.2:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,xml] )
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( >=dev-libs/boost-1.74 )
+	test? (
+		qt5? (
+			>=dev-qt/qttest-5.15.2:5
+			>=dev-qt/qtwidgets-5.15.2:5
+		)
+		qt6? ( dev-qt/qtbase:6[widgets] )
+	)
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	append-lfs-flags # bug #898506
+
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+		-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+		-DBUILD_CPP_TESTS=$(usex test)
+		-DBUILD_MANUAL_TESTS=$(usex test)
+		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DENABLE_GPGME=$(usex gpgme)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_LIBTIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 4d3bc3066369..ff3179e332e7 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -20,7 +20,7 @@ DIST dvipdfmx.doc.r69127.tar.xz 3125132 BLAKE2B b29cc6a2f1934fdeab678a5246154b1b
 DIST dvipdfmx.r69127.tar.xz 26704 BLAKE2B 7d2790d9aa6b994ab3619bd96ea6880e9243105001224d7bbadd130b03c7b8335fe751bdcbb90ef5ad92d60d3a80e63f0f152d50725a80cf1c78e45ab5c9245d SHA512 75703f600365c90379c5d009e00d35d2e514a76b2556c96c84fc2a717287441af419a26fc9ef087d111f2e77c7180f6371ca2ec33b66052ab63ca3d11f48e788
 DIST dvipos.doc.r66186.tar.xz 28764 BLAKE2B 7bc90b21109d52375ffdfef601722d0d3bb36932556f8f29ae62cd4f62c2171da2cf08f9bec72f368711dea071cd15b09f3d3661a91013a086c3a6621abc8794 SHA512 254a1db41636608a133e7807a8d4ea8ddd99ac646f35b66a43205ac7fdaf4a15c21eafbb85e23a182506e509895776d1fcbe63b3b8a7f197d577c6405ece5c44
 DIST dvipos.r66186.tar.xz 296 BLAKE2B 1560c5a795df9c095c8115e7f0296ffa3206dd2630a8cf2df9dd76aa2ae1c6b5f044d327c44d026bd94bf80d6bab12cf7da04ef5b7ccb3291762a495d8a4764c SHA512 9e949fb402facda9c30fa2f388b80f2cfc530670b33cbd78559e4449fa6004c5d4082e4fb895ea397a334a333e5d5ae1a4f66fde3885f0a9eb28c9d9ebbecd0a
-DIST gentoo-tex-patches-3.tar.bz2 3860 BLAKE2B 048d1fb59909f0f319f7a77ca424dd48d1f879d7c97be5c683e6c76142d1a878705adfd3cd734e401bbf2cf319c7e539540781bd9ab0fc937b2c93e129e3ceac SHA512 6976ddf60b6b61fb04c04ddae1fcc98372047b7186a34cd531f0a5011b69310b598db89f216265d91e9a465fd4a4e7410920ae1373b378495beeeb537c73a17a
+DIST gentoo-tex-patches-5.tar.bz2 4975 BLAKE2B fbf4115fe462cf7b5e1bf36b30e6c52ee0a8c32896f63b04684d43c768c26ce04dfcd4d8dee671afc480df8c83daeaa6625e58c22bc400f0fbfadbd7ff31ff8c SHA512 be93e7a1aa233ee40c10dcaafd0ff3d0dbd2b0211758187201de6433867249b8a807450cc57c89cf18df8e672f47a3ae36b39032145e56531dc1da19b557bf7a
 DIST gsftopk.doc.r52851.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805
 DIST gsftopk.r52851.tar.xz 3548 BLAKE2B 65e455587ba7b014be3f7668225fd0f5b4816406896209929001cab5b61dd6b748120970dca79207117b6a5b07ff7c00f96aab6e540397405d075425f8a79a2b SHA512 cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413
 DIST hyphen-base.r68321.tar.xz 22604 BLAKE2B b11b688304c3622c71ddbb38e9095e550871360418d176ab717bdc59954c0648636e5627f55180980e789efed918dfdbab55c25b1b95c8ab0467398b1b2592c4 SHA512 d3f2749cc6946702ff0d51c1d823531bc92b77c1106aec252c84cc8649aa56048556c90e9792f1b0749bba0b86b7c34aa2b04fe2946d1226315dbc73add36913
@@ -249,5 +249,5 @@ DIST xml2pmx.doc.r57972.tar.xz 15512 BLAKE2B dafe9dabe542a746a962a02fd04a4831815
 DIST xml2pmx.r57972.tar.xz 496 BLAKE2B 52d22c6616dc74d3e6600ef18449af31b2c286be9fe0bcacdffa2daa260f409baf8c7af1ce8444486b2fe3e21a05ec22aed280a55f227a1693b27ff3c55eed8b SHA512 9545fb5ca0e95788afab79d8a29336f337619adbcac68472bb5de6af6c54187f19bda655232175223168891c064f6fadc67c4ab8f5a0256e2c55e1a65c5e6f6b
 EBUILD texlive-core-2021-r6.ebuild 12511 BLAKE2B 51190f811e16c159cf9be948c77d3d2925ed5b2778fe51f56f074d468a42175413cadfeb4e1038178a47f3333d7e8396fa009d1315ecae94f7cadc2e5f0708fc SHA512 92ce1e0a2d44a5774c3f32110279f3396d70c470d09491dc01414a787947a98cfacd965494bb0f598599004dfb64a28ce63d12c5a099155d331b5c819b783fe0
 EBUILD texlive-core-2021-r7.ebuild 12751 BLAKE2B aac931564addf57c38992c535852a04c40665e84530d2c508fb12fad973a66b67c0a3c115629b1b71d3c4a305922d112fa284580784d7ee77f0fc8cddc878c59 SHA512 fceaa2bbdd60f39e3cf7a97b7316783eb0a11b93b7d528bf517e0907968bf5cccf4564829e494fd54125bbf0627385ae73857c065f4a57ee9d3a916a2838bdd6
-EBUILD texlive-core-2023-r6.ebuild 12976 BLAKE2B 823f2647307de062634935c8b29e2b20632489d6648d0040d707e782b848e7b9ce3a31998726732f90c50bf66ef116f3a3b9bca6fa5a0f05adf642e695162f68 SHA512 f1c9b19b9935a316589f0bc169b79c6099618e386a461e1ba5453a04230ba6f2ae78a00751d54f21f490093d343ea2bc0f8c2530074edb6e284767f24e13f456
+EBUILD texlive-core-2023-r7.ebuild 12908 BLAKE2B fe3f84f6123bde1145fc899d910490b222fe42d00170a6f239feb9876a1e0e1fa5a295a0dfacb146115ebf22353658ef17b82558a999536390703e04eea1a563 SHA512 62780d79af0a21a075747f9069e68ab3c3272c31f9b3abff5b25e9b270dd494f9a093a662b6b0aadaf9c13e7a8378864aa77a20b53910162c10d802d248c4143
 MISC metadata.xml 763 BLAKE2B 32e271e244979763c3ed20da203b4a6fdd1646b1b5e92ea0fd3a3172e7f633cec56b55a4a638fa1f98394d4fa1ca443c3949528d30a5bf2564edc9979cc77515 SHA512 efe8b04dc9ea326a12eadccc2f5432563b0b87434028a7f2e671124d3fb08cbb384cd022471d44fec466f8558bab4344d2cbb47fe7e49461bbc802f4416c33e0
diff --git a/app-text/texlive-core/texlive-core-2023-r6.ebuild b/app-text/texlive-core/texlive-core-2023-r7.ebuild
index 5c28f973e251..10687a1f1e0c 100644
--- a/app-text/texlive-core/texlive-core-2023-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2023-r7.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/"
 SLOT="0"
 LICENSE="BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
-GENTOO_TEX_PATCHES_NUM=3
+GENTOO_TEX_PATCHES_NUM=5
 SRC_URI="
 	https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz
 	https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
@@ -450,9 +450,6 @@ src_install() {
 		dosym "${i%:*}" "/usr/bin/${i#*:}"
 	done
 
-	# https://bugs.gentoo.org/832139
-	rm "${ED}"/usr/bin/tlmgr || die
-
 	texlive-common_handle_config_files
 
 	# the virtex symlink is not installed
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 69a56b19de94..fe84e70579be 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 1fce1feb0917..670190234c56 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,3 +1,3 @@
 DIST cpp-httplib-0.15.3.tar.gz 1151398 BLAKE2B 8ce7d7e59c0954efb14a11e565f9cdf02c007a3b6d39dbdcb21b412906eed3ceeca3182096f4b4eadb32a5886e839e64774ae9a1110ddb60fb7cdea35b5b7d50 SHA512 f7fc9c9eb71f091b82958e023a7b417b30d2590fd5d1a920d1c98361f34bcaca796dbeda7f9fdb8b2c722a8968977b77463c6cbb252cba9823a79c22471fa439
-EBUILD cpp-httplib-0.15.3.ebuild 2236 BLAKE2B fe9a7553f109a7b3c16eb5acb1bea6dc49dad91dd1f513c78c2319e87fa81ccbbc98850175f292ce736253e7b3638e2ab065671931faa795c2ea36f7351b0271 SHA512 45882d026c2ad64e11a05a0f312a1b77d2a854db19724a4488d0e3c38ae4cf93c898862e678eca4cfdf24016f04571a1a54c74488ebb8cae203f643f1d7cc369
+EBUILD cpp-httplib-0.15.3.ebuild 2242 BLAKE2B 772edb4ad79dd78f8c056e8b9a2b755bc9b83746a7da3eee23a023dc86e6f983fd154fc24adf8120a56d46cc61a84dab3655a195c600548961417df667171a43 SHA512 33f0b3df5e47f91218eec6787f24a20defb522bad19699cd0dc50e89899ed45317bb145d07157f1eec5708c3dfc47322d6b139d97ef0ea261590244290cd9f0f
 MISC metadata.xml 658 BLAKE2B d97bce6286ac52413eb4c57a63290685efbc41c72482cbc9b0aeadca193e9e9a315a9912b0cd692cd7f3d213b8a784d07dc8981d5df1d750b4324f1fba995302 SHA512 1c9f1aba4dbe32f4e8f78ecad2a2c677b7f662eff4b1e9e6e4389bed969ddd7c878324c1635d66a22e53c56dc5b05cd401d4c384a5c4a0314c3932109f4d6b70
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
index 8e738097790f..60ff0d635fc4 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.15.3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://github.com/yhirose/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4a8e43ce6b59..9b4573ce43ca 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/blake3/Manifest b/dev-libs/blake3/Manifest
index 463ce59eb977..611aabfe77c2 100644
--- a/dev-libs/blake3/Manifest
+++ b/dev-libs/blake3/Manifest
@@ -1,5 +1,5 @@
 DIST blake3-1.5.0.tar.gz 228053 BLAKE2B 04405b0bea5e0a5a774c84e712f36c61fd695c4cbe203a327741db7138af38fc4deda7c75a149f1850a1ca01a519897fb8e84c2cbe38f9cc084357c5ed61a1ed SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0
 DIST blake3-1.5.1.tar.gz 242161 BLAKE2B 12712bcc6413f90bd9d79ee87d73b45ee611032ccfa3f9e73b2c41b080c2a9451db028c9ff32efa546bef19b85e4aa9fc5ecd9fc6b76c34fd347cbc5fe337649 SHA512 a2ac662b0e45d1f4c4ee01a5e556a47c49ab5407a6057034033ce6fd0fc6b88f66dd428d80f5e7c4a8413356cb4b5ab655924d96138213499893e0204d7c8d24
 EBUILD blake3-1.5.0.ebuild 480 BLAKE2B f0662530d0ab585a6b2edd863b7dc9c1acc6215d3c2b7f0e92cdb866d92b3ca09a77c1e3b6a522b1f7a7b7613ef5f7d0fe09cc64ec0038bccfcfb2771424b28c SHA512 8efb675b88b3cf0c9c999bda8910c3ec75e2be8bbf45261b46d9602dacc6b8c09ac08297600a1d2dde079ee8b1d70457a020ea48a6a85fb36c920e143314cba7
-EBUILD blake3-1.5.1.ebuild 466 BLAKE2B 5fa41ee499f9f1917e4dc7df75959ba2be2fc71d1f3182cba9f4986034649dae31326ed26ad355d357aada17a5c291dddaf5daeb540dc189c5d8792d9d7e89e7 SHA512 50f4f45f790d331b494d12a62865d9801b9fa0e3582c94b192c38959ff3a1bb5479bbd9e9d79d4c93d3d6191cd49ab6775f12399fe7bd023a4b9df0cf08ff738
+EBUILD blake3-1.5.1.ebuild 472 BLAKE2B e575e94a270c00fdfc21d031bea9d6623bccaa27229ec2acd26da4c3e568512267e83b38ccc8abd6749f5fc69e3b24686e36be3a170ee134278158258f7381b1 SHA512 51f129551a850dc702ff298f9cb490d8b322988357967c3522d15620c9863d0df661e5a4cb9cd97c633060db4abfaaa80f72b6efa732da9d447b5988a4af6596
 MISC metadata.xml 331 BLAKE2B 04a0d860646b72b60fbc082a4f28fa681e122d6f53dadb858777c4054b1bedb9eb33929758ba0693c72f56b69abe3ae88a69e3fc4460d4e1acc0a9c82f26239f SHA512 849d76599dcbdf00b4fbd501eb2b3cb123dc930418e36ea65701fed34e82d8353624122018b0f1e759a583c38285b14f92b6c89a615512e6646af908efb079cf
diff --git a/dev-libs/blake3/blake3-1.5.1.ebuild b/dev-libs/blake3/blake3-1.5.1.ebuild
index e24d78d4b198..dbb90f0e1cde 100644
--- a/dev-libs/blake3/blake3-1.5.1.ebuild
+++ b/dev-libs/blake3/blake3-1.5.1.ebuild
@@ -12,4 +12,4 @@ S="${WORKDIR}/BLAKE3-${PV}/c"
 
 LICENSE="|| ( CC0-1.0 Apache-2.0 )"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index fef22d6bed36..645ed104ffe0 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -7,5 +7,5 @@ DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c
 DIST iniparser-4.2.2.tar.bz2 32649 BLAKE2B e4ab230ca1cde6a0322e05aa483e3112e324903c65e1f22640e17a7696ac30a4eef66c1bb449ea730b9a0caf55091b425fafb9d1514fbf7bbd21d7ef4503147e SHA512 a9b0d4b80a4d4faeff4ec5ae9f0de8f0d4e1d6244dddfca7c3ef9bb188fcb0c3bb288478632145232fe52073cd0714abc0ad12a1cca4e3936fc40a3fba357601
 EBUILD iniparser-3.1-r3.ebuild 1084 BLAKE2B cf71b89f9c5ed601dc32e3b44ff434242a0ee2d3ece69ff21efc7451705157e0b44ca6fc96dc680cc570c35cade2e780e51565213b8ed63d47053d2012f60b63 SHA512 dbccaca36174fc8ffe6bc876d374a429fe739160a2d3500cb90f9c24fe0bc5c9e0118ffb39ba54cbbb1e03b1b9d1e4b68b880433b44adb52324f9e006a9f796b
 EBUILD iniparser-4.1-r1.ebuild 1564 BLAKE2B d5d6309f9de99d4e8d57d8a8be0f266df6515bd1e2bc53a299c377ed3f123730af18e3d03dd89ab304b69c136c3a6c76f19519b353f8d31b05a30a8e350ff2cd SHA512 31f3033b4ad5d86a437f60eb2f7443ef901b081b14c3d7863d7e51a4e5b09cdaa6d36f8df4f5347431397b2cfc3685b88dc869f5ca0fbf35669559a409645ea2
-EBUILD iniparser-4.2.2.ebuild 746 BLAKE2B 985c75c776a3c87d5c4d0b27049e5f56bf36a47f50b31e166101ac07aab761264c4fbd73ddf9abf59ff03afffeee39f9edc5f51c1923e5415de42c6ed58b241b SHA512 c162df01cdeab360557004e3d0f4a2924b18d0fe636eec73553c544ac235ed8322c02f3321722bcc72994613eb8aaabc37c2ac4afac7ed969f2413f77d0b7b6a
+EBUILD iniparser-4.2.2.ebuild 747 BLAKE2B f79c0005fc287a38385e82804fba3a605018ad227cfb414cb417056d0a0cc0438c8f2060f5320c68ccd507eae18b418504268ab93a8d2c5cd4f704d1dbb5b430 SHA512 3dfdd17c1ca0aaf910d16323ddd84006b92dcb44beddd564ae625bd0235bc32efe42d289d587bc48458bd9a2147bc73c8166e189371d5b94427c372fbdc4bc57
 MISC metadata.xml 328 BLAKE2B 5834eb26492d90029b89305c0b67ee37ee5fd22d278db82ffb7aa9eae288e3b58288fedb58a098e4af630691a28d2fe526b3616b925d99348fbfe552b8367ecd SHA512 d58da8c837e20e942b315aca53c8d1192a65c3edc8ce0d0afdf731d0ef0ded83d6b56efd592e282afe9f0fe5b03d6bbc3e973b1bf155f7b4f6bc24e95c0082d3
diff --git a/dev-libs/iniparser/iniparser-4.2.2.ebuild b/dev-libs/iniparser/iniparser-4.2.2.ebuild
index f1c7d6cdb7f9..6dc8e4eab972 100644
--- a/dev-libs/iniparser/iniparser-4.2.2.ebuild
+++ b/dev-libs/iniparser/iniparser-4.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/iniparser/iniparser/-/archive/v${PV}/iniparser-v${PV
 S="${WORKDIR}/${PN}-v${PV}"
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-text/doxygen )"
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 0a1fd56643aa..7b7a3cb6a69e 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,5 +1,5 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
 DIST liblzw-0.3.tar.xz 901084 BLAKE2B 4aa9689f82567b5ad1ac399eed8f58dfb1964f91c74cba2b291458dac89b0c4ce6a110b24b5a8f69bbcddfb0cf14fa0f80107275c16b7553375bbf38e035262a SHA512 d7fcb5c424c87a3692a8a18cd9f4cf57a7faa4f59f01cfdeff335633fb3be6c577409d996d59273f4453eb157dd9bc8fa6ec2868dbca635147d27d3fd00016f9
 EBUILD liblzw-0.2-r1.ebuild 489 BLAKE2B 14bd9b2fc73542974afdf96ca12fdf574f88eeb958f995c0effcccc1e490edf721c31989d0b52f5f06d9979388bc2b6ff0f2f71b5688fdc7048cb79b038a8549 SHA512 bd878a68263f60379c57ff4744ab88cf639c356bca908a828a2a6db15d31a54860f4c2740dc9fe607498b1efbf9d2536faad65b7a60fdb85a2b80a0bfd733368
-EBUILD liblzw-0.3.ebuild 555 BLAKE2B c52e24798c330849f4554f5b29d6023fb7dde6eb629f331320a809ae2e3e027ac10f0de228cb13d085e20ed9395fde594b5da90bdf3804f49dd8500e9aefada0 SHA512 c86074f950ec5e3d26f7e568ddeaa4d3f88bd24a94f83b289ca1ee83f9b07868178abc08284449f32507c05495b3ef3c2ede29536656e25e38e6159f0f16e388
+EBUILD liblzw-0.3.ebuild 552 BLAKE2B d6c65b5eaec32ccb0328d32a5c0113f38257dadd0536015c76c8b22cdce39d3b03102bf8ea8d232edd38ab7ee7318ef44d78ad996a9355c66b3f4a7952840bcf SHA512 693dd37caf3b35c91162bc02e59ef6ae4e42ad8b3990404293ca4e97762ba29196ee0882fa58c51a91587a1a8f7f1fdaf47950224408074d257b38d0ce944978
 MISC metadata.xml 299 BLAKE2B ed61f065d78b384512d91a22b8b15fe414be969f8560540ad90f8fc2464b43d1a60bb6358f903c4d540958c8a4d5879db82d5102068691342d76f07564f557b2 SHA512 448532efd72104f04640f6f0698438bfa3ebeb470003be82e32673b4c06a7b1531148fb06827191827b03e5f6aad521b5c012b30e619c635ef86455b190babc5
diff --git a/dev-libs/liblzw/liblzw-0.3.ebuild b/dev-libs/liblzw/liblzw-0.3.ebuild
index 2526a2476407..0d1adf033737 100644
--- a/dev-libs/liblzw/liblzw-0.3.ebuild
+++ b/dev-libs/liblzw/liblzw-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vapier/liblzw/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k ~s390 x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/dev-libs/mpdecimal/Manifest b/dev-libs/mpdecimal/Manifest
index 1ebbf6899d5a..306642152322 100644
--- a/dev-libs/mpdecimal/Manifest
+++ b/dev-libs/mpdecimal/Manifest
@@ -1,4 +1,4 @@
 DIST dectest.zip 791733 BLAKE2B ba74ee96f6687ce34cac8406fd7fd1f743d72647a5f883f1054829d992d4dc0f61c9e3b88e2529f425cc2fbda14dfc372b3fbfafe6553baabb3244172fed712f SHA512 05f9d12aec1ebfc9ca211b01705b41c5cd1bbc54d9aa6c4799b40fb3ab1835433fd1a277735d26d2530c3793c58b107b3abb1c31f64340e5e9d7856d92c821cf
 DIST mpdecimal-4.0.0.tar.gz 315325 BLAKE2B aed5b6d5c03b12017989bbac9a166366e800ce5ee8d2fad5a1b81def48877126233998df306968902c728776616b1c06ce0ef05ea066c07daf841a53541a09f9 SHA512 7610ac53ac79f7a8a33fa7a3e61515810444ec73ebca859df7a9ddc18e96b990c99323172810c9cc7f6d6e1502c0be308cd443d6c2d5d0c871648e4842e05d59
-EBUILD mpdecimal-4.0.0.ebuild 1175 BLAKE2B f07236fd5a0d982d44e34a69b67b9b5ac43bf38b0bc3bab31693d7ac49da4b7cbbb3a1d754ecab1cae1ed2ea64169f828a21c1183cf0e76b35145fe96864a922 SHA512 e4ed1c9253d15f1112029854a170017d7eb3b292e8ed203e27ea80ee3fd3670ec7ed576fd4090d7e6330c2c98ea69cdba58bb48bd321689c5589b53278e5a1d8
+EBUILD mpdecimal-4.0.0.ebuild 1169 BLAKE2B 9efbcc347a83f32f3bcab1850cf766e7a6c786dd1488cf248cac5a44f62c075d50f35e177fd039ebb4961c8bb7fd00ae810c8cfe7d2e26237fd956ac9887f9a3 SHA512 0ef539a717add3a6d25f440ef5822468eed03e10c6378878bc3c48919b602f19c7791d2ecf9fec4a3db0f96c7ccfc0fe5914ca97865d971044180fdc39e1e700
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild b/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild
index 57dd4df31436..fbdb7d2cfbed 100644
--- a/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild
+++ b/dev-libs/mpdecimal/mpdecimal-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="cxx test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 412ae78c5211..b210f5dc6593 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-protocols-1.33.tar.xz 91504 BLAKE2B aee870dd5877b0fce05eac396bd1a8cd0bc5ef1ac014c54f3eb0096ac1ea3425d1e66891db29ba2f020586418500163bfe451c4078a86d1d19d0b1548318cc85 SHA512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef
 DIST wayland-protocols-1.36.tar.xz 95512 BLAKE2B 6c460106a2069ff9ce0b6c8221f85462e74d726ead69f6918417aac0cd24567251873ea05ec111a90f3385f4128e7e8d76aca42c7b1f89a070943c604b87573c SHA512 5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0
 EBUILD wayland-protocols-1.33.ebuild 775 BLAKE2B fc40e447290503ced6c8a592586bd7fdc0f390188923ee9919ec2858b603b5ddb89eda8b2600b39bcddafafe8212dacf54dd9561f71702071d1dd1cb588d91c0 SHA512 a88d020f6d34709c70422a73e2ab59bb95b266dc4eaf27f8dcb4e14118e761a9e344c1971698a921e49444539be81f03394053ea897760442528d578e03788a9
-EBUILD wayland-protocols-1.36.ebuild 779 BLAKE2B 4aac8181283dac0f2f1279a942d617bf90cec59b7e77f045795d38a27a8f2d895fc43960ad70770ba76ef58d72a71dfda76ddbfbbaa80123c9bbf917546f1c3f SHA512 d3e62fcdf057bcc4350ac5e35c53e452ea3b9c3441992de9376b4d234f86789bb4f6a2e26e93780cb589153ccd00bc2fc5d83644aac4357e28fbd56477429700
+EBUILD wayland-protocols-1.36.ebuild 777 BLAKE2B e4651c5f2ce1c5d411ac08da28cd5599a1fa9a75fad1afa2c6e9241369b19f3fe3c3dc84be8250ace45523bf54e2911127973918a071d01e12c8dd012cb10072 SHA512 dd4f799522f5df57648344f490ec266044de75570124be1b15f0ace04bc7a7ebca589cb2a8601b0ee3dc02493a0b500b54516c66f8a5f5135a16f3e9b7860388
 EBUILD wayland-protocols-9999.ebuild 782 BLAKE2B 028aa55ee023c349611b3c5ad7d23cdf0f0ea539ce1b9bfa2efaa4c7639f1149abfc83d217fe0fa7005a62467b31a06c5e82cd6e07ce6c88c49217365470cb54 SHA512 9a7769631992d9f5da2a7af180eded745fdd499df45475273c9305c30dcc956095b02aef46465dcd2405b9515bfb9a63cadd7edd21febf578813e3fe4c1c0ed2
 MISC metadata.xml 347 BLAKE2B e4265a94e0261094355613ac8617c362f90dc7207188658bf37d7d3d0ea87f598d0a5367d44c95cd3688cd68aeaad6be95ca1707430d06ad8b34bfaed9395f29 SHA512 4db809b42f57946d21f5c0ece2ccba39684da283ddfb72ed2bd6c1ace305c18381904dafa2abce56950cfb2bd1ead0839124c59302b1bb71c0fd8fc8f4a52846
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild
index 51631203d1a3..7820286edec2 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ac807ff6e125..5720d1e4ee55 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index ac66f4262f0c..105b14ff99b8 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -4,6 +4,6 @@ DIST base_quickcheck-0.15.0.tar.gz 73702 BLAKE2B 0f671b6e48d38ac92b8e5150c1b6f7c
 DIST base_quickcheck-0.16.0.tar.gz 76738 BLAKE2B b54fac86332bfe06b767345898c2e1a7a6f70de26cb06d16467d634eee3117d7ab571f611d17f692776c519dfa4ab7de9c948b08e44016e1e05fdff565a16246 SHA512 c859f2982140ec72b3377e3f167117df43f8cb14b62d3949e92ecf479cb27b4c31bb2dfa9111da24ce42f969452582ba076aef868d304b97c08f2918759cc291
 EBUILD base_quickcheck-0.14.0-r1.ebuild 810 BLAKE2B a304e470c32c2398c0b192f7a0e855d111080cbd37e9473f885784cbb3f62286fed610c4ac7f4a4c9aeb5bd552b6f838e6a13562e991f77a45ad74376731d27e SHA512 da77414509e79c78719cd15a1a04119fe26904eee3ed1ed4dac10f039973f91add34e5c50c1496f45bd7a85d256f8f22e69c3e3b0d1849ba6ab4340aa6f386be
 EBUILD base_quickcheck-0.14.1-r2.ebuild 797 BLAKE2B 3dbaffdc1a50fdfd24408b503cc4ffa45caf2d26436f529e40b43ae8e1193d9b6c7767fbb415aaaa71ba321a984288430f1caeac55b939543f6c7c237d330c68 SHA512 02485cd73f239c346e33ccb4c4f34b9e9179355e6808ee0f417feffbd4c3bd3bf583b86be7f21a3f31a21365d320fff08c4b28127070cafa2a3d50aeba3d79c6
-EBUILD base_quickcheck-0.15.0-r2.ebuild 692 BLAKE2B 89d39708bf56c14db63c2095d2a19eea8500ccefc05e5a78368d3279bd3e4859870e643aaea9d252132faa61deddd94bd76e13c0c52d47b57d7e28179cb8e6a2 SHA512 950c132a6cf668fbac9e0485172e128f5263347d42ce218b07c556b9f883c853e23d01d81dae2c73b7eb9937eee87edd008527a60425b48b9172bea0e99b6acc
+EBUILD base_quickcheck-0.15.0-r3.ebuild 704 BLAKE2B 92e539c8ffc4f16c4b3b1844cdf9b5afc72d979515752ddacf24713d3e4dc331b2e78641d6be3e4fb90eb9bb05c415d9371eace725fa621e4df4eb9852f21abc SHA512 f170c0277f5aa79e28d71a97f70dabbae752e032c4f6ca6d8fdc2d759e4a33c88d97d2b534f99a048ec2fc26feb6c2e8308e14bc034836b06edbb9ae1f792e2a
 EBUILD base_quickcheck-0.16.0.ebuild 906 BLAKE2B e93496937fab3776c51e158924f6bbd98f05f37c876a718e624a01b69a89c47f9c4ca83887a1c990f30861ef24a53a7e1515ae71d6f58e6b6a6fe9c8a1933b7e SHA512 5254e4acd0c7755450140c0034ad04227c22411b48bba86f7458abec1ee569781e9a759699cafa0bd3d09a3c04829354590f768773269d0b47f072278107d244
 MISC metadata.xml 324 BLAKE2B fdbbfc672f96e2bc7755d43e5d86233dca5d6dd44a4a0a955079a115d19ddf722ca61e3fcc3fc7005a20224454803727f69b7eab025739ef15054883743b2f16 SHA512 da6f6e438ee1d75de993b744be68b4a78cad69b465d6d580e4ce8baef5d7824b6d3805619aa2d85708a5e8659b59e894d7dc66cdf6960da3ac1881ce2617ea54
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r2.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r3.ebuild
index cce4d7fe6742..a4307412236a 100644
--- a/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r2.ebuild
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.15.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,8 +15,8 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	dev-ml/base:=
-	dev-ml/fieldslib:=
+	dev-ml/base:${SLOT}
+	dev-ml/fieldslib:0/${PV}
 	dev-ml/ppx_base:${SLOT}
 	dev-ml/ppx_fields_conv:${SLOT}
 	dev-ml/ppx_let:${SLOT}
diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest
index ea3f10c75667..3ba5981f1332 100644
--- a/dev-ml/bin_prot/Manifest
+++ b/dev-ml/bin_prot/Manifest
@@ -2,6 +2,6 @@ DIST bin_prot-0.14.0.tar.gz 342884 BLAKE2B 9210ca230d9f42ce3dd6ad18e66b62e41eafc
 DIST bin_prot-0.15.0.tar.gz 345362 BLAKE2B 654014d47cdf59374247bd904005972f60d24ee711da037fdfdfbd9d5318fcabbb5905df2ec7b401cadb9ce76fd5301917d3084002bae3fc61dc2debedab6024 SHA512 7adbb683ef09d9f3376cd8fff5d299c0d9cac350e14fbee5e2c9e038086e48c188bb115d0dc5701e82efc2076227a0656f49704cc8b783dc5a8d6c2a9735086b
 DIST bin_prot-0.16.0.tar.gz 343886 BLAKE2B f13574daba74d813810afb844ebd300803279fb5ab0c067b64dc13230a0cf5d88b46809892465b7bea22e41696c962de40f5cb7c05099a98de7c01f0a7f96240 SHA512 e6e2b4c2984fc89fc7ceb57cae7b7f796e6a0441e4d37da1b6bc1f167d8900b1c4bc0174d5d9de5669b7539d9256293365242e9875ef78fccbda226635c63b5d
 EBUILD bin_prot-0.14.0.ebuild 678 BLAKE2B cc7c516c93044c22e49d758179cfcf843eba6e1203e192ff60ca0b35d705ced5333c72d60a475ef7145f1a98073b7c75c11b5e3774b4bf0682d24b27dd5aa6ab SHA512 42a42908de039f1d16b2bf4935051d6a6b51dd4c0519416d04325fe122da7864072bebc79985a24fb03f8298290bd5aaf60137ce326da4a691c22383f7138d45
-EBUILD bin_prot-0.15.0-r2.ebuild 716 BLAKE2B 956bd79b4f5244188312f75506e5ee797f67872fa2d4e02cfb2130ecb957ef8996615cc98ba20c0ad489a5f7f02f8a73e05fc4de88157bf298d6bc2fc591b0a0 SHA512 6e7ef5f3acde49f0c52e9893308bb0937467f7af5a4c13ea819f75d0c9f52ac43b9e3304975f9dbd1ae4a54983d73f3c7c4a692134d4a6fef6e7d0922b159161
+EBUILD bin_prot-0.15.0-r3.ebuild 725 BLAKE2B 348732fd337776930c9bc59277d23a7e2deaa245c95c8d6f864ad975fa67dad308670a0793523f09b052605b371f2d690204e6c172c3d937f4fded1e5ab90f53 SHA512 9785e676848e1e6c9c7ccc411c1411ba324c4311a7f619109b1556f1f8505113b340161607348711fffea90f3aadcd73833b0794461dd6cec88bf6877d799f93
 EBUILD bin_prot-0.16.0.ebuild 754 BLAKE2B afc54a04f374ffa37d4dc1c5df4c78ac51cd29eb97b3139f5bdb8016aaeef020af01ac137acb020fe37706b0e91cb81df2b72da36535c4a93274a41cd61b64a8 SHA512 47e09c9d1af27fc83d86989177f5a5b8e6b8368c07e8298d00636afcb945b21e6449affd5cf374a23911941dbf2c3bea1f697eb73b1173f205e94e87a974f4dd
 MISC metadata.xml 317 BLAKE2B 5a1a8df5a5a9a119f1d51f99bdedb24e153c7159e13ee59f1eccdb1b9d5018b3ccede38b2a766d0dcefc56a9cb7a1178c5574bffd180eab1c8ad451f9d7f3e77 SHA512 1177d89b299a879a46a3ca36660a88c86871376b18077abcada26861a76b2dc5d7db41243ebeb98322cd64a5aac16a4c3419a1fa76290ee1e0bf9513bd83d7fb
diff --git a/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild b/dev-ml/bin_prot/bin_prot-0.15.0-r3.ebuild
index 8781d6b879a4..edd341e71e9b 100644
--- a/dev-ml/bin_prot/bin_prot-0.15.0-r2.ebuild
+++ b/dev-ml/bin_prot/bin_prot-0.15.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,14 +15,15 @@ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	>=dev-ml/base-0.14.0:=
+	dev-ml/base:${SLOT}
 	dev-ml/findlib:=
-	>=dev-ml/ppx_compare-0.14.0:=
-	>=dev-ml/ppx_custom_printf-0.14.0:=
-	>=dev-ml/ppx_fields_conv-0.14.0:=
-	>=dev-ml/ppx_optcomp-0.14.0:=
-	>=dev-ml/ppx_sexp_conv-0.14.0:=
-	>=dev-ml/ppx_variants_conv-0.14.0:=
-	dev-ml/variantslib:=
+	>=dev-ml/ppxlib-0.28:=
+	dev-ml/ppx_compare:${SLOT}
+	dev-ml/ppx_custom_printf:${SLOT}
+	dev-ml/ppx_fields_conv:${SLOT}
+	dev-ml/ppx_optcomp:${SLOT}
+	dev-ml/ppx_sexp_conv:${SLOT}
+	dev-ml/ppx_variants_conv:${SLOT}
+	dev-ml/variantslib:${SLOT}
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index de6fe6db8296..ebc17e939227 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -20,5 +20,5 @@ EBUILD camlp5-8.00.03.ebuild 1032 BLAKE2B 1bd1b75aaef3c011d8e849207957fa79f9b908
 EBUILD camlp5-8.00.04.ebuild 1027 BLAKE2B 2f87e4c473412a2a29db37eef23185e37fc9bc6cb3938c2362efd3fda5bfdca8e5b6daa77842cffe62136537c1fc854f18aa3b11af026bbf9b7905200b1b61aa SHA512 d848ddcfdde33335f8b089152d4d2ce23f24e6900dc608c08bcb1556682691fe708db2d864687375f3786c6c805566e1f007b2db555e43686fd168d6eb7eadd2
 EBUILD camlp5-8.00.05-r1.ebuild 1063 BLAKE2B b1f522d4899b5611d2ae4fba201ffb7287c9d5cb43b9c30fe433ccde7eea9ba264382509cb5b0ccf88b6e63ac226f3b7a6c4b346a05664e8151e93e156758e6e SHA512 20ce339fc13a53a0f99a6b25a252abc8cee6a2b79a94bdf42aecb0186a269875aab7fc083434578cd8209f393ca54a09481be2b1a1e2a96f2f336b21b6ca0141
 EBUILD camlp5-8.00.ebuild 1065 BLAKE2B b89352f90f3a868c7cbd615815c160c1b01fe6b2c3a0b224ee10d72f777006376f5ab1010d72244df84b7f5633c1bbf86af8a918497b3d3e103388d0f0e34932 SHA512 8404c5d01f7f0d291de0a49952999cbef1043496da88777ad6efb9dcf6e2a39fe10f863e0d5f60a9ed704f7b7206b11982427ee8a8e177db2ab6b97ccf79e098
-EBUILD camlp5-8.02.00-r1.ebuild 1160 BLAKE2B 1fe12bc08f6a43123e46b977f8ac3b5c2812f91904261cac4ca0af27838f69cff3fb032a5269e6cdd53ddf0dafa745ab9a536b28aa4be177cbf3e30176854df2 SHA512 4a365c6c7bc30dbe9faa981c96cc81cfd603020cc1f04fe860bbc3608446aef6bb5ca4374e0ef1e32bcdc3d65f1f60f394fcce08590ea466264842f9e74598a9
+EBUILD camlp5-8.02.00-r1.ebuild 1235 BLAKE2B 2ae733c450ef42eba891eb938a9eafdfbb5ba608db3dc15e3f0a4268209da2d2c082b68b2ed6c5816b172ded6356daa1fdc80a97978e888dfea6ec5d12c9f88d SHA512 840977f448b9e670da2654e176a8a1a41a145b3229db61d077fa6ec5bcf1899b95de1c350bb53150d2bd7836894606f6aa119acded2f29c5239def09db21095a
 MISC metadata.xml 311 BLAKE2B ef93d263a9d778f941d96dca1ece274461848e686ff734be2bfd263d40e4c4601bfdedd43ede207c877e7e53f83d33bc9731548208d967cf53b273060e07c23c SHA512 c0696f3af354837edfa9716842763347f3c30340e6e517f806d6f2ad9d1160b748e26864d520bea467977a8285847fd52999aabf1aa741fdb2e122b18635d38d
diff --git a/dev-ml/camlp5/camlp5-8.02.00-r1.ebuild b/dev-ml/camlp5/camlp5-8.02.00-r1.ebuild
index e984b76b319f..9ef7049a8ee4 100644
--- a/dev-ml/camlp5/camlp5-8.02.00-r1.ebuild
+++ b/dev-ml/camlp5/camlp5-8.02.00-r1.ebuild
@@ -52,7 +52,12 @@ src_compile() {
 }
 
 src_test() {
+	ulimit -s 11530000
 	emake bootstrap
+	if use ocamlopt; then
+		emake opt
+		emake opt.opt
+	fi
 }
 
 src_install() {
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
index 40b43b94f91b..59b5ed0d41a8 100644
--- a/dev-ml/cinaps/Manifest
+++ b/dev-ml/cinaps/Manifest
@@ -3,5 +3,5 @@ DIST cinaps-0.15.0.tar.gz 9697 BLAKE2B b3c28b54269b7c35070b1a61b99087986aa5fead2
 DIST cinaps-0.15.1.tar.gz 9752 BLAKE2B 56b0a8fda6e0e420b3062001f853e187c78ca9adfba7a2204845f61f6480fc9984578db00a9aaba7cefa2bc41234d710a2079300b2dcdf6791d6e037d0a82f3d SHA512 ca53a9da8aa71ce7cddf7e24778e9c4d3f3e5784209da85a5a6b2d5af83cd8ad769fbe3009d2757ebf4a25ca39d76af00ebc693b1b01c3b53c8775ea479123a5
 EBUILD cinaps-0.14.0.ebuild 516 BLAKE2B f28b9016d7f10897d4710fb4ecc568abd70388ad6ff144c6bd5597bafac81fcdfb5e204dc572df22068af170adb3b71a1dcaea9fa71cb7352e0f4d4c8f7ecf40 SHA512 a1771d0a228c4439895b66d6e743859cf949c40151ee6b9f2f69c1c967c99a2db369bb1480891a2ec261e27b60ef15bbf2f2381a3e48b3459e9b43bfc6ff777f
 EBUILD cinaps-0.15.0.ebuild 505 BLAKE2B 16fb7e67db87e015a36cdf5a5b1e052c3e34a481a75f5b093584fb2d1ef8f938285035c698de6dc5c13c8bd17c276a7336e2b3ef2aa40dcfb28453030d8aa1b2 SHA512 10077b881484ed5b5f7024a50b184b197220bc37909de4042c121b259c0345b8fdb943ca0d9d1d2865588e536306d75accab3988837979fcddd2163c47db0112
-EBUILD cinaps-0.15.1.ebuild 512 BLAKE2B 4ae347c403fe260c259c8a277d3449b54c12edb56d15df0ff069e4c4b1c8ae7df3181eeee46c627b2e3fc57e40c556e5a417457975bfd7c9f4d22ffebdfd2b87 SHA512 54a84205b0d742c644e900e0aa186b03038548123af6a32ff200a6fb3010fdbb9cac1183e4a7de01bd6d52c35a450df564f7017d132ec88079d37eaa3b65f730
+EBUILD cinaps-0.15.1-r1.ebuild 521 BLAKE2B f2d58d80d367104765865ec0e14192226890ef86eb5d365887a94e770a8a96190baa9d88840f645a85b6c2cdd2a7fde563958c30d7cb06e76e052d59a30a1f9d SHA512 477e516125ffcbe374c4e94c9403def38134d3d8fb3634492573ef13d85c194a43a1505919a8154976aa99c674d6d6a0c64add3504cd8762c937bdd1e154b93a
 MISC metadata.xml 314 BLAKE2B 5469c8966da500b0cd8dadec6ca3c9a5d2ca1aeca2390bf7fd555a19dbc0401fabf2b5d00e0c8953410823952693c2d47d17332e3fe3dbda380e92d3e96210dd SHA512 d876d219a4ff6ce6d728a59f29aca5b1af2d7737a037af078a9074c65e971d52e0dbbfe823b9ebf66780ab3170d95b171db32841d12290dba24cda56eedf787a
diff --git a/dev-ml/cinaps/cinaps-0.15.1.ebuild b/dev-ml/cinaps/cinaps-0.15.1-r1.ebuild
index 2dc682d7db39..6835b84aef60 100644
--- a/dev-ml/cinaps/cinaps-0.15.1.ebuild
+++ b/dev-ml/cinaps/cinaps-0.15.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,6 @@ DEPEND="dev-ml/re:="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	test? (
-		dev-ml/ppx_jane
+		dev-ml/ppx_jane:0/0.14.0
 	)
 "
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index c66a60a25263..23700aed4dd5 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -2,27 +2,13 @@ AUX dune-private-libs-2.9.3-test.patch 951 BLAKE2B 92a7e9838cdc0e57219956fe8d9f3
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155
 DIST dune-3.10.0.tar.gz 2640800 BLAKE2B 5fc479a91ee6792f07a4fb61af530d55f46dea56b2fd5919975c0bfb231229395e7d0769bdae88419a89d378b8d7e2b229f7410ce7a34414629aa5117e606230 SHA512 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de
-DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
-DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
-DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
 DIST dune-3.7.1.tar.gz 2011275 BLAKE2B dd0f473a720fc65ac550a2aab64930ff472a9bd306d603f088d813817df56148f676abe2a56ff3458bb1ed887784e565154eee08988bf984585b35bc9333d929 SHA512 d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b
-DIST dune-3.8.0.tar.gz 2564537 BLAKE2B 773a2643b187f37dd2e21df41f18818753e249e66c2d98a4cfee3d9997f528827b2cf3c60d2992ffdc51397c393ac1a0fcc5339bdec2d87f82252114394d2355 SHA512 bba32fb508265329a2a46c9bd2e8b7e5f3d6d84390e842382ff4790f0d3414c9ff1d005c1af88988daaca29749729f1ced7b388f2d96432f01f2f4ea4714be98
-DIST dune-3.9.0.tar.gz 2609923 BLAKE2B f9fe8fb3c2e002e1eec141f487709d592df969ab44d41012ebaa436f17b6ee679e2e763d479106ae722b8b61be03fceb701b314c40c001d5895db99e5fbbe4a6 SHA512 86cd66222553f8cd7c1d1fb9e4e55169f9cd6d92e0bde1c56846b5e0fb6ae8494ac15ebb68d9e8761240f46dcc9b480747e48b21b74cff86e52cc45d3d222070
-DIST dune-3.9.1.tar.gz 2610113 BLAKE2B 0b97f6a951bd013a156a1417f6b65df17324adf13d48ad3b8bf45a4133cc77195e2118ae95f0cb9da488c26378b58ce677db8eb4b3cb028a73c779be57b2d611 SHA512 c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b
 EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.1.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.3.ebuild 4426 BLAKE2B c890e269face1e352e76f48307a3b411b46e67cd2bb81038094d714b01c8e45e4783688fb499ecb2db10039082f69e6389c3be01391de206a486f51d746b1009 SHA512 5c1c99d797c4e48ff059051597ee1912fcc296d5c5934cdf801f976da9d34ccc3023d14c8606be44e554ee44fdd47197384ddff6075ebb05b73c9341f5ae7521
-EBUILD dune-private-libs-3.0.3-r1.ebuild 864 BLAKE2B 501bf0290ce221b69348465d0a65e034ab3266f8e5c24a3e94cc6120ac2f77001bb33d60afae4c879c2029b463ed0a2eb98cfdd1653b8144e507147a7dba2995 SHA512 08157b52992d00ca4cf1b065969ddf7fac6591dd8490aabdeba264e52f7f439a38b4959b55d4bc74545bc073673468e6584f9a3c4d2bf98870ba9eeaee6e97b0
 EBUILD dune-private-libs-3.10.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
-EBUILD dune-private-libs-3.2.0.ebuild 782 BLAKE2B 2947af0152f8ad349bfaa2873ff912a253bc7ca42208450b64c2362f06d1479e7a89aa0eee8436ee789d3f0404f763ec49c6c4eecc213e26f88b9a617e1d9ebd SHA512 8da351970a0e88bbcc16bd8502b86cd3d47f549882062f73b308ce5e10c42a10710d0aa2a35fabd47cb3c5980d41408a3c4826868e71834316c1dc4e5b2a3466
-EBUILD dune-private-libs-3.6.1.ebuild 784 BLAKE2B 62940b51283133479f87a8a83b92a6346cbb4dc54269c0e8fc02155808638e7cb19db12bf54b40d05c3b5703f389cddb08eabbb96cfea6cb4c0ac834649d8a6f SHA512 986b83813242e72a90f705b9ae7ac021cb0900b343a7a94e0cd629b120f134828b677dd47ef0a4a3e372a456e813804e0c2ba50dc2bc45a624af3b9b13be11e4
 EBUILD dune-private-libs-3.6.2.ebuild 779 BLAKE2B 35d2f09aa31e0049b39a1045590603b13ede0eca4fb51999cea97b3f439d9c14a3db12de4483bd391f060e9f502d9f7b786e453cf04bb1b6c5dfd86d32584b54 SHA512 ee8f8da94ceb3fe5bb0d4ccc8119d9f73079f27827556dc5c1caf82545bb92771733d32217f74d6e982f969c8b87635181f1a672b34f93a397d36aa0ef472427
-EBUILD dune-private-libs-3.7.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
 EBUILD dune-private-libs-3.7.1.ebuild 783 BLAKE2B 0e5c4ad9466bffc02f904bbad79cc6ff4c5b2ada28ab60840a756d3c3daa23eb6ca42398cd27a00355d11f13c1490324f54fb078f4a3b93b43658bee62fd4462 SHA512 9b6095ac9ee29f000beb9108eed8a992e8832dc71b4c1ce5b5dc0c9d1358936728cacea8929e0f6fe691c9908eab57cd72057a8e77d74cd53733e58e79a3a5fa
-EBUILD dune-private-libs-3.8.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
-EBUILD dune-private-libs-3.9.0.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
-EBUILD dune-private-libs-3.9.1.ebuild 784 BLAKE2B d7cb093d8304d9817c94542c93641570ab28ea13ae11f0a442685164f84d5e6c84bbd11916fbe3d65b66ed59aff0bb6b871f6297e4c49c5bdb2c666c5504a60a SHA512 22904dfb998c4440a59d587f569b074032f690b7e4b837a27daac4b93e1631dc5d02876c6955e2684d4fb4e16cf75ca3687fd93f324a79f418240bc55878491c
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild
deleted file mode 100644
index 5000ebb7def9..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	./configure \
-		--libdir="$(ocamlc -where)" \
-		--mandir="/usr/share/man" \
-		|| die
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.2.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.2.0.ebuild
deleted file mode 100644
index 40c7495b31a2..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.6.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.6.1.ebuild
deleted file mode 100644
index ed9004236c37..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild
deleted file mode 100644
index 797e233bbac6..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.8.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.8.0.ebuild
deleted file mode 100644
index 797e233bbac6..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.9.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.9.0.ebuild
deleted file mode 100644
index 797e233bbac6..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.9.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild
deleted file mode 100644
index 797e233bbac6..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-3.9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune multiprocessing
-
-DESCRIPTION="Private libraries of Dune"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
-	-> dune-${PV}.tar.gz"
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-BDEPEND=">=dev-ml/dune-3.5"
-DEPEND="
-	>=dev-ml/csexp-1.5:=[ocamlopt?]
-	dev-ml/pp:=[ocamlopt?]
-	~dev-ml/dyn-${PV}:=[ocamlopt?]
-	~dev-ml/stdune-${PV}:=[ocamlopt?]
-	>=dev-lang/ocaml-4.08
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune build -p "${PN}" @install -j $(makeopts_jobs) --profile release || die
-}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index e2970779b395..68231a838b43 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -2,7 +2,7 @@ AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591
 AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb166f784e43ec85f5d9c60baba4d1c7b3bf9b745c57c57887ebe3b3864e18c9daa32351d37c98de50a0cbfe138e9c8c6391c3096ca91916e2 SHA512 6776041f27b7cacf4a62b6f0fa5929672efdd4147401d7a8b7536b33ddef9db8ec923c999e5ae8c39ef634526f4316517606c546f5c3b588d2f0c9c4415f96c2
 AUX labltk-8.06.12-c2x.patch 2004 BLAKE2B de15e8845f52c5afbe55a3073ff9de48eccc195b807bc5b3be3926be5be39d1e82d8104b3e20bb135b66b29d17255cef6da83fa87478cde855a5f6f9454f20ba SHA512 1244edf70dc5e42cc11bc7b92dbece31cbbe6bf2b86e9ed3f78543ddd7f3b8866abc8e0fe5929123635d6870d1b2e3bd79dc0d6a430a08614541fee69fe0723e
 AUX labltk-8.06.12-c99.patch 545 BLAKE2B a54e5bdabfa14ee0f28d5ec2a4c3117d604a1933e5c0ccf6021158445154e9204670018696067b5f126d9cdcce91515565c4697ea5e7e4045c6d259c456502b9 SHA512 118ba1606dd510d34766fcb1d82011025f6b2fe78503ea34fa4d913e13c2402bab19f9c63f09bbe87c53845becaf8a59102492dc499e803598bd4f1c063b812e
-AUX labltk-8.06.12-shuffle.patch 1486 BLAKE2B f463d68056f9a8b4e691b4d6c20080a95407e8cdeb57b95bd7cefdb01df1920af7a8f24aae7842447c02a98339fc691568c60254e64b5ad2db996225276e28c2 SHA512 4e50f27c3030a0b70efa49fc6367cc75117054f3956ba8adab2834bc5d08738154b324b7434abbff574272055fedd2bf3b30bf675645d7bd84e3dc82d4ae17f5
+AUX labltk-8.06.12-shuffle.patch 1731 BLAKE2B 22a6cb1c5dc372a4eda36fa25a2f658abcea2b0be82cea426c7fb5da54850b0c9c80cb892020e6387823692a7cd952347fe694191c9f738f4475e77cd18a3a5f SHA512 9c54b3d06b674955c16bbdd1de3e195bc5504a11c0771d29e53cd0190c397f623b3d58291e4c9435d120aba43d0273352b675822cf1b512e54fcd6f04db9f316
 AUX labltk-8.06.7-configure.patch 680 BLAKE2B 4442a053aa034f92c923cc7672bb953cf61b3d9b8f402183dc9dd2fcf13d85988f659280d9509ea1a1e05eb0df2c0ec8aa32632ea7dd4974f95353e74378d572 SHA512 d5c28d21f365ea942b631643ea3d2328a63c96ff81b99586ea8a58e4d0e5a5f22da0cf7232c616e61d40da1a1773fb19dc1bc9ce4cfa5d8017673ffb4ad61547
 AUX labltk-8.06.9-configure-clang16.patch 1461 BLAKE2B 0815daa22884930b9fe83e4b0cafabd86831e4f0a5a5f5355f658d8ac1bcc04ad68eaa5f6e85014613c01eebcdd323e73c3d8512cc2a6fefc35d3811b228a26e SHA512 3738dd7391ef557aa261887b9b3c8602ff5566125a386212405549560f319e33657ef4f23bea2784f5bdade7ad01536e3f1137ef60bae585a01bfcbdee2524e8
 DIST labltk-8.06.10-warnings.patch.bz2 4194 BLAKE2B 106e70dac1601a831a46a21a4013f70d2b9e17f910b8c09fc2c976840cd2e4d29dbc9be50cd7efa469d50be984cae82b56783a4e8d9a0bfa308d1d4466e44039 SHA512 eeea791a4e901335f6e010983da85d72e0a6f9fe24ab84bff5c0e46af941a5bb39995ad4d475894855ecb75d5ce26c1280a74d059e845301b30f6a386b2338f8
diff --git a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
index 482b18370ad6..62fd8997f212 100644
--- a/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
+++ b/dev-ml/labltk/files/labltk-8.06.12-shuffle.patch
@@ -34,3 +34,13 @@
      jg_menu.cmx jg_memo.cmx fileselect.cmx ../support/fileevent.cmx shell.cmi
  typecheck.cmo : ../labltk/tk.cmo ../labltk/text.cmi mytypes.cmi jg_tk.cmo \
      jg_text.cmi jg_message.cmi typecheck.cmi
+--- a/browser/Makefile.shared	2024-06-05 10:08:38.886219581 +0200
++++ b/browser/Makefile.shared	2024-06-05 10:06:05.142920155 +0200
+@@ -71,4 +71,7 @@
+ 
+ shell.cmo: dummy.cmi
+ 
++dummy.cmi: dummy.ml
++	$(CAMLCOMP) $(INCLUDES) $<
++
+ include	.depend
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
index 7282003f9f1b..4beb324656b7 100644
--- a/dev-ml/logs/Manifest
+++ b/dev-ml/logs/Manifest
@@ -1,3 +1,3 @@
 DIST logs-0.7.0.tbz 18458 BLAKE2B 091d1778166af0b67e17e932a775a73e31e5d167b94b1b378063a7112c21bf1ac935c7e51fe29bcc0121cd5e60ea46ed3c7381f4db5df400b463feedfbe89663 SHA512 657f66eeaf5788947a3ff4b2a179f7e192ad4ce086fc8968286066d4b83af476523b3befce50ee58abf2d9b8c8dc65573ba8ed62f9c5e7933db29a7fb769646a
-EBUILD logs-0.7.0-r1.ebuild 1397 BLAKE2B 758784d84afe302e16c7241ce3f7341775d87e33ab5738b43075e966128d906f14096ac2f68101b8ff6ee16169bdf4b2e4d71d5da696747c1be259086e42fe5f SHA512 3322ac8b100655400815b496b02c5cf48285f492a89f47eed667ea04800d98afaa20bc151150ad6ec6bfd4475c8c3ed19d2d54c2fd8521390a3a6b03e8ea20fe
+EBUILD logs-0.7.0-r1.ebuild 1405 BLAKE2B 8f96f065494cf52bc1ea5e7a2f11ae736359a776371c126c8a09576d5500707b3f9ac0d0e38c8259f49110969dff027b93a29a8aa06e6697c35385b699c3b98c SHA512 12281d5259ebce7ad6704b84bf0b41ccc0155b33dc5dc6f3420e801dc3e86d05c8922ec33b225b7da7bae6a3efcd65d23da3c9afafb38ee7e85482e8ea36127b
 MISC metadata.xml 587 BLAKE2B 9280d7927d1cc4fdb3e48feda36a486cf45a8cfc4da9248d3b4908958c6a4ce01e12e76ec5c32500c8e5d7ab7f228c12d47e44fddcbbbfa6e731ee14e88314c1 SHA512 a3ef80fa82dedd15f554eb59fe0da20d004eb0e0a5ca9bc110c4c0d0e466037239bd460bc303111143ca00256f28069195f17038e5eef3d5da9cc63492c56a69
diff --git a/dev-ml/logs/logs-0.7.0-r1.ebuild b/dev-ml/logs/logs-0.7.0-r1.ebuild
index 7e84cf5b1c70..f2a489794097 100644
--- a/dev-ml/logs/logs-0.7.0-r1.ebuild
+++ b/dev-ml/logs/logs-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ BDEPEND="
 	dev-ml/ocamlbuild
 	dev-ml/opam-installer
 	dev-ml/topkg
-	test? ( dev-ml/mtime )
+	test? ( <=dev-ml/mtime-1.4.0 )
 "
 
 src_prepare() {
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index fae381879d24..c9a9c0192d86 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,10 +1,11 @@
 AUX ocaml-ctypes-0.20.0-shuffle.patch 956 BLAKE2B b243f32eeae709e2cdbf61b17c4a37c54da300c106c7d64dbc3d610a65455fda674365499a25d67f57683cf2235e842d6c63c9fa1a2840e492b31f7341896674 SHA512 8cc98acafa7d16e851c90b52d728f913069de5a991c08b87076311ce22f3e5b584dff55312d4e047a7ebb60bc2ac254d8c1a3c852e6347529caca4a630c3b914
+AUX ocaml-ctypes-0.20.1-shuffle.patch 1061 BLAKE2B 8d9b181fda78d850b49a0cd04d6174dc38f2a71dd8459057f31a7cefdb5ae89daf444ad519abdb591f054b11aaa1a345bf2fd41cfae4a37f9230aaecaf944425 SHA512 03c90394c53d389c1772c606da4a9cc73f55e898820e5596fe927796b8b8cd4c0af2174e2dff59c589a5377ae99778ad6bf3e66a234f101cec33cfa0dad14043
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.20.0.tar.gz 206559 BLAKE2B d9bf1c3f5ae7544e3950766f7eb9bac2c9dbf84130f69b2b8807e55c6a7d659c46d9ba2227d53d578e4e49283730932213eea4c7487beffe4540432b3e700c81 SHA512 605ae95b0233f1157749475526ef00ade2f97649d06a782e8fcf97b604cb86a0dcc8f27c4ac6baec11a41b9ef5becb0e5ae55e30f1ee61b30d4ae17a0d1545c2
 DIST ocaml-ctypes-0.20.1.tar.gz 206863 BLAKE2B a101872991d4bd83464d26e79fa5052c9dadbd10da1ae734fda8976199640091939777a1ba391d2aab84d7e14fafec6f713681e2ea52f6717f5f36d26e8aa225 SHA512 f95e65ce5003a07634afcbee431cb23c54c8335f926074615fc8d76ab777b9d2fce8f75bb25bbb6ed9550a7d6237fb377aa9ad65a426d2d7e387f86c1158fe4a
 DIST ocaml-ctypes-0.21.1.tar.gz 200264 BLAKE2B c4539c8856c1919194f11ecaeb1b0649dc701a6c0dda62c4bb750cd64a9145f2e4a9e77392385e4e398e8e89d5ae91b7c5f68b6242f826563f0f32b78497dfe1 SHA512 3a64b29746360e7dda7725ce7af23ca64cd6a3fa585aa70188cdd143aace744f44c1bd13cdda5c9733ca53d4b874ed42749ca21aaff4f4d53636a390a2c7f94f
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 814 BLAKE2B 3a5bab91cdb4045286fd81c2fa5e6665eee9563de65008100d1f12c7930763ce0c32829cc908d1d9fe58ce6384267378a70a413b8c66368c89a0b9d21c9f4626 SHA512 b855d0975c4faef9516d0ea261f53cd913c314ce58a2dc18183686f2de17e8ec8e33be7b5529b933d070c8c6afaf00561fa5011e406688367be782ddbf555dfe
 EBUILD ocaml-ctypes-0.20.0.ebuild 908 BLAKE2B 18279ce659d023b2c256ea7aef01220851fba9b3e871e1bdb50305977c40cb0e8304a021f4965dd9a0a832a3fc19841a368ec5cb84c885812680351fcf588ec5 SHA512 bd6fcc9f8b186bea5313451f4ecba179f9b28ca079cc29e1ad9c90f6fe9447f40424575684bf7dd326dfa65434d70125bafdba7e9e061c6dd1530a9c56597562
-EBUILD ocaml-ctypes-0.20.1.ebuild 912 BLAKE2B 37467f18078dc8172d6e71e36d105c6a0ed602a73688d7d58c97c846ba9024fc055b7e4d65a4a822095ef577bbcd800eb09f30bae6a1a3d5afe7a9766738bfb4 SHA512 2cea70fd4c3801a790127eb7d93e639dbb4d74210e649f873721aaad21d18b2f1203bc98ea3234981b63fde30f7dede52eb28df129e608636c10bee861b4b35b
+EBUILD ocaml-ctypes-0.20.1.ebuild 947 BLAKE2B 20f4f138e0f69d5b2bf8ad5677f64202cf2b03ffb448129bbf112c36d86b02f1e14a078a489d612264d8f76f415518f72f5017b1afa7b2e9429beb9872cbfb4f SHA512 9a6ccfa155adc9f218587e8963c57c347ecab86a70df337aa22a38dd3cad108e22d19d24f79d7c119e924d5269a0da630e377a7c910e5ae1c6df06a3149a1e63
 EBUILD ocaml-ctypes-0.21.1-r2.ebuild 758 BLAKE2B d80cabac94facb42a8350f176a5b3a34847756f3d9bdec85b7711f987fb2305fbb8c6d005f331d4d38235ac7510bc19c3bad8310cde2143b5fbd736e7c76fcc8 SHA512 712d71fdf81e6ffaa8710041f4515d68660e441349fa3ae3dddb13a827b82882b2a66b0ce86aef8b873e52f69741f8ac4e686f9fa4ccabf3d73e77f03b238641
 MISC metadata.xml 317 BLAKE2B f25c1f9fc2dea5d1afe9f1cc03667a70564a3134b5211b494adb1c9bb0be9d77ca4f7bbd9ceda2a81458476e06c9cfcaaeceacd338e40b898b4454d518fae025 SHA512 7262b7766342484afc74b5c30fe4a7a719219c759eec469b86c1926dcd6deb61f0ba0ab5c71e37e4a1f921ef268433f9f4166eee5955f515142fdfdde2c968c9
diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.1-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.1-shuffle.patch
new file mode 100644
index 000000000000..1b56526f2abf
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.1-shuffle.patch
@@ -0,0 +1,29 @@
+--- a/Makefile	2023-01-24 08:35:02.515456277 +0100
++++ b/Makefile	2023-01-24 08:35:45.459755298 +0100
+@@ -81,7 +81,7 @@
+ cstubs.public = cstubs_structs cstubs cstubs_inverted
+ cstubs.dir = src/cstubs
+ cstubs.subproject_deps = ctypes
+-cstubs.deps = str integers
++cstubs.deps = bigarray-compat str integers
+ cstubs.install = yes
+ cstubs.install_native_objects = yes
+ cstubs.extra_hs = $(package_integers_path)/ocaml_integers.h
+@@ -93,7 +93,7 @@
+ ctypes-foreign.public = dl libffi_abi foreign
+ ctypes-foreign.dir = src/ctypes-foreign
+ ctypes-foreign.subproject_deps = ctypes
+-ctypes-foreign.deps = integers
++ctypes-foreign.deps = bigarray-compat integers
+ ctypes-foreign.install = yes
+ ctypes-foreign.install_native_objects = yes
+ ctypes-foreign.extra_cs = dl_stubs.c
+@@ -111,7 +111,7 @@
+ ctypes-top.public = ctypes_printers
+ ctypes-top.dir = src/ctypes-top
+ ctypes-top.install = yes
+-ctypes-top.deps = compiler-libs integers
++ctypes-top.deps = bigarray-compat compiler-libs integers
+ ctypes-top.subproject_deps = ctypes
+ ctypes-top.install_native_objects = yes
+ 
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
index f321f7db9334..e088849da77f 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit2 dev-ml/lwt )"
 REQUIRED_USE="ocamlopt"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0-shuffle.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-shuffle.patch
+	"${FILESDIR}"/${P}-shuffle.patch
+)
 
 src_prepare() {
 	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d4d23eccd0ae..839fbb76d2d2 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/annotated-types/Manifest b/dev-python/annotated-types/Manifest
index 3b2112d4ab5f..a357462244e7 100644
--- a/dev-python/annotated-types/Manifest
+++ b/dev-python/annotated-types/Manifest
@@ -1,5 +1,3 @@
-DIST annotated_types-0.6.0.tar.gz 14670 BLAKE2B 9390abe727f9b7a777e8266e192e032e2f36703c76a60e7fa34dd5517db8129f75e617b67ff88e9f299d10dd3f076d6793bf86e04b6230f2c4df886a8e0719cb SHA512 6b7f6fa23f47758d955822564227173951d6ddd854397b0c996bb6adeadd9caebfab6d193595be17003c1ef0e81a6bd8e20ec8221a70ffa35f9a4414300e788d
 DIST annotated_types-0.7.0.tar.gz 16081 BLAKE2B 45f536bafb0a9dead41a7fcafe50304508df5024921c2b3637ba51ff144d46fd8cba4d503a65fcec1a973cf2cd791074a83d72fbd2f17269bd9a2d2b9f8c114e SHA512 8a6dd7274270397f7779fc4ca242997ad2ea739b530be5abcc30a72d1e4042fc08753ab432c3d9c7a53c7474b3794504062f68235885cfb6c688cce0700d8758
-EBUILD annotated-types-0.6.0.ebuild 581 BLAKE2B 4556431266beb2f6440ab13fe49386741c77168ab0c2c36e2a78841255d7e8f7cfe5b2786045acde97bf23ba65df5cebba3b422f8e7aac1a9ffe8a8909427aa0 SHA512 715ac6385bc30024a6aeb88bc5f7d3fa1117301bbb0c86d5da6c6aed61fdb5c34a20dfafc7b1b3314ee5fb953a4b8087f2a724773df9d0195bf098cb910811f2
-EBUILD annotated-types-0.7.0.ebuild 859 BLAKE2B 75f6a98de136eb1def9f5491895c29e10694701642e299a6512da080e47bb9dc9614861110a7c6f2fa4428f776295311dc4fc9e05a3191642caf54ce93ca9daf SHA512 322b785591b3a060c375b38b57d4041d8b4008ddfe12e0b1498c1fa5d2bc4612f7aee88120165ab5d12d8d56fae814d1ae99182601d8fe2e58a3f57d1889d126
+EBUILD annotated-types-0.7.0.ebuild 852 BLAKE2B f42b4a4678c8178f7a9f423c740b5593a9e3e6abde38a152d4cc7da38b2eeb6ab20e42f48ec87ef4ed0132e3c95aa1f170c163b1a77b01d72fd120aa5fc93b7b SHA512 1932fabc7111a99d4ed6d6f73e34ae172847a20aca5a7d4026b613b6486e58f734ec381d7edd07094b95c9b30949e64c5f86b302f7c5a1369f5f3a0bd2d4c032
 MISC metadata.xml 414 BLAKE2B 692ebee33e03288b0a5ec5fd649cceaf7dd6043893712deb3204371965898d12390301349644d4daebd014f09afb6a89731144747b061f872d7e75e8c4f3b668 SHA512 6434d35a1cc78c487e02a2b19d56b2778517adfa07f81003cfd981fca0c49c0f26c95139865a02bba22ea10991639b98a8ebc27d71bdfd892bcb653338a9cf32
diff --git a/dev-python/annotated-types/annotated-types-0.6.0.ebuild b/dev-python/annotated-types/annotated-types-0.6.0.ebuild
deleted file mode 100644
index b1c10a93f1ba..000000000000
--- a/dev-python/annotated-types/annotated-types-0.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reusable constraint types to use with typing.Annotated"
-HOMEPAGE="
-	https://github.com/annotated-types/annotated-types/
-	https://pypi.org/project/annotated-types/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/annotated-types/annotated-types-0.7.0.ebuild b/dev-python/annotated-types/annotated-types-0.7.0.ebuild
index 878232d7d94e..63a7fcde4ce9 100644
--- a/dev-python/annotated-types/annotated-types-0.7.0.ebuild
+++ b/dev-python/annotated-types/annotated-types-0.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 125a86007537..ded8b980a876 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -5,5 +5,5 @@ DIST astroid-3.2.2.gh.tar.gz 465306 BLAKE2B f5bda1377eb825f4166804473eab592d07c6
 EBUILD astroid-3.1.0.ebuild 1923 BLAKE2B a2df2327082a71714dfe52405de37967fc6ebbf6f6cefe492193e4e1f5f73372bf21c737bb812afcf37fc6c68ad085e8cab813a7a7f524485f953c87060bcdbf SHA512 57519f17a63d64714170d515d4aeccdf728d1edd68fbd4cc259e9145219bab921d3b8f1d1cc2e001b61f037f48fe25796225d3c8f263f81bf2e5c74e91e625e2
 EBUILD astroid-3.2.0.ebuild 1971 BLAKE2B 360e788699f47637ffc3423a8d47d67343691e4f3b16424303b0dfd2ff4436203dd38c9dc37a2ed08b1d1b2b45733ca4401076ed283e049406a3aabac884aed0 SHA512 6d10e0cafeb14c51efd4ff31736f66ef7a3ba0c3277e65c4f12e696e815d42382f914fb34081fd166f80a16af3a8f4219ebbf2ae6d36edd3df08cfac79705ed8
 EBUILD astroid-3.2.1.ebuild 1971 BLAKE2B 360e788699f47637ffc3423a8d47d67343691e4f3b16424303b0dfd2ff4436203dd38c9dc37a2ed08b1d1b2b45733ca4401076ed283e049406a3aabac884aed0 SHA512 6d10e0cafeb14c51efd4ff31736f66ef7a3ba0c3277e65c4f12e696e815d42382f914fb34081fd166f80a16af3a8f4219ebbf2ae6d36edd3df08cfac79705ed8
-EBUILD astroid-3.2.2.ebuild 1971 BLAKE2B 360e788699f47637ffc3423a8d47d67343691e4f3b16424303b0dfd2ff4436203dd38c9dc37a2ed08b1d1b2b45733ca4401076ed283e049406a3aabac884aed0 SHA512 6d10e0cafeb14c51efd4ff31736f66ef7a3ba0c3277e65c4f12e696e815d42382f914fb34081fd166f80a16af3a8f4219ebbf2ae6d36edd3df08cfac79705ed8
+EBUILD astroid-3.2.2.ebuild 1963 BLAKE2B ed12519eb12af0c2720e2b3a1613fcf1b1f35c6c67ef552ff3fe1395636387f91464f2581819cbb08efdbac9ca36cc03cfae402e644207feed2e7f8e18873426 SHA512 388b0ac1c1f74f1d63b97b74243560d2c7f837270af7bd3a74ee0063165de9963d1cb49baf1a56df47b80defa929e7b2c14f0e9d8741a8b47e1170c9b8599bae
 MISC metadata.xml 1148 BLAKE2B 29a6cfc0c292117920be154d37ed4770f1fb1679186576fe6151cc02d1d6be766045e0231e2fceb87cbd250dbed3888c99b7ca7dc0182cc700a11961d9cd6d9e SHA512 6821d13f5e82bd73ee4fd165c0b4c94f40cd6af536dee1658cccb4175e67da2611c4d1478cdef1607535f23224116ad482197e0b0eef8f0a94d596bf250b3074
diff --git a/dev-python/astroid/astroid-3.2.2.ebuild b/dev-python/astroid/astroid-3.2.2.ebuild
index 867c6a6ee54e..84488dfc368a 100644
--- a/dev-python/astroid/astroid-3.2.2.ebuild
+++ b/dev-python/astroid/astroid-3.2.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/aws-xray-sdk/Manifest b/dev-python/aws-xray-sdk/Manifest
index 89c8e79e8bc7..8423a00b71c0 100644
--- a/dev-python/aws-xray-sdk/Manifest
+++ b/dev-python/aws-xray-sdk/Manifest
@@ -1,5 +1,5 @@
-DIST aws-xray-sdk-python-2.13.0.gh.tar.gz 276162 BLAKE2B 60a8cf121139b5a704f47676a10534a7e9e5cbbcadc3a10e2f864f2d6baef8b0d8fe82ef9356d3e459d21628584ec98d4a89ad31b8d982dc8859d0cdb0240999 SHA512 c36907788a891a8adef94591172c53dcc0ebde5c0a3552154a313d93af66d50d88aa3422c1abeba89e629aa224beee5eb17e14f272ee312c76aa7f437fadb77c
 DIST aws-xray-sdk-python-2.13.1.gh.tar.gz 276762 BLAKE2B 3be776b549ff9d0684670b30bbcd3323bf41ea6b8cc6ca2c2de0c3e7b168386ff9776472d53874c30c34fa1e21e890366270639df8319133ca250aa26deb8802 SHA512 6410fe3664ab82fcf6b1770f6e5ec9416d5cf28e9a11940a9dab0816a699696e91befdc642d7c3fdfde37cf6d19a0213e833be831d8cb0ac9645c3e16919d780
-EBUILD aws-xray-sdk-2.13.0.ebuild 2469 BLAKE2B 474c15aa2816fe6c5c69edca11223510402264c06de0af95dcc02ce00b67089d906414fffce01820010a6ae8043fe038f3d499f49b47c15eab8574fd2bc444b0 SHA512 11f8677507acc34044c4591a07af7a01a145d057328974346e928d5c000ae88e994a2bf461586564e9581072538f6e3916469ede26554c2232ce06b25753f8db
-EBUILD aws-xray-sdk-2.13.1.ebuild 2502 BLAKE2B f8aced0f17deec20e5db7e66d6933bf2b88d64d25ecd261dfdd679336b721ba6408338beba4b0822e1f0a90a778d50205a95dd25ce2d9f65bc94c77161d74ebe SHA512 5e7b10c20983ecbd10a20282539af721a451d4ad2eea27335217e70d1edc193fad00d5f6e084a7d926e63ae2a86c61773ccc1045f9cae4dda7b810234f5cea0e
+DIST aws-xray-sdk-python-2.14.0.gh.tar.gz 276813 BLAKE2B ce9a6c8a3b9acd4cb1e538c75702bebc1e392d350a999e8c609ddb900acadd0ecef11b2ce326786a64a73de3d84b0e18e6f4dd4ad91ece6a13283d727039925c SHA512 e9f7a299e35741a63de999dbd4931b82aab97b4c690e9abec4d25106a4a1b1dbbda605b7ec8541000f97cdcf17fed1283abf8d561db63cc4ac1ed11405458f29
+EBUILD aws-xray-sdk-2.13.1.ebuild 2499 BLAKE2B 3fcb3fd1cf591bcbaf6b435deda8041b0a5cb069af8baae957e026f2ac356e0eaa8b531b4997c32fee6adca362943de1603b66bf7dd0135e037b01c7ed6b7a64 SHA512 2059abc7f54da944f3a6f34c55f0fec9a85a1b4a720575a2427c732354785af9610eb1cd6d485669010497894fb0cdcb1f85abacc53fb03a81c2efb7b5fbf536
+EBUILD aws-xray-sdk-2.14.0.ebuild 2502 BLAKE2B f8aced0f17deec20e5db7e66d6933bf2b88d64d25ecd261dfdd679336b721ba6408338beba4b0822e1f0a90a778d50205a95dd25ce2d9f65bc94c77161d74ebe SHA512 5e7b10c20983ecbd10a20282539af721a451d4ad2eea27335217e70d1edc193fad00d5f6e084a7d926e63ae2a86c61773ccc1045f9cae4dda7b810234f5cea0e
 MISC metadata.xml 579 BLAKE2B 3f7aaed38bcceb97fb3597954ca9075ddf7a5718bcac69327be2b99d241c6d8cb0eefd369ca892c8d751703de9067c7eadf19f8c4445334ee8e4952b99fef69e SHA512 f3033cf16f60cae6727f80bd53944972f851579ffef8101cf6fda45e2575696183ec92ea8c994a77bbf3ffc8219be2ae2fae456faabe73a9896bcefddf3b5db5
diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.1.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.1.ebuild
index b9b837ed84ad..311a2a873779 100644
--- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.1.ebuild
+++ b/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.0.ebuild b/dev-python/aws-xray-sdk/aws-xray-sdk-2.14.0.ebuild
index 323ba5a787a4..b9b837ed84ad 100644
--- a/dev-python/aws-xray-sdk/aws-xray-sdk-2.13.0.ebuild
+++ b/dev-python/aws-xray-sdk/aws-xray-sdk-2.14.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
@@ -86,5 +86,6 @@ python_test() {
 		tests/ext/sqlalchemy
 	)
 
-	epytest -p no:django
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
 }
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 39729329a631..8489641eaf7a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,8 +2,10 @@ DIST boto3-1.34.108.gh.tar.gz 809808 BLAKE2B 56d21fdc35917426ea94f27ee4c7a59bc9e
 DIST boto3-1.34.113.gh.tar.gz 812031 BLAKE2B ffb4cc54a83d9d783eb69694393a6cc8c4d07325496802de80e8ac1999a1b5f45166571ae52eb8b38cb7d3e58d0cc8114088f7cd698f090b6ab1244565c0af63 SHA512 eebde25a83b2a7169b6892fa61475f26f9bf6baf7eff242d8bde0a5cd1920a7a39107071b093e59aca2a742662e16825b7fcf2850f59840da63a9cf78a19615d
 DIST boto3-1.34.117.gh.tar.gz 813596 BLAKE2B 1b68c6410a9e4859c05ec6e8baa7b4d0a8eda39ac9cfe7173d581e5712409bb5df83d35f30deb4f5e4e1dd70c0dc411cd8a1725b00f1e8a3026dbaef9862cde0 SHA512 40c6c1d62d94e0ac8d0237abbbacb9b7473dbce0ee7be5f2e8106f0c0be99b6bf048f3068e2978c578a8df5948f854bd4f3b9d99d935094a646a33f3bada7136
 DIST boto3-1.34.118.gh.tar.gz 814051 BLAKE2B cad75e7e7a24db1642e743efc83fdbe7cf4b5f86723279fb3ae60716ea18385177b497fdb6dba5f2ceee278f27f0c805f65004eef68b3e004f8fbd267e6495f3 SHA512 96ab8049d36f9b8769146f4f1af4bce95b53f785d2097aa7f8a115401016369389332ba48c8736127d145a8e1c4be36f7c9f669b9d5cfd398ad1d371ddf87667
+DIST boto3-1.34.119.gh.tar.gz 814478 BLAKE2B a6284483d2921805176c657ae0e4cb3b6136d73e22c8cdeb5e8dd05617b86c07c4721adc936b485fb1f15885b71cc2b9fd1fceed78d2c82773bb623e2a743bde SHA512 6fe31f127582967ef088e851b69bf5925e9ef8d117e4695f576832f8dcd2a85e588c852200b6a1c6e9b49cb17edb600c3d078d05900175898abe38c88221ab94
 EBUILD boto3-1.34.108.ebuild 1198 BLAKE2B c863be0c9348383129a919e79acbc6962b7c3973f77f68c85df6944a7658a2b39a44a91d904b7fee34ffb849e904e7bf6a503ca35a56085f2b04f40cbb70d4d4 SHA512 10a7f8345e1dc13766f1a15a127a885a42f7750f15c53b25fcba2ef033083192b7381cb53cd7be6c8c876bc1422f615578f730efca83c71ece042593282043a6
 EBUILD boto3-1.34.113.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.117.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.118.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+EBUILD boto3-1.34.119.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.119.ebuild b/dev-python/boto3/boto3-1.34.119.ebuild
new file mode 100644
index 000000000000..2c733040b7a3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.119.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index cf10c1b8bea1..a783e0ba1d17 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,8 +2,10 @@ DIST botocore-1.34.108.gh.tar.gz 13029228 BLAKE2B 947c11bb991e9e7622412bb7e90579
 DIST botocore-1.34.113.gh.tar.gz 13060395 BLAKE2B 8f9329d613f489f2305d068566940a94199a16e9d538597a86cd916a331245a70c6ad771f0d7d71a05a77a49c86aa8ff6be2ac6cd97c04828cc9f54cb6c5e2ac SHA512 218656c921b7ae6a605d6cca4cb90b76aee2a18541e78189828f2adfbb821fbebac406ba19887c0a07aece72dd4936f41b057fb25611e1b03db4bd11fda66bd6
 DIST botocore-1.34.117.gh.tar.gz 13076178 BLAKE2B defbd66d6409004fe49df44aec0a00b4bbe1a459d3e4b067c5c8609b998c63e7d62c8d3c48805416d44c08aeb3ab261f4449cc7e6a7c66dd3ca5f97bdcce291f SHA512 d9736ddb868e602afbaad95989d284b2835636f273e8a4263caa7eec619fe7cc45515fbbe98d4fd33121fe0d97d34353f7cd811bc878a81d1f5f7437798b24d6
 DIST botocore-1.34.118.gh.tar.gz 13078257 BLAKE2B 3fbd875002373cd883daee9b2f5669f24ad45c8524b26d82ac732ad7387e2910783cf912c239f61b6c107a571bdf6db36f04cde0bb979d531544630b99e7de68 SHA512 04785ddfc67507bd0023f86bb7f9048c6fcb498ba3933186fc925d1554bf8c6dcf2499ef980393cd0dbd1e95dc835585d39c24ae005dbf3887477f86187e7be4
+DIST botocore-1.34.119.gh.tar.gz 13095281 BLAKE2B 81fed94cb671b4f7bbd0705a8eb7f8e3eb782d40307549edb81f042e9ad3ea22554cc60f02d614a9010c7d501b8cb41ceaecfc9a16d961c31fbf4dc4cf98ec15 SHA512 c48a2d8d4b048a1b0c0ef7ba81a7e1565d4bebc02a38c579d46c1ab23b594310e3f40fc1323b1bcbce47e156a00e82b52518297372ed34e5a45f1f0d98a600d4
 EBUILD botocore-1.34.108.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.113.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.117.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.118.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.119.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.119.ebuild b/dev-python/botocore/botocore-1.34.119.ebuild
new file mode 100644
index 000000000000..ba6cd2a5d2a2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.119.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 0df44db4ea38..ebb14d970aa3 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,7 +1,7 @@
 AUX bottleneck-1.3.8-numpy-2.patch 2279 BLAKE2B 4a2252953a963390a96c2e2ba7d2b86708595aa803d52698728a49f43ba51dc5d8320f38f63e2d766b9dfd1d46bfac6db8e17a3329855fe97e289eb72f9c9c7d SHA512 faf5931418f2744159b23aabe075a4881bb3545a4f89fe56c62fc907fb7371d4963d487e3dbf0c4323c7b2a8ba97327fe568843b53ddefd1bc1906ea817a2a40
 DIST Bottleneck-1.3.8.tar.gz 103252 BLAKE2B 1e520e33eaa86b7328d469a8de2f0cacedb401f9dab3686cad40132caa23e77055b71e630fadda9305f3d416e8958e9762053e6d46afba4cf15489db77418b67 SHA512 951a927ce368643e2ccb5154c05381ce9ff17bc703c0bcd85eab547e345601ad82eb1dc85fa16d667753bf3dc9d0296025984dae463a0153944a85a085331a8e
 DIST bottleneck-1.4.0rc5.tar.gz 103528 BLAKE2B 760c0958507b5472525694f7b5a11bdb999aa7fb14ab1465d49a81ef8725a007cf070e8393a807a703af7aad1419aafb19859d62bf8871be0348d60b4913d62c SHA512 68394c00567456af54096005d1f971abe872ee1f6d8776aac46d7e183bbb20dbee730e6845fd2c94cdc4dcdb4b8da2e154610784227d5058153c078c61bd9311
-EBUILD bottleneck-1.3.8-r1.ebuild 1166 BLAKE2B 30cc1349c697b842e65fe9be32cd039e345628aa4fddedb0f02d74fe12b07411ffb329ba140ee4ebc46f8b9802719eea4fbb104f06816d75e42eaf5f2ad51aa4 SHA512 34240032999875de1291c367cf015c6cf832d43f756f967695756e00cd8085021f7eeffc06d6a3d8434c65a904555612bee24faf386ee187e0c8fdb84e0f601a
+EBUILD bottleneck-1.3.8-r1.ebuild 1162 BLAKE2B 2f207f57c4abbd4c0b70e979396f27b1b244e9c7c94f72b89e270ced2643f59b7538340cd124ee34a16464ef616c7357133b3a48f5fc20a5fbce82cf8d2054de SHA512 b5d1c3942e7bf6a002e8861d3a6d5a1661a62a764333ebb0da3860620c84a1001b98880b1ab764c896c1048fb5e377e88f923979181dc8e74c390c659dd6d430
 EBUILD bottleneck-1.3.8.ebuild 903 BLAKE2B 3b6c39cd0cf72c20e81010eacd5a6c90c13847ab6cc5f40f26edbde7877d529f6a93de258250166c06d43fd9d1bce300026817ddf6fa23a1e09f384debf281f6 SHA512 3d12ce680c8336f6c60d40750bd52ace3adcf0bb399aba8985c01939ed2a1d8631647cb8b9c1fe06caf59b038137887a9c19195eb22a4908c085f14240ff1bed
 EBUILD bottleneck-1.4.0_rc5.ebuild 1050 BLAKE2B 0ca91dbc536c3251bc7f409fe625b1d8674068e710be6e26fd1f6614e9759573bc8b4476609da485b9192cef0f69321609c2eab8eaa3b5c1b2e0ebe731fac4a4 SHA512 af09fce18c34d5378c0f04edd1f2b16d8b7229ec6925c109b23c069c4b97c8f7a7702685f173bb769baa3fff4c7a297913c0f53c357b2496d08527aeab914cb8
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
index 15e8b079edec..9807a15d57be 100644
--- a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 7d1f59095cc3..b5d5b2641067 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
-DIST constantly-23.10.4.gh.tar.gz 31245 BLAKE2B ebf2c9ea343cc20f8b2f32f0a95e5d10ecbafed5e74b456d4f3ce7e5abb0d0c02ccc41a734d1b04dc79d0d5957474fd317758f062be9a0240d8450dde159d1d0 SHA512 465dfc2ae857a956d91d6ae3eadabcde02905c2761ef51dca4d28c7ca47aa11757c773cac2aa082936be4e85f2aa8fac31840d209cdf9d871e73db836cb2e9a5
+DIST constantly-23.10.4.gh.tar.gz 31228 BLAKE2B 8bc84de285bdb99074acbccfa19b09c2937f6d5e0f11df82a22cf4a505de82454f7a63f2715b7c277c8ea8f1b7187aa841c508c08927434f38d87a16801065ca SHA512 41672b4b9292a6860fa3bad815170cb7da934cc12091ed4a2b85896370c7f7bbd18d363e40ba8aef08c113082de7b06662eaf7fb500f9b4bf7a6db50cfc035c9
 EBUILD constantly-23.10.4.ebuild 726 BLAKE2B 2511f9114cbf42c4bd8d7a4fa3fbe2ff3cbf4e41f65a3e406873d73150e96677d832cccca1c5a766873eba5aa269ca6d3ca60e2d4ac829045b17f47cfca0f653 SHA512 db327d2d4ae0dcfc11f54e2a6ab39f32fbfc68c5e10976a9e6b37f31d6d726d05ef205b84176f65e6f5226af28bc2e9c076de5d88430541848a56621fe512eb5
 MISC metadata.xml 762 BLAKE2B 9875a3eb5843bf6bf12053dec018f6613df587a09c15e789c8386fda56b9f992cecff183961d2ad6666c222897953afca84b3c16cea971ea51d59d85dd977d4a SHA512 2da01cbce721e0f9b411e6d34552bbe547d79dcf3c2bc0232b8addfcfc98a190eff1fef7ae09e451e4666a7854c83206cc5b905aa951b7ce9476124fc6f0023c
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index f7052c083ac7..6c0cf0934776 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -8,7 +8,9 @@ DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd
 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cryptography-42.0.7.tar.gz 671230 BLAKE2B d0c1e0c752e066a4bd7a01eb351463f4264603610981f738d629785a783bcdedbd5a9fefbdbf4eaac2cf56a3db12334991b284c5195bed2f8050f836a816308d SHA512 2f502fd78490ed2dc26884b05c9db32d6dcf8ed17ca3808299e528aa53ec13805e2be741d92d6a540b7dded011850cf033abe2e073f22f07e271c7c1c25c024b
+DIST cryptography-42.0.8.tar.gz 671250 BLAKE2B 77de79a8f6e78cc375c604e5d7045130c00bb3d2ac5293f5b16dc81e5d58210711943d3e217baea84d7f5348121f15a8326e6228e161cae87f1f7ecd1bfbe321 SHA512 db56db956649c05dea9f405341164126147e94e09ecef3535b63e2fecdb3d64a008c23aedc868406eea0dc1ea8a8efbc2fb29b74b7f04cc50454039e2d2e647f
 DIST cryptography_vectors-42.0.7.tar.gz 35277664 BLAKE2B e8d999f6c139d610f7539287de22b97febebd8abcbf5989aa47139705b076aa5657a3af4fd00668c5fadb4cd8e7b2253a53f3cc057d9b2636e982f7487ac5fa0 SHA512 5d64b3b7576ff1f39db1c12fbe5ed71e8430ca82cd936aedaf41c45812ec6f72456d6369dbbc58fed1d29909a845fac467a41e0acf74e681f3de8ccb1b8422fc
+DIST cryptography_vectors-42.0.8.tar.gz 35277813 BLAKE2B 89c3ce911ee65a634c2bb647c57ba99c27f846dcbdf70889f5c589412b50218641ee83e7426ffaa001ed059fab4439c15e9abdb30062f7c0a82bca18c66e6247 SHA512 c81fb4a3773e84504e2f4f935cbf572ed056531671a66c65e55a6377ac8ae9006e0d7d0cc24141c32cbded74bccce487e21290afbe8548318951d4c4de00a84f
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
@@ -50,4 +52,5 @@ DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 EBUILD cryptography-42.0.7.ebuild 3496 BLAKE2B 707b45374167c5c5dedf786db560e29962a4a4040cb944935272bb6a4b922f154d397607928349c480d9ae75aa47a0d2f212af97d48b32213e3e607b935a27cd SHA512 2c29c833f229cbde5f1f53066e94bba0db3e2376e6b78ebe25244cd801f2446ee331c91c9000a985d50480d6d581068bcaf4a1aa32079bef56e8a7423907e2c1
+EBUILD cryptography-42.0.8.ebuild 3397 BLAKE2B 67759e66be5a51285fc54102fedf60d21f6d0bbedf839c97bf295fc6a892de3a0cb37277833add1f199fdd2834bb62b4f05a361993854a8869a3f9ab20612765 SHA512 b56f1a67b90b0728f31d9a9d887c4c2cae429577e5d577b3111a6e0aed819dd1c44117e93b1ebb5065861ed12b61a7170cf7abc1ce2be6b2ce2c9223ede52cab
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-42.0.8.ebuild b/dev-python/cryptography/cryptography-42.0.8.ebuild
new file mode 100644
index 000000000000..11f871a1c23c
--- /dev/null
+++ b/dev-python/cryptography/cryptography-42.0.8.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	asn1@0.15.5
+	asn1_derive@0.15.5
+	autocfg@1.1.0
+	base64@0.21.7
+	bitflags@1.3.2
+	bitflags@2.4.2
+	cc@1.0.83
+	cfg-if@1.0.0
+	foreign-types-shared@0.1.1
+	foreign-types@0.3.2
+	heck@0.4.1
+	indoc@2.0.4
+	libc@0.2.152
+	lock_api@0.4.11
+	memoffset@0.9.0
+	once_cell@1.19.0
+	openssl-macros@0.1.1
+	openssl-sys@0.9.102
+	openssl@0.10.64
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	pem@3.0.3
+	pkg-config@0.3.29
+	portable-atomic@1.6.0
+	proc-macro2@1.0.78
+	pyo3-build-config@0.20.3
+	pyo3-ffi@0.20.3
+	pyo3-macros-backend@0.20.3
+	pyo3-macros@0.20.3
+	pyo3@0.20.3
+	quote@1.0.35
+	redox_syscall@0.4.1
+	scopeguard@1.2.0
+	self_cell@1.0.3
+	smallvec@1.13.1
+	syn@2.0.48
+	target-lexicon@0.12.13
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	vcpkg@0.2.15
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+"
+
+inherit cargo distutils-r1 flag-o-matic multiprocessing pypi
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+	test? (
+		$(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
+	)
+"
+
+LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+# XXX: Drop explicit >=virtual/rust-1.56.0 dep once that's the minimum in cargo.eclass
+# and replace it with ${RUST_DEPEND}
+BDEPEND="
+	>=dev-python/setuptools-rust-1.7.0[${PYTHON_USEDEP}]
+	>=virtual/rust-1.56.0
+	test? (
+		dev-python/certifi[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_configure_all() {
+	filter-lto # bug #903908
+
+	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index b2e4e664bc6f..b985dd946592 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1,5 @@
 DIST cssutils-2.11.0.tar.gz 723164 BLAKE2B 433358b1bd167d72ceda9c60f4460a95804c492a92854747dfc49ef4e2efe69388781c515adbb3c5d9010895e13a039ea33c46d4b2c71cb8bb15eead3e998b60 SHA512 42ce87502757d213ab5b2812c8a76724955f565826c69ffe4db53d49020ce960c8544423428f2b8c24d9b1b215c22f18de9dff66ef249c8060d17aad990d9a6f
+DIST cssutils-2.11.1.tar.gz 711657 BLAKE2B 08522271238efd160dba06e580e01136ec1dab69bef8400f458edcf58a179ffc1d5bbca9423afddb66b5c781c2742a00f9a9fc0c5119ed3d865f914ebce2238f SHA512 7e38f08c5ff340b82ea39bda207d099b39ce6b88c8ac0d7ac1fb29e7b4ae6d8baa341e0a9b27e6d2285e31266112ec51d1fff9ef3e5a17a4bf55546fb4927845
 EBUILD cssutils-2.11.0.ebuild 967 BLAKE2B 7202f4eaa44fa44d00e592111eff95c5ec785cf823686a6f80a69363ac8a38be7253ed1b9b7be28e2e31f5435b2a2e56e3d8825d3d8c800b5a38bce7de5d4b3e SHA512 4915b1f375e19c685d0f718ae49ac98f3e14da09fe8957bc5991f4a3da548db80cf2225dccbaa4318006cd83c3871662321c2f83af2500cb0b29686bf9fed628
+EBUILD cssutils-2.11.1.ebuild 1029 BLAKE2B 56b59287073a603b91cbeddfd5a784259663888d97218da7a68c6cc68f657a71512715bdb61bdce50de116e3cb210e7a9164488a326f0524340c8cf08d675c37 SHA512 7f5e45a11e2d5a5878a15f015198d7aef4fed47b7bb0adb859cf5d16af01f543b93db6ebae39b4aebe113e33d0b6c6f0b911e090b32f741a63662844ecaa0520
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.11.1.ebuild b/dev-python/cssutils/cssutils-2.11.1.ebuild
new file mode 100644
index 000000000000..7c514161f793
--- /dev/null
+++ b/dev-python/cssutils/cssutils-2.11.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="
+	https://pypi.org/project/cssutils/
+	https://github.com/jaraco/cssutils/
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_USEDEP}]
+		' 3.10)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# network
+		encutils/__init__.py::encutils
+		examples/website.py::examples.website.logging
+	)
+	local EPYTEST_IGNORE=(
+		# path mismatch with "parse" package
+		examples/parse.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not network"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index a6185c07c481..d177dfb3ba4c 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,9 +2,5 @@ AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e08232
 AUX cython-0.29.23-pythran-parallel-install.patch 874 BLAKE2B 39286ee98427260ce6ec077a750e0a1412445343fd11be9d96d8ab65b7d9789c5f1864cb9a1b3565ee3f51e117ecc854ebacc39dc32917fc72f36340c2d7f0a1 SHA512 8b78755288d3f165d962a5a1be9492d609a8e3dab10197b271c84ed0c4b7006053038e68f18bbb4204e6acba83e3f72ffeabf57ffa03f4a08f28b65db3cfd854
 AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce
 DIST cython-3.0.10.gh.tar.gz 2771679 BLAKE2B f0813afc291bdc4940cd6770a368eca4f6d9fd728e41e9c341970512196154be900600146f98ce1e5a056eaeeda2df2a59fea2a9973c3ec275fe605bfd12e418 SHA512 97aa831cea96c1f3c51653c51fadb0aea8bdfdb076a2c898862637f52b826bcb9162d1b7aade3304c5650d0b894cb1083052f036365d79cd3d390e0486b33ac5
-DIST cython-3.0.8.gh.tar.gz 2764668 BLAKE2B 03202ea480fa398d2b0893cc96185467009c783cf4451fc5d1c09ec229398bc084276680ed2b64acf63253744f827427e03674be3e5985d5a2912d9f338c786a SHA512 1070fc278401990595d177b0e6396bc1eba2ea8234a7c5bb26399b6b7284de7791ee5fa60ef74d06d0f4120b9c877bfd7703a7d701838f1634737526c614b860
-DIST cython-3.0.9.gh.tar.gz 2769345 BLAKE2B 2a21b5e7060727d727902a08d7e038dacc047b724ebaa496ba5768542e28eec3c6198062ac3dd774a4321204752b373516f193f01bc6951e5f38b6029754647e SHA512 7899474882faab14716973783bbb46b981eab48192791acbbd06133efee83bfa9ace0e9a0272b0a44061a95ed94cdceaa98c4100f843220f5987791e36fa00e6
-EBUILD cython-3.0.10.ebuild 2018 BLAKE2B 58dbabd4cdb04e8af09235641718e8402da32771f10eb24fc0de4cd06faba64097d5d2aff44500214adc5771b7fe136dd2a6246780a3d1a1c84fdd1eba10f63c SHA512 610ed7b78ada26bd37fa496e1355c8f9ffe2122d95a1ce0e3ab56eea3314a2a35d9120ca2d90692cf1260a853d3a1989f33a7ae921ead7d04090c1848c4c725e
-EBUILD cython-3.0.8.ebuild 1998 BLAKE2B a599920ea883b4c4f932df92871c528e72313c7ca6ea8027a58ab25ef3c4701aaf6cc9adaa9bcb68ce1e2677b9556e93f7f13de492321ea21f0f0455461a2c7b SHA512 d5c5757a4cd96ff52b0d6e1cb106c68ff42a2cdfe8470e1ad42e74e66f4fcdac39ce17fd9ca1e3a11ce15a07681eb5d3e13a6260cbc3cb012032581569859765
-EBUILD cython-3.0.9.ebuild 1999 BLAKE2B 1f1efbf904b837248cb1003dc704e5866a0dc9f38818ce0a24b679358fbd4071bcab3d061bfbf4a5e927d81329bbe736c34093a0a36b7ef5423f7bf49bbb969d SHA512 1156bfc8d7d01604c8642cc55e013e983fed294001d194a4731c8024639049d7cb7e97f9f5da3da0d6b26206f7a7383b49fc4259e5612a0c7f7f8960645e62d7
+EBUILD cython-3.0.10.ebuild 2012 BLAKE2B 8158d64cf530ba775a709808dcb09940376fb1e6c8bfa8803ffdf9915d1e5eec63b7c99ff89b35380e45080851a482338f3025ae2d8ba189b3ac7251561639cc SHA512 44c0efd39120314dc302c4f28ff3cfc9435cdf7142c3324a99fb578eb778a968f41267186067e63c38a6306975a3e52c5dcb77896aa01d99cdea602cc669f120
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.10.ebuild b/dev-python/cython/cython-3.0.10.ebuild
index 388036570b81..207c3a055f1b 100644
--- a/dev-python/cython/cython-3.0.10.ebuild
+++ b/dev-python/cython/cython-3.0.10.ebuild
@@ -26,7 +26,7 @@ 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"
+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 )"
 
diff --git a/dev-python/cython/cython-3.0.8.ebuild b/dev-python/cython/cython-3.0.8.ebuild
deleted file mode 100644
index 65a4fd8e36be..000000000000
--- a/dev-python/cython/cython-3.0.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..12} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" 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/cython/cython-3.0.9.ebuild b/dev-python/cython/cython-3.0.9.ebuild
deleted file mode 100644
index 3b1f0323887f..000000000000
--- a/dev-python/cython/cython-3.0.9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..12} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" 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/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 4db0b1b7eb3d..8b3bda1a19f7 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -3,5 +3,5 @@ DIST setuptools-69.5.1-py3-none-any.whl 894566 BLAKE2B a9d24f51240fd528f87642e87
 DIST setuptools-70.0.0-py3-none-any.whl 863432 BLAKE2B 02b441da8254fc228f2d266b96d26b207271341e9291ffedcfa06f1ccd6a64777658ad83efcc142bd6fc0ec91a21c16cfb6e5b9a8792ea3d46d8c5a23c97b081 SHA512 fde01a0c1ef77e7aa0544663f44d3735ad11430bab57906027e1a260c0d8e0d0b873fcefaef956c1d3992879b5908384b759742e4b726804d42cc681da374a7b
 EBUILD ensurepip-setuptools-69.0.3.ebuild 610 BLAKE2B 30d5981f264556c7910d7d2984d37173e3f2b30fc4c08a041e3e4bbf57ceeae35b02582112fc7b190320fccdf55f25e59d9966fa75bfe39fa23fea1986954a14 SHA512 6923031a97ac255e828fecc00f7c7ad99828a0aab5fe17ee3855462a0e8ec422d96cad81b6e938c2d0fc4eed197a22dd38b31c0e38c2e99c5854f171c8a706b9
 EBUILD ensurepip-setuptools-69.5.1.ebuild 610 BLAKE2B 30d5981f264556c7910d7d2984d37173e3f2b30fc4c08a041e3e4bbf57ceeae35b02582112fc7b190320fccdf55f25e59d9966fa75bfe39fa23fea1986954a14 SHA512 6923031a97ac255e828fecc00f7c7ad99828a0aab5fe17ee3855462a0e8ec422d96cad81b6e938c2d0fc4eed197a22dd38b31c0e38c2e99c5854f171c8a706b9
-EBUILD ensurepip-setuptools-70.0.0.ebuild 618 BLAKE2B 127ebf8ffb8c4bacd0032dcf268755c43c05c498e506b4e8904440460b06e6614456c40696b3e4aa5a74fda69340c07fa50700c0c8f704e3c2df1c831329b992 SHA512 ab22161ed8de46abcb525f9cc308bc4ba1d905125010734a1510f53bb9c440a24967f35730e7c30253f5d9f1d2320d9b6bb5804c907fefda0eee59a0338cc96a
+EBUILD ensurepip-setuptools-70.0.0.ebuild 614 BLAKE2B 483129d7de1cc42a30a38d8f636928118993a2cbb84fde295e5bcf0afe7c69c8c5ff4cc198d7ec564f18dd67f7ea1b3609c86f16907e3fc0d51c3e7ae1bb1c9e SHA512 a2d02d6ac31317358856e27fa6faf47071e3d19ab67ddb5cb4170d5ec558139a1fecfeef2a011d26ee149aad8bd8189b55be4e8fb54013ec56066d0b3cdd9b14
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild
index 97aca4a61872..22787414d145 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 65f9378a3a2d..923eb370db61 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,9 +1,3 @@
-DIST fakeredis-2.22.0.tar.gz 130074 BLAKE2B 28ccc177c8f2d47515ff91834901b8fdf9559b83b1e7665101b5f17e57d65a3c820af6be21251257f35a7db858c22fac3395cfb550b724e020e96778ad380008 SHA512 a533f26c2a4289b1b4d398ee426f44c93f01a4aac0dc841854bf94674d7e0738fde38ea896280d4e83bf16041dba505db13e3fa3837a912dc872b1d36c05cc6e
-DIST fakeredis-2.23.0.tar.gz 133649 BLAKE2B 4dcfb0b52f18101311cd6513fa236ecc6100d12fdfceb9eef12e40ea4fc2a8148dd93e2ad9a68cf5347a3048a95136b7fcbedab2ea5348fa789462b9fee6f920 SHA512 8c3b4ad153232101203811d2891985474fe17a86693217cb58e694ded3c309d101a6bef52e1b544bbc489a0c355792bdbdbed220dca00d0f50afb2fb1c6438ce
-DIST fakeredis-2.23.1.tar.gz 132829 BLAKE2B 05bc696f22cd3280728cf96614ac68fa9243242934c2d25e09fc20a569295adea6b75efb890cc172b1a0c75b9d96e9a1b30c9c04a01bfca508609b3a6eaad5c5 SHA512 5b8d256460d5930896ee1d8b3259decfdee12d0699da852cf1d6ce2c00d70cb404840808c5385ebae8d4ba7accd744f7f969bee4fc73320f55fc34558dee1294
 DIST fakeredis-2.23.2.tar.gz 132956 BLAKE2B 48053663d6260d1153b57893795a97b8e72e21cad57907b006bb8be605cce56c474b1a6bb32d455f034da52bcf391d56139ed0c0bdff7f3c367cc0c365ebca40 SHA512 0994f7c7e955a8cc7b1046f62d37841ea592022f21c34cf1f7d3bb335ba88bda5abf08fa002b4b7c9f0b09a6837a38b1b49cec44a3185e16ab4d4711ad4f95d4
-EBUILD fakeredis-2.22.0.ebuild 2172 BLAKE2B 45b0a87b4c0850b3dc631811e84bd9dee72756dd0dda2bdec16a2d72bd3af19483eb2bc912fd4df4694b2b36a846059e41e2d56594f1c9b336c158c7acf1e15d SHA512 f1d65bb12eee3da97b624525fb54b73186f423f3c9d361d934b2dc3e4fb7d41778e602672485188f9092bdff9aff31cec1b8d7ddbd142f194b1553f359f344a4
-EBUILD fakeredis-2.23.0.ebuild 2351 BLAKE2B becb5f77b2ac549304f22e048ea59ff6de364443ec64fc5078b3d42c2653a9f1668b45617a9a22f106998a0d159a9848854b0eb706955ffaf871f90829f0c039 SHA512 2325659be38fc356b309f5b359b54e5654b369aef4c5b70c3fd8a1d80f4409c91b2e043b19209a702b836fc6d26155384d7137c6ecc886c2808db84100650fc6
-EBUILD fakeredis-2.23.1.ebuild 2351 BLAKE2B 6bda9c93d326ccc920135f551e69989651dd881d8a4aebc5afcb626631b882b3996fadbc1a0b38396305e21a645224ef98eebedfae50f6f89d536c15e85a745a SHA512 13b38bd807062cff3ab6dbb0f70ef9dbfdd5575ad642fc69c4b98131a920865db9f22ddbd889c8cf12e3ea52a99ebc785e9ebcfcfd0dbfd99687b363dea1b4d8
-EBUILD fakeredis-2.23.2.ebuild 2351 BLAKE2B 6bda9c93d326ccc920135f551e69989651dd881d8a4aebc5afcb626631b882b3996fadbc1a0b38396305e21a645224ef98eebedfae50f6f89d536c15e85a745a SHA512 13b38bd807062cff3ab6dbb0f70ef9dbfdd5575ad642fc69c4b98131a920865db9f22ddbd889c8cf12e3ea52a99ebc785e9ebcfcfd0dbfd99687b363dea1b4d8
+EBUILD fakeredis-2.23.2.ebuild 2348 BLAKE2B 8b9e67d78e802e8a104c54617b5ed514162e69e769b67fc1881fda27200248a19ca0846446a733e748a779787901a5b5f6a6390a87e2a2ae1c08b26b5346c8f8 SHA512 e356160b3a3dac3017b2df6a82558e8519776a1ea750b2d527602814a22758c0e782f84343b70f1830b9ee44d86df151e29a0a4c3d2a786a0adeaf7558e49cac
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.22.0.ebuild b/dev-python/fakeredis/fakeredis-2.22.0.ebuild
deleted file mode 100644
index d0865eabf695..000000000000
--- a/dev-python/fakeredis/fakeredis-2.22.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-		# new redis-server?
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]"
-		# json ext
-		test/test_json/test_json.py
-		test/test_json/test_json_arr_commands.py
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	# Note: this package is not xdist-friendly
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.23.0.ebuild b/dev-python/fakeredis/fakeredis-2.23.0.ebuild
deleted file mode 100644
index fe8a86c29b94..000000000000
--- a/dev-python/fakeredis/fakeredis-2.23.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-		# new redis-server?
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]"
-		# json ext
-		test/test_json/test_json.py
-		test/test_json/test_json_arr_commands.py
-		# tdigest ext?
-		'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]'
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	# Note: this package is not xdist-friendly
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.23.1.ebuild b/dev-python/fakeredis/fakeredis-2.23.1.ebuild
deleted file mode 100644
index 5bf1b6f5ea36..000000000000
--- a/dev-python/fakeredis/fakeredis-2.23.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-		# new redis-server?
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]"
-		# json ext
-		test/test_json/test_json.py
-		test/test_json/test_json_arr_commands.py
-		# tdigest ext?
-		'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]'
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	# Note: this package is not xdist-friendly
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.23.2.ebuild b/dev-python/fakeredis/fakeredis-2.23.2.ebuild
index 5bf1b6f5ea36..79980da8bf31 100644
--- a/dev-python/fakeredis/fakeredis-2.23.2.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.23.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 84ffa556ba88..bf21a5686684 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,8 +2,10 @@ DIST google-api-python-client-2.128.0.tar.gz 11193400 BLAKE2B c9762dc89a2dda1bdf
 DIST google-api-python-client-2.129.0.tar.gz 11153292 BLAKE2B 0d2e909fb592d1b54721143b88f5a841bf53f9dde11fa555aa1384bc306f3648463578886069695568f4491b2d13cc4993adb7df47988fe3440f93c973764e68 SHA512 73b93847f3b2dc2ef722edc033fec6f292b16acbf81227276c34b651915854556ae58eb160baa462bf868aa988e194ed462ff235532f5ca1a35a234bb1eda8e5
 DIST google-api-python-client-2.130.0.tar.gz 11178249 BLAKE2B 8f89f85124f72fa1c23ef6ab2d8e0eba2935ae14bf3528102de977aeec6b6b525f51f6d6d574e582b010ad49f6d8ac450cdf6edae7653a6b47b15868754e6ea4 SHA512 3553a140a86974cbf05cf21b4792f59adb3dee23e50772c8b6d285868ef08566bda8a64895b7054fa3f340dac0c9f52b4a712eba3fabea8feebca7390149e0ed
 DIST google-api-python-client-2.131.0.tar.gz 11201337 BLAKE2B c2d10ae7c98be89604742efc9b2d75b1902d48fc0fc0c8d13133c675e247a702ae72cac2f65593401486a9e8de94b2d1b0742f56f9c322b6eded153f8d0b757b SHA512 b3f5a42e75669b807e8a2542afdd972e9be725d1dae7af7bce0ab58ff5d8cc3e1a8a74b4eb22e4953779e6cf8a827b5069aa525a99f34972ff3a0074aa4a6355
+DIST google-api-python-client-2.132.0.tar.gz 11256536 BLAKE2B 4a046c03a50b3922b94e6a07bfce974851752542a69300d544b7c8439c4ad54fc9fd2d5fdf84656801ebe9bf5ad35588d39dc3603537d67db93ea995b50651ff SHA512 ecd6be9009f979447ee7d29dc05af2b25c500ca17a8d88ae6660ac0a72f6bb8237f3224dda63b22378a38c6cf7fab914bc6372351d95e691c3b16f248be04a64
 EBUILD google-api-python-client-2.128.0.ebuild 1475 BLAKE2B d19c13ce0fe0968d44016c0c7b2a023f393c31af0758473d6996d06b87cf1c950757f442ac4a0d2f460f848ca45cc3b185d92eedf81249d63204b2c2b952096e SHA512 1c58462ddc1ed7da0d7130fda6daf0e6df229d5de9b99a6b9fd44489827554254025389543b40f7db725ce537ffc85c51551ea9512d4abefb02bade4613050b9
 EBUILD google-api-python-client-2.129.0.ebuild 1478 BLAKE2B 4660fef51f05bc038cb079a4680f3cb5ce0fb8b6c0cbe609470d5a3e1106eb76da26fb969040e8eaa250581513a96fabc09b66b32641441707ab741ef9732ee8 SHA512 152bb175cb77bb8bec3da99cea918d8b2ad709d2f5ea671c30181b04a3ffb26656ccf8fa9301132019fb47f81253411ae7612e9c7271d3cb0d0d4ea6df9bc163
 EBUILD google-api-python-client-2.130.0.ebuild 1478 BLAKE2B 4660fef51f05bc038cb079a4680f3cb5ce0fb8b6c0cbe609470d5a3e1106eb76da26fb969040e8eaa250581513a96fabc09b66b32641441707ab741ef9732ee8 SHA512 152bb175cb77bb8bec3da99cea918d8b2ad709d2f5ea671c30181b04a3ffb26656ccf8fa9301132019fb47f81253411ae7612e9c7271d3cb0d0d4ea6df9bc163
 EBUILD google-api-python-client-2.131.0.ebuild 1478 BLAKE2B 4660fef51f05bc038cb079a4680f3cb5ce0fb8b6c0cbe609470d5a3e1106eb76da26fb969040e8eaa250581513a96fabc09b66b32641441707ab741ef9732ee8 SHA512 152bb175cb77bb8bec3da99cea918d8b2ad709d2f5ea671c30181b04a3ffb26656ccf8fa9301132019fb47f81253411ae7612e9c7271d3cb0d0d4ea6df9bc163
+EBUILD google-api-python-client-2.132.0.ebuild 1478 BLAKE2B 4660fef51f05bc038cb079a4680f3cb5ce0fb8b6c0cbe609470d5a3e1106eb76da26fb969040e8eaa250581513a96fabc09b66b32641441707ab741ef9732ee8 SHA512 152bb175cb77bb8bec3da99cea918d8b2ad709d2f5ea671c30181b04a3ffb26656ccf8fa9301132019fb47f81253411ae7612e9c7271d3cb0d0d4ea6df9bc163
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
new file mode 100644
index 000000000000..224056fade87
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
+		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
+	)
+
+	epytest tests
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index d3d64a9cd895..6729f3319e84 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,7 +1,3 @@
-DIST greenlet-2.0.2.tar.gz 164980 BLAKE2B 1afa8390e96d7eeafd84a4323a4eb9e4b2cad50a3e6654b1609702a5a74dfb5dadc7a1ff81cc8e7718d0587728c2ec944069db8241f1aa0723d2f98e6911ddb6 SHA512 03d0b2764c52524c97930a7bd856a432360a96ddbe3d1f2352ec49750994e6811fd28378f83b96cac91520234d0a6e9e56232ff688c71ff57f6340d3d182635b
-DIST greenlet-3.0.2.tar.gz 175506 BLAKE2B 46064ca54c43b513b274a91b56744afd7fabe7659416938efe11337c5e031dadae2e0ca275df7731180dad799eab5b0c0dfa15d17e977c278a88f698328e57cf SHA512 901e1a918017878b150c845a180ed366f35dbb9d89b155df1dad4e2ee581c4a327ffad9d17ab221172ca151cd460521a7dca48b3ee64a33bf2e442949a30ecb3
 DIST greenlet-3.0.3.tar.gz 182013 BLAKE2B 34ba9f13dd01f5bacedb69952b4d3d08e55eba82d94c5d95cf8bfeb0f1ce94dbde9d62f5e56c33cbf2467d82f6ffd8d05a37048d0292102b1dbb68c67e9398f4 SHA512 20d8818376a200332cbc2c85968317ddf828d2adf3fcc3c53623cd1504ec9a4e4e987e841bd2fe65e934e2b8a5e73a7205847526f0bd196e7afcdf3ae40e9d9b
-EBUILD greenlet-2.0.2.ebuild 965 BLAKE2B c051c6170e8b14c0f0ad391ebb444b2a1282f0a64f07054d550d3caea74c07e63a24327a023adf4a7a23458d51566149555d68cba08ce1acef269efc9c5576cf SHA512 477b7e85a4f39dfb4102fe35ef2ed045ccebea44102faae595655dc9e0464c98345a923055dabf9cea6f44cc0fcd839d40dc0164339c61bff7d4a9b31af7912a
-EBUILD greenlet-3.0.2.ebuild 1032 BLAKE2B 3ea51bdc1ca03777399faff1c317e4d6df48b19ba43ac455e1310c5e57067041eee00a5a51fabd3f35bc5a3bf7022a1d79d7fc96c243a0669daed402f6c75e62 SHA512 a071055d3159dbedd08cadf771ffb0fcffe649ed962ac7b0973bc7d9eca9c504687a8e9bdd5670bf293e0d6c0b6260069aa8cc87ff710253baffc2386f978002
-EBUILD greenlet-3.0.3.ebuild 986 BLAKE2B ff99b85db62786a581754f12a690dea5c127d2a7acac0119cf9473675ef464bd6bcee5dc85a670969d634b917727ed94a6d37df00730eeb84725360c05061049 SHA512 4ab8e18447414744f4bc93b6ab30f8a39af5bbd55fcfaeacf3f5e0742216957a32a2c9aa87ef512febad3256df53ad52bce0f79ef900c48f72f027e818cd0a7d
+EBUILD greenlet-3.0.3.ebuild 981 BLAKE2B 17b4973e9be53c435486bc85478de960085ba32e12b45924eb1b04fcdd73b9d09506bf989eabf6a131b7ca77db3716925756203060f172c442dddfe5c46838b1 SHA512 13a7a1927cd9f530be3596262635e6493ffaedfe7127b95c48a9d296ee4f4d50a63d1e5bdbf342c52c9f28ab431d5cc4291cb4e6604995d434e278e234c8c82e
 MISC metadata.xml 388 BLAKE2B db0aba92c5c405fa5736f97c2db14319514e95296ad11aa9aac26e95bdb630961e2ae430cbfcdf2b72425c805b83556f3dda6983dde075be3cb0a3f7d0a45e8f SHA512 3b9003e181f15b46ddd5af3e4a6012f115ca42be0bf2f4e40c0fbb196231de8a5b1320d402de6d4105f61d7e4fd5d868131404796cea19a7547a53ee17c26ce1
diff --git a/dev-python/greenlet/greenlet-2.0.2.ebuild b/dev-python/greenlet/greenlet-2.0.2.ebuild
deleted file mode 100644
index f404b9d3bb61..000000000000
--- a/dev-python/greenlet/greenlet-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="
-	https://greenlet.readthedocs.io/en/latest/
-	https://github.com/python-greenlet/greenlet/
-	https://pypi.org/project/greenlet/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-src_prepare() {
-	# patch cflag manipulations out
-	sed -i -e 's:global_compile_args[.]append.*:pass:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenlet/greenlet-3.0.2.ebuild b/dev-python/greenlet/greenlet-3.0.2.ebuild
deleted file mode 100644
index 5a3353d1444b..000000000000
--- a/dev-python/greenlet/greenlet-3.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# Note: greenlet is built-in in pypy
-# py3.12: https://github.com/python-greenlet/greenlet/issues/368
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="
-	https://greenlet.readthedocs.io/en/latest/
-	https://github.com/python-greenlet/greenlet/
-	https://pypi.org/project/greenlet/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-src_prepare() {
-	# patch cflag manipulations out
-	sed -i -e 's:global_compile_args[.]append.*:pass:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenlet/greenlet-3.0.3.ebuild b/dev-python/greenlet/greenlet-3.0.3.ebuild
index 63f60e82155d..fcdecc644e74 100644
--- a/dev-python/greenlet/greenlet-3.0.3.ebuild
+++ b/dev-python/greenlet/greenlet-3.0.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index b73086bd5139..e0d2b99b7c13 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,4 +1,6 @@
 DIST ipywidgets-8.1.2.tar.gz 116492 BLAKE2B 0fc8283b332447cd3659d39d4564e2e794678169c7bc156660f3478251c4df23de1719e4fcf9651b9766506edf359bdfc803b1450520a3cbce290b39bd95bd3c SHA512 59ddc92bb9b18b6cd36b1499465e700ce9b11010e2d51cdf0a820b36efecbea1facab42ced2f61de312319f4fd4e672bb27b248d40ee0088f3b58acfd102ab61
-EBUILD ipywidgets-8.1.2-r1.ebuild 1263 BLAKE2B bb07bc836c89ce6befaf4a864342f25a3f3e6ce3a5b5e9f96c400b69a7ed2f2f8a4428ccd2ec48160b6c35d639b11dbcbf007451ce8c28212401a51fffdccf08 SHA512 14d54e4d1d849d14b0966b97bf94f8b81baaf47bfa7d50d37adcb69ba9aec085102c0564bfaa5989cd62d32d0289bc725f906906d707cd9f148c659b0e82aa74
+DIST ipywidgets-8.1.3.tar.gz 116515 BLAKE2B b7a11e7078ddbd99b8713fc3aa63c78118bf00b64c376412c608a622fda1e7d0430accb0959a56a474d2eeba4b5ce531255b52bba591f2806833644e47f2a7bd SHA512 3722e3716f367c6dce88c6ec401d23240c214793672ae76a12b672f77c7c801775d3253e1202749e54832d9dc13e4bb5984ec57e21607f12c22aced8874538db
+EBUILD ipywidgets-8.1.2-r1.ebuild 1306 BLAKE2B 95225f97749e6497191c66aeb9a48ddc61b45cca15c071db6da3757a375956a3182c4be2268a09e770a65ae76c4dc62c2758ec72b03e1d103ae1d48838eafb5d SHA512 29c58ffb639815cdb9c47c08193882ba01d526a1836c3a43dbe636e31a20cbe4e626dd52079b03456bd4a8d523b8a8da5efeb433aa2d22693dcda866da278746
 EBUILD ipywidgets-8.1.2.ebuild 1383 BLAKE2B 5dbb579631c4b7fada8a97ac0e333e30b9e255374be0615064dd74153cca62f1265c430c091511aba937fdf28754781838230e4b52dd638176ff878d318f9a48 SHA512 bc55d8828f27bac1e13f5c5c6c564fcbea801d6226ba0c0fad6a3ede88462c433e4c20bb162845623c467f177065b303a3dc537e8c7183b2fe29078b8904dba1
+EBUILD ipywidgets-8.1.3.ebuild 1306 BLAKE2B 485de0f58d91e136425a5c73b5b58cb86f3dc161a708b013d286ec4360491275e01079158f9496f289eef464c156d8eff77513fe5b4870e762913bd6457ec7ae SHA512 5ed5b46b0e6ce4e532d7c9bc2d8c198178873b35db5d52c4417c22d62b78f55c0ee2d11b1e96bc6c066eda7ee5792f17b2dd6af3b147991db09d7438e51b74e5
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild
index 074e06adc9f5..36da16af7d22 100644
--- a/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild
@@ -25,12 +25,13 @@ RDEPEND="
 	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
 	>=dev-python/widgetsnbextension-4.0.10[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab_widgets-3.0.10[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-widgets-3.0.10[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
+		<dev-python/pytest-8.1[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
new file mode 100644
index 000000000000..69df008cfb99
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipywidgets.readthedocs.io/
+	https://github.com/jupyter-widgets/ipywidgets/
+	https://pypi.org/project/ipywidgets/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-4.0.11[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-widgets-3.0.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		<dev-python/pytest-8.1[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/ipython-6.1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# https://github.com/pypy/pypy/issues/4892
+				ipywidgets/widgets/tests/test_interaction.py::test_interact_noinspect
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/jupyterlab-widgets/Manifest b/dev-python/jupyterlab-widgets/Manifest
new file mode 100644
index 000000000000..216380b27a65
--- /dev/null
+++ b/dev-python/jupyterlab-widgets/Manifest
@@ -0,0 +1,5 @@
+DIST jupyterlab_widgets-3.0.10.tar.gz 205549 BLAKE2B 7f31ffa65a6478f4007449fd9f1ea749144eda39afe21208b934fc33b2222e605a21e1cbfd61961b48c001b780eb75425444729fec931bb7fbb7f9afa290971d SHA512 a68de696b9d8c332c796242dd72d1a0cc33944373e97c826b8a971eb558565e55f4a0a59ba437e9bb9466695755193aa95ec74d69e54628931858f524c939da5
+DIST jupyterlab_widgets-3.0.11.tar.gz 203538 BLAKE2B 8208afd3dc9e8dd36a6ab77ac20d935b53a8c200401e9e423ca154e87c50379cced5ff785dc625ead7f09aaffd9af5835151a853224abce6e7c84c6ce199259e SHA512 27e8fec4817d3e37e1976c30db21f914b11dc3bb1e0aa7c584c811b3f9a54422136c7702bd32f7494851d87108182a8a9fe11686d515f4da19ee2a8f7a930755
+EBUILD jupyterlab-widgets-3.0.10.ebuild 529 BLAKE2B 30210605fa94afba6256716eb442c6249325eb1879eb46c7925a963971c82432b8311ca66152750ef21b4cad32ecac390a0c15ad994196eb53298c350e4a6f38 SHA512 69aa62b72e068b3f2ae5e6ff314709ff458019fa14b07439a3a0adfdae9ba915af7ad75ae367f71106a17919755be7f00a4485f5a72a6db1a9ba6c95c2f31ff1
+EBUILD jupyterlab-widgets-3.0.11.ebuild 529 BLAKE2B 30210605fa94afba6256716eb442c6249325eb1879eb46c7925a963971c82432b8311ca66152750ef21b4cad32ecac390a0c15ad994196eb53298c350e4a6f38 SHA512 69aa62b72e068b3f2ae5e6ff314709ff458019fa14b07439a3a0adfdae9ba915af7ad75ae367f71106a17919755be7f00a4485f5a72a6db1a9ba6c95c2f31ff1
+MISC metadata.xml 545 BLAKE2B e118a018413f28e1e793c14f26b1446f756ed0a17f4b8d7f93e3271300ce02ebffdff931356378f49c846aea0f3d01ebaa1aa13fbe4b914dfb47ca9cdff61ca8 SHA512 84e8c0c8fc095dff538d2acbe47065490228b2a833e8823e5462395aded8860472bf854389faf58ceeac758cd8d2256da58c738db6c86e22e9bb0f93dfefabfe
diff --git a/dev-python/jupyterlab_widgets/jupyterlab_widgets-3.0.10.ebuild b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.10.ebuild
index aba851fa4397..aba851fa4397 100644
--- a/dev-python/jupyterlab_widgets/jupyterlab_widgets-3.0.10.ebuild
+++ b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.10.ebuild
diff --git a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
new file mode 100644
index 000000000000..aba851fa4397
--- /dev/null
+++ b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Jupyter interactive widgets for JupyterLab"
+HOMEPAGE="
+	https://ipython.org/
+	https://pypi.org/project/jupyterlab-widgets/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	>=dev-python/jupyterlab-4.1.8[${PYTHON_USEDEP}]
+	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/jupyterlab_widgets/metadata.xml b/dev-python/jupyterlab-widgets/metadata.xml
index 64f57caac497..c648ebb8fde1 100644
--- a/dev-python/jupyterlab_widgets/metadata.xml
+++ b/dev-python/jupyterlab-widgets/metadata.xml
@@ -11,7 +11,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">jupyterlab_widgets</remote-id>
+    <remote-id type="pypi">jupyterlab-widgets</remote-id>
     <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyterlab_widgets/Manifest b/dev-python/jupyterlab_widgets/Manifest
deleted file mode 100644
index 0b064e05d883..000000000000
--- a/dev-python/jupyterlab_widgets/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jupyterlab_widgets-3.0.10.tar.gz 205549 BLAKE2B 7f31ffa65a6478f4007449fd9f1ea749144eda39afe21208b934fc33b2222e605a21e1cbfd61961b48c001b780eb75425444729fec931bb7fbb7f9afa290971d SHA512 a68de696b9d8c332c796242dd72d1a0cc33944373e97c826b8a971eb558565e55f4a0a59ba437e9bb9466695755193aa95ec74d69e54628931858f524c939da5
-EBUILD jupyterlab_widgets-3.0.10.ebuild 529 BLAKE2B 30210605fa94afba6256716eb442c6249325eb1879eb46c7925a963971c82432b8311ca66152750ef21b4cad32ecac390a0c15ad994196eb53298c350e4a6f38 SHA512 69aa62b72e068b3f2ae5e6ff314709ff458019fa14b07439a3a0adfdae9ba915af7ad75ae367f71106a17919755be7f00a4485f5a72a6db1a9ba6c95c2f31ff1
-MISC metadata.xml 545 BLAKE2B caa0de187664582d3511e7278e5e8cca5af6541169a2599346346dc33d59c9e60caf8b48ea7427c3ac1a0c5f71142b1d56ed08cf2051cd0370e67cee138d8010 SHA512 ff3a0873eb43b4f8da98445eff865a114e718c22d5ec3099d0fb25ad3bd164fe24a76949e1335111cfec4d82edd877a6575ef2e8ba8a71e538ff02ed4e932f24
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 041ed58fb939..677524e83c25 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -9,5 +9,5 @@ EBUILD lxml-5.1.0.ebuild 2902 BLAKE2B 10c758230f1c4fdb3084295749f3d2a0752983b142
 EBUILD lxml-5.1.1.ebuild 2911 BLAKE2B 5230bac2e92edffac28f7bc421e9e7376336621d03a1fc9423e0548e9c3b46fca73915c57183d491de3dfb37b9bfb7d9535c37917962f77ee1b0e96102edd864 SHA512 676c3ca88b2421dc4578aa8f9a7023eb95fa2dba35764af14672ca654ac474956e07b174662691f22ef60a120349d779bdb1aff7b4dae83ea56abc60bc8f4496
 EBUILD lxml-5.2.0.ebuild 3274 BLAKE2B de297284a590885fd96e79308c6999dd9a8abfc35f7a3c6eaeb947134ad7b80a7fbebde96e95c9f5d9771d0f7c3775014db0c178d897b0436023ae3a433f0f3b SHA512 c2217d56a20c3549f90d41cb7265916672b64f98e6ff9999b21c1b1652518bb85836755597a1edd3721d2e24d50f852ed91af5a790dddad1782c7aa5280ab2b9
 EBUILD lxml-5.2.1.ebuild 3267 BLAKE2B a3493eac99db16830146604d2d22b11102a2208faff543fa18bb35fa11769d6cdc7106b27054b785d39cf0bf9bb3bf16f0b8aaf9b8cdfd24e3765f4311a4d806 SHA512 61e7e63eebb4da7a7fdf3b58d6c713fa8ae6c3200b20cb8dc7bca8f1da6939278ed043088f9759dcb75ce6fa54e3b5785ccfb80db0541aa5c24682f9145dc400
-EBUILD lxml-5.2.2.ebuild 2987 BLAKE2B d4ad9ec3e45b3d92ef5d1d489325c55213130d662090bc9e5915d43940cb2e9cb126e21992279bdbb88ed491dd62bc22ac6dd737021fe16ed4554a2105cf7c21 SHA512 5605f06fb2f55b2af9e9b8f6eb666627ee18be5ae6fbe758f3a25d09a37958fb29156bac63a95f87a91433d36806fab0a0cc121ed64d2d7092656f8dbb7eed4c
+EBUILD lxml-5.2.2.ebuild 2986 BLAKE2B e5cc45a509a6f0a7de4b8ff99d998cce5023d859f68d6df8792e5d03d58b5545018f45ae21255efe94c25e5365558eeed7ccc0fe885f73c3a692ebebbe1e4eb8 SHA512 56bf3b0e3b414265019b8053d10b89a47a94ae751499ffbca42640b43d18a202a076173bbe1878fdbde681fd5c43c4e719c516b9403552b8b748f8597244777f
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/lxml-5.2.2.ebuild b/dev-python/lxml/lxml-5.2.2.ebuild
index a011eba1226e..ba26c6f045d8 100644
--- a/dev-python/lxml/lxml-5.2.2.ebuild
+++ b/dev-python/lxml/lxml-5.2.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 41dde14b1eb6..7802552e27ac 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -2,6 +2,8 @@ AUX nodeenv-1.8.0-which-hunt.patch 2104 BLAKE2B cf39acc007c270fa742b6e6556c5cd2a
 AUX nodeenv-1.9.0-which-hunt.patch 1525 BLAKE2B ee26931d73f75bd157224be169ea97381b9d57c704693561347990e2a008c96fe2d051df51c91e4560cd87510626b505b2ebc4b42c001998f7c3f99d2d7890a2 SHA512 8d6c01cf5da9026a12f08bb9eaa92d3838bc0008f917c2323ddfa06caea46b2ede4faae34533a7df0c5b62e4661538df4b74ff63471f33beead42ef51bba1688
 DIST nodeenv-1.8.0.gh.tar.gz 36750 BLAKE2B e75217bb0c468649cbc29688f29d62450008816fb07e4decf1b28dada8b820c2d6f70eb65444e06a8c64b8a816c0cc98f7d179e770eaefe93e87c0cda05e1f85 SHA512 96dce219e00d3837b2b0083af9fe6d94ed4e3cd029e3da564263ad8656dcb9c52440c2df6a6954095e5cacd03e44437f08695603dea82c28122713045183014f
 DIST nodeenv-1.9.0.gh.tar.gz 37002 BLAKE2B a8db26f893816c30c8ff5e86d98b23106b1a3b74dd5f58dd51f423836b070851a5b761fca5221b9b8510a427cae2e36732841ad9fea0a9728aae8d303ca5f40d SHA512 d24612372f7fb6d909ce164f6b980086581b53ee8234c6ec14003a79418d7798481275e87589ade47c0502a4b396fa7b07fcfbb99174f1331f65dd6e7a1e0fd7
+DIST nodeenv-1.9.1.gh.tar.gz 37158 BLAKE2B 73cdc56f7e8b55b8f0f6a4ab20fe91957f2ed40c6f58b9f17b13fbadc1f15305566018ffe7731dd930560f6d46ba67572bd4bb4bf4ba0419fd54760bac909dd0 SHA512 28fa814b57323dd996764d754f9c614c9dfd668c85ab21c23d0f9aeebb669ba3933f7b0b9ccbf0c808b5f15783eb3afdf3801f293952f3c4945729dee6ecb20b
 EBUILD nodeenv-1.8.0-r1.ebuild 655 BLAKE2B 43efd2983f6939e6f96e6375fc611788ad69ced89dc690a1348d43d7656201e70f761f2912e8d8285ecda420f02971d9efa6a420e8af3fc0ef3495799c9059b8 SHA512 f1d9647fa4ef78143dd2803be1ad01ff056b11c87d9774a5583b9234cbe80b4618dccd83340a0ec645f852ff395316a5672261625cff4218c97365a61efd3c27
 EBUILD nodeenv-1.9.0.ebuild 699 BLAKE2B c880dd11732d66ea80d0e818cda7aa92298d0b3485fe197d069e8abec875463829ea985f639b102f6558e0259baaf63e1c231e31758918979870bfb813eac70b SHA512 fc39f4a3dddb5e38d0f0cbfca7d0ddc3a1f0663103e31b518f36e6f492e8192d130caf76015c80b0316960102be3214edb6babea3b3a58b1373740fafaaa5fde
+EBUILD nodeenv-1.9.1.ebuild 706 BLAKE2B b12398989a7fb964de443a4e8677cad08f8d9ffa486a9899828c8a5d7eaaea2ef7c0151fc0179383748ae80b530179b47a1d75c060731df0890c9bf0e9a1f7e8 SHA512 86d277247824a26c432b3915fddd33dc5fd9c7e979b38bae38479df21992749c77132f2ed3391e740fe507ea62f5c9d48220ed7faf01050bd51a4fd11deb31c6
 MISC metadata.xml 294 BLAKE2B 243e0fe79352f73a8be8b1e9921a4537179e5a251f9b2492854b0609979e221bca122b8ba4afef38b4d6ce556ef59f9dd08f5852e6664488de99015b3790fbcf SHA512 36afd4b95183c7e42bf237887634fb4a19c25ce96cea1282dfc76d38dbef725ffcc02052184a4d4115eeffd276f62f77240809d3cfb0adb6ae5887ade583cb24
diff --git a/dev-python/nodeenv/nodeenv-1.9.1.ebuild b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
new file mode 100644
index 000000000000..1166bc54bc60
--- /dev/null
+++ b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Node.js virtual environment builder"
+HOMEPAGE="
+	https://github.com/ekalinin/nodeenv/
+	https://pypi.org/project/nodeenv/
+"
+SRC_URI="
+	https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+# requires network access
+RESTRICT="test"
+PROPERTIES="test_network"
+
+PATCHES=(
+	# https://github.com/ekalinin/nodeenv/pull/355
+	"${FILESDIR}/${PN}-1.9.0-which-hunt.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 83bfba70b953..6c9edfe20c6a 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,5 @@
 DIST python-phonenumbers-8.13.37.gh.tar.gz 4915690 BLAKE2B b0d325c5f5aca2bcfcc98bab4e5654f4cb21908b41c32b498543186e037b1f2d425ed265c1a3d2bec87fc8ae913257fc455169c91929bfbba3e44bcedffaf0dc SHA512 ac55e8cb2bad7e1e70afb13c49cdd1f73fc840cad6e10f4f9a6c817043729aaf3bdfddae0c9ab3d19f9d4de8cdff949c0bddd94de63e1c42e6c55e0445c69d6c
+DIST python-phonenumbers-8.13.38.gh.tar.gz 4915409 BLAKE2B 26bf7179466468ed0b682c0928e1e3190885dc4bc5969c97be5f3ecbdc1a81640e42133ae52db69e277b74c35e2d62cbb45af421c557cfc31f5102bcf281aeb8 SHA512 9b929193b0667cf560e7cce86db844761de8dffeca2e244d91e42e9ad83dbc819cb33a738432f9f53761d0c241aa011a38fc14ae2265c6f351144107430360cb
 EBUILD phonenumbers-8.13.37.ebuild 816 BLAKE2B 9a91edd2625fc7c277ba2897cb9d647aeee717ba6373697ab134e865b326990650b49bbaccc04ef442e326fea751b25c4dfedf4fefbedeaabdd83df64e551ebd SHA512 263c125e0c820cd1e0924e891444256676cf3e427b8f2ff1f0788584802c9cb55c496cd60619ea55cb7cb88a1ae5a7b7594057fc99f58b709b951a84203e5766
+EBUILD phonenumbers-8.13.38.ebuild 818 BLAKE2B 9bf355913b9ee3be2b380dfa5f679c08da753ead0df156ede2bf5e6499699814a7cfa6e51988d987cd92f632b07d222fb9cf261a0eae7bef32d55ededef6e406 SHA512 8656a45bd6078afd23b7f511c8223b20e00df91e35324c8a8ad6bc43b73700ebdb3ad28b98c29338939bd1144f48a715eb4f36f616481fa002ba5d0bab22e17b
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.38.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.38.ebuild
new file mode 100644
index 000000000000..2fc9bdbaa7c9
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.38.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 54622dc38e4e..31d3a595f3e9 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,9 +3,9 @@ DIST pikepdf-8.14.0.tar.gz 2870612 BLAKE2B be0fd5a8d48fccc7695c45acc28cbda825252
 DIST pikepdf-8.15.1.tar.gz 2870723 BLAKE2B 958bb2a417e2f1c9e5e4448b47cdadffb10e82841cc8173503881a86e92e85c05f800a8ad6936f32ee53e6f7a8cd62ee9e28e251de1f32a7cdce055139ec5fa3 SHA512 ae6b0b8bdf7e395943caf503f1d498861bd2719185e6382a522b8c0d4e38413a1b070e912367852bc5735d29b8453d05c57ff384ede825830722470445a534f6
 DIST pikepdf-8.4.1.tar.gz 2853305 BLAKE2B 2298514159db17ba49b8e2fa2407d60de50273bea111ece704251d99193bdc4c8ed77f624237a49c3f4f129e3b14ac4ddd1006cf3024bcbf822bc5523e0fee35 SHA512 6989e8a3888f612e453ec1ea8425c0ca35ccfee19ae5e8c32df136ebc3fbb7728d9fe5beaacb4e392a20c9037a1009fc8f8d53d73634427fb0df9103626e34fa
 DIST pikepdf-9.0.0.tar.gz 2868331 BLAKE2B 6735938fd2c0e8bb6a5fb40896350a2caa2ee20f8982010574a4e682c8ff19d01bc6773d30f78e2d4a5d58496de9dfa8fe9584f1c954205ed4832753addbd373 SHA512 15248d523cebdfbfcd7a5f8b6144b7dc8371612bd77ba3847af1ce626b5d87780911346d3c61bfe7cef545a19f1863c1a4048b35ace56f2cb62dcb962272829d
-EBUILD pikepdf-8.11.2-r1.ebuild 1789 BLAKE2B 01fabfa0cea84be7e4ce728426954aab95e9d7fdadc8f6d1247a08dd3acc1140f955b3795f1e24d829215bf823c6e293b3f7907158bf11fce65dc728d17ed2e8 SHA512 59c32a82d8acda311da0eb76325c83af80b392a214860b4cdb479c9d1c6b4f4703fb3ec09d77101172b8d419b51eeda697d799c374b966bbd292831d6489511b
-EBUILD pikepdf-8.14.0-r1.ebuild 1790 BLAKE2B a8fb5ea463c96e1a1a3968451c1a3e67c221fcbe69dc48b189a8116a74d5e816294c5d3b41e28bde34cc87ac6a63cf47bf3aa854668c1afc8240e60b7864d0d8 SHA512 e48cf7f1b63d8ef87dad5eb10aac7f7396c38763140defc0ca26d63f8c6b457ffea3ab1e9ae7f011e4ed7345464a3a46ad9c21d62883fa0a8c8d65c1c30aeec2
-EBUILD pikepdf-8.15.1-r1.ebuild 1790 BLAKE2B a8fb5ea463c96e1a1a3968451c1a3e67c221fcbe69dc48b189a8116a74d5e816294c5d3b41e28bde34cc87ac6a63cf47bf3aa854668c1afc8240e60b7864d0d8 SHA512 e48cf7f1b63d8ef87dad5eb10aac7f7396c38763140defc0ca26d63f8c6b457ffea3ab1e9ae7f011e4ed7345464a3a46ad9c21d62883fa0a8c8d65c1c30aeec2
-EBUILD pikepdf-8.4.1-r1.ebuild 1685 BLAKE2B e0f3befe27888e3a3b46514eecb42d4662d2d14de7aca6f5c5df21ad2a1c83865b535d0f940e0a3e100581e2e118843e21c603a7d164399bcfd1d6eee6f9ce82 SHA512 da622792eb31cdd24aca262e09cd07921ac731af937993148d46234c150d8667a6ab3670abbcd93bbc0e63c6dcd74992cb99f958d1caa953a85782d904030aa6
-EBUILD pikepdf-9.0.0.ebuild 1796 BLAKE2B b252d3ddc4abb110b6132fd039fc85dbd3266502aebae184c5085ed96ca37f2213194c08a3f970c6eefab76d6045a6dcd18d383c81ca4872f055f49ad85f2d34 SHA512 4bdb57ba2ce4d4bf1dcf349906f0b3761e3ee38fdfa09113d3b840442b4b5a55546baa318d1f9e29108eaeb8add21d31fed7d158919a5de73c516c9fd56ff819
+EBUILD pikepdf-8.11.2-r1.ebuild 1731 BLAKE2B 91700e32086a03e75469137f0fb3e274bfbbe312c073dc6826bce7fbae9a3e2ce35ca4ba1e5eaf9c5922d380785dbdbae216f7da03e127b084f88c0ebeb5cb75 SHA512 5a6be61c7de31a7e7eecab18f3e63cf07229055c49def8bac7e9668110b4e813a612180e75392aea44ac1e8dbd5dfea1f6dd98b83d8d067039ee95496fe1778a
+EBUILD pikepdf-8.14.0-r1.ebuild 1732 BLAKE2B 9b5b7f80f737a410c8909b068403fe314ac5eee0e6fadcdd1dce1c60283188e39f61cc3484bcd972dba64747674a3f0adf06487a58d45b3fdd263f5e2f8e1e93 SHA512 0faa15815c04cd3b60584fcd421c19ef0e2688311ea051916456bb19ccaab2b0d950d1095f752615bfa818703ad24541eab8d7b91263569761f7a2f6b1fa0809
+EBUILD pikepdf-8.15.1-r1.ebuild 1830 BLAKE2B 45a4d8faa70f4c7fe4502e9fa359f61b65203825881211395b69b8a1f7a2ec1392dd7d2c33ca65524a952b60c0b8365c40c27ab4b2ad64414f0729305b7f51ce SHA512 06bbb10b97d9ec7131b1cc7306ec7d0209c24038e333667a78a5981ef6300a0ed1a1752b7adc26c4dbed3ea2cc703004c24889df37736d890a62d6e998692a50
+EBUILD pikepdf-8.4.1-r1.ebuild 1627 BLAKE2B 721f4410738d2c5d43de3d0923654a657a21da7950ecf7f47bfb918d647fe3cfa39725451ef0431a80480114e62bf3c6d941f0f8f03418c1c5a0b979049f6b72 SHA512 c6850e079ae3baff68fcb5ee0bdbac6fb60985ca3026084c5cb94f17d884531261f12ecfc24a043b61bc652205ac22dd2cf7c1359a39f84ae6f087666ad7b3ce
+EBUILD pikepdf-9.0.0.ebuild 1836 BLAKE2B dfa4e9b866d670a6f6c55f06a43dadb3b81c81d4cc50194fa7a816db986a186ecde1470d671740cb31df1f6f22156ac17b0befb2af4297d896cc254200fe46b9 SHA512 a2cb471383f97b2b747016a42ddd96f8e0a5b9c462c09cea3aa9172763de1968466e2ff0163ff6aa5dd87a30a802f48610a76cb99ca9b0413b871b1d8e9aaeab
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-8.11.2-r1.ebuild b/dev-python/pikepdf/pikepdf-8.11.2-r1.ebuild
index 417da5be9fcd..bbd2842097b5 100644
--- a/dev-python/pikepdf/pikepdf-8.11.2-r1.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.11.2-r1.ebuild
@@ -42,7 +42,6 @@ BDEPEND="
 		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/tomli[${PYTHON_USEDEP}]
 		' 3.10)
diff --git a/dev-python/pikepdf/pikepdf-8.14.0-r1.ebuild b/dev-python/pikepdf/pikepdf-8.14.0-r1.ebuild
index 367e7b427436..342767bd45fb 100644
--- a/dev-python/pikepdf/pikepdf-8.14.0-r1.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.14.0-r1.ebuild
@@ -42,7 +42,6 @@ BDEPEND="
 		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/tomli[${PYTHON_USEDEP}]
 		' 3.10)
diff --git a/dev-python/pikepdf/pikepdf-8.15.1-r1.ebuild b/dev-python/pikepdf/pikepdf-8.15.1-r1.ebuild
index 367e7b427436..5c93cf4933f1 100644
--- a/dev-python/pikepdf/pikepdf-8.15.1-r1.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.15.1-r1.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
 # https://qpdf.readthedocs.io/en/stable/release-notes.html.
@@ -42,7 +43,9 @@ BDEPEND="
 		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		!big-endian? (
+			>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		)
 		$(python_gen_cond_dep '
 			dev-python/tomli[${PYTHON_USEDEP}]
 		' 3.10)
diff --git a/dev-python/pikepdf/pikepdf-8.4.1-r1.ebuild b/dev-python/pikepdf/pikepdf-8.4.1-r1.ebuild
index 74215529a058..96db3b598947 100644
--- a/dev-python/pikepdf/pikepdf-8.4.1-r1.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.4.1-r1.ebuild
@@ -42,7 +42,6 @@ BDEPEND="
 		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
 			dev-python/tomli[${PYTHON_USEDEP}]
 		' 3.{8..10})
diff --git a/dev-python/pikepdf/pikepdf-9.0.0.ebuild b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
index 420eaac097bf..14d1f25d88bc 100644
--- a/dev-python/pikepdf/pikepdf-9.0.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
 # https://qpdf.readthedocs.io/en/stable/release-notes.html.
@@ -42,7 +43,9 @@ BDEPEND="
 		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		!big-endian? (
+			>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+		)
 		$(python_gen_cond_dep '
 			dev-python/tomli[${PYTHON_USEDEP}]
 		' 3.10)
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 7938f7399242..a0263a26a88f 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,13 +1,7 @@
-AUX pillow-10.1.0-olefile-0.47.patch 1456 BLAKE2B de5fda5245b9674f7a695bcde5125eeb326fdfa29c6cca2a7406c12b31af1d8e4b4ef2919c99e2ce8ed08dc6cb441b7728190cce23b7d4e1a384605a584a086b SHA512 3eef1572704eba1fa5047f866c11b563f0c79e04ae1da5f70aa2fb9876dbf21583376326c47d44691732492c092b0c4821fbd18f62de4de9a1970b6e177384dd
 AUX pillow-10.2.0-cross.patch 2390 BLAKE2B d690b3f93d59c32d0f1b209b51ea4787230892488059ec206f548276a1f697394ca539fcd9f92fa7c547b37dd6b4fc738400a3034f54eec6260f0f98ae372b39 SHA512 4afaec6964298e2f1c21fea77791ce0cdacdbc65bf9798d46e99681c772065c1ad1175f5821162157cacac64f556e320af2ca7dcbd0806c07d04f8116f8f508c
 AUX pillow-10.3.0-py313.patch 691 BLAKE2B acd10146af5467543c44a29bd8236f79fee803d1d0b3bf97b3db2e6ae817f81f30382e9751ae694039ae589a04e4f1ac5169e9a2e60ba5a10c9d2bee1fe00dfb SHA512 5ecd82ae120e3456902f3ab44b0c7a3491ba33de987d005e2a966e8150c45baef46dd357db997662c02734ac00eeaa6a544372610c06e6435e282f5e4fed73aa
-DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9
-DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a
 DIST pillow-10.2.0.gh.tar.gz 46244216 BLAKE2B 27bb076f0adade34295e6dfec5c5a1499471036e4f5358f0b3985c064a0ae962be9e91985851b369a49162ef520a84bb20eb1a5acb074fe94d861f042e4ada92 SHA512 d77ebedfb89d541db2fcba4fc354e097b9917594170bad07c67e22de123c9e0bbc9c55a938fc152bbdcca3ce23de6fa374a6d3d3bdbd44f16dbc2616c1bddf60
 DIST pillow-10.3.0.gh.tar.gz 46636534 BLAKE2B 523486a3adc8905dbe0691e7092654e7884c34703f351e228a49b1cb6e9cffdf504b842aa0c83b18afb8f0dbe1265274044003aba540d6427ec3cd46ddda1498 SHA512 11095f435ba30ac364575271de4c94d498b6fc1d67730b8212fae6f187902129018ca950aa878843f4d1b29e25aab1be245ed313fd3bc110ccf9ce3ae266d840
-EBUILD pillow-10.0.1.ebuild 3501 BLAKE2B 9f690f40ca87ce944906fd315fa702735587500b2c3948431206803aad95a09895920819eb5a44f39c2b12c01de7400042743e516fbf5c86615c39d62b067d16 SHA512 ae4ddcfdf4e60fe86eb2643f839e3a0d72dcb1e7b2d78ce6a9f476945e81d673d1b2319b09d1f69bfd6d1f27b6ed693355e1fd85536f51d6b2220484f65bdeb5
-EBUILD pillow-10.1.0-r1.ebuild 3606 BLAKE2B bcec30251d71e5c9cc439bad1fef9e701721af432a05187165880ee2ba9e776ac6c7208275168e6843727d33987a7482977aacd1d6e7f77b492bd74d9ee10ebd SHA512 4ced9aa36035a8c9865497378df8fead39e50c9d61b8b47fb218031a1ba9f6ea9086d9104b594e75936ef41870e435601ee51d621f61cd1531dc6d99a1ce61cd
 EBUILD pillow-10.2.0-r1.ebuild 3271 BLAKE2B dcbe6350a55e28c2fdb6cfbbe33e638bde17fa291b5b507b5071084a8cc13a16be2c87ba986e7c59acd27ffb01cfc8ea4d6ae58cc845890aee6356dc29434139 SHA512 45e05f96ad73aa58e11d6f0fce2afc4b727f6538801b861aec0f586d8714ed4270532973b063f2e3af3e0971986dd75f22606dadcb267a907930bd8d9d82a623
-EBUILD pillow-10.2.0.ebuild 3509 BLAKE2B 1901ee3f18c79007ccfd0489719a022fa3d68d5c4a21d625e87579d54ebecb025eeef65b781518e3a85cf464e125887f2bd2344f7de12036b23d6ad7271d05e7 SHA512 9aef737b1689c30ce05eae1b96f9f9a83c4f3d1b5eb0223ae21a61994f8f28fceaee57d5ff5c4a3f145e8a4ae2a9700c527c29a4ef6357567361c125e39da2b9
 EBUILD pillow-10.3.0.ebuild 3370 BLAKE2B 3009608cdcfc4cc7f375c0743c3b1890babc2bc806ddb4e0a19eae9e08e6dd00e438f80d15690e4926ff01297155da5e9ed7f80a3526885e116c5120580a3bcf SHA512 ffb453c9c462d0f7964474951253ceedfaec9d288c2019b2b282e2f34947953788c8f50324b3a095f7bdf25f785e54be7caf7d4d03af7bc05e5973de8dbcddc8
 MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb
diff --git a/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch b/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch
deleted file mode 100644
index e3b6a6473dfc..000000000000
--- a/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0e523d986858e7c0b4acd45ea1c5a3a639e39b4b Mon Sep 17 00:00:00 2001
-From: Andrew Murray <radarhere@users.noreply.github.com>
-Date: Sat, 2 Dec 2023 10:57:16 +1100
-Subject: [PATCH] Fixed closing file pointer with olefile 0.47
-
----
- src/PIL/FpxImagePlugin.py | 1 +
- src/PIL/MicImagePlugin.py | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
-index a878cbfd2..3027ef45b 100644
---- a/src/PIL/FpxImagePlugin.py
-+++ b/src/PIL/FpxImagePlugin.py
-@@ -227,6 +227,7 @@ class FpxImageFile(ImageFile.ImageFile):
-                     break  # isn't really required
- 
-         self.stream = stream
-+        self._fp = self.fp
-         self.fp = None
- 
-     def load(self):
-diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py
-index 801318930..e4154902f 100644
---- a/src/PIL/MicImagePlugin.py
-+++ b/src/PIL/MicImagePlugin.py
-@@ -66,6 +66,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
-         self._n_frames = len(self.images)
-         self.is_animated = self._n_frames > 1
- 
-+        self.__fp = self.fp
-         self.seek(0)
- 
-     def seek(self, frame):
-@@ -87,10 +88,12 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
-         return self.frame
- 
-     def close(self):
-+        self.__fp.close()
-         self.ole.close()
-         super().close()
- 
-     def __exit__(self, *args):
-+        self.__fp.close()
-         self.ole.close()
-         super().__exit__()
- 
--- 
-2.43.0
-
diff --git a/dev-python/pillow/pillow-10.0.1.ebuild b/dev-python/pillow/pillow-10.0.1.ebuild
deleted file mode 100644
index 1e25a3391179..000000000000
--- a/dev-python/pillow/pillow-10.0.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/
-	https://pypi.org/project/Pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO (is clipboard unreliable in Xvfb?)
-		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
-	)
-
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-10.1.0-r1.ebuild b/dev-python/pillow/pillow-10.1.0-r1.ebuild
deleted file mode 100644
index 0c65cdff5b1c..000000000000
--- a/dev-python/pillow/pillow-10.1.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/
-	https://pypi.org/project/Pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-PATCHES=(
-	# https://github.com/python-pillow/pillow/pull/7594
-	"${FILESDIR}/${P}-olefile-0.47.patch"
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO (is clipboard unreliable in Xvfb?)
-		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
-	)
-
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-10.2.0.ebuild b/dev-python/pillow/pillow-10.2.0.ebuild
deleted file mode 100644
index 6149846c306e..000000000000
--- a/dev-python/pillow/pillow-10.2.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/Pillow/
-	https://pypi.org/project/pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO (is clipboard unreliable in Xvfb?)
-		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
-	)
-
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index 81f23cbdd0c3..db476f462586 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,7 +1,9 @@
 DIST prompt_toolkit-3.0.43.tar.gz 425733 BLAKE2B 663b3f675e004de9f2d6dce09320bc0bbd6a47f5a581d5b49bb5fe36f0d3eee2022522eac09dccc5bceaf6227e17abe475f133c53b912b3b84f940877aaa6b9a SHA512 833666da9bc7259eec2ee357cb936001880ac1f88c33a1e346ef5e4b8c3fcd37ff7d7102e590d509b0b0ac1e046fcd9d2a7046857c9e95dc3890f1b70c62544c
 DIST prompt_toolkit-3.0.44.tar.gz 425654 BLAKE2B 48d080ad6cab2ed192284ae376c65b43a500b7c642b9298af6afc109a16ddf53d8242748af772dd556a568356ab4af95bb71dfb36ec345ee9d4904f0de15fa20 SHA512 09202d023e52eae2200e23be1ed9bfa91ce072c1c6970d00d92fe9f0fabfaa4117b9e174b43b9ae041f4e0605c77a990625e51e51925d1ff63a65a10e09734a8
 DIST prompt_toolkit-3.0.45.tar.gz 425324 BLAKE2B 771b1c4b80475f52547d725bbcc5e12223ab15cce9ca5a63c4364615c3f1c6ab23c9e14023178bf2e30467138f1b8407132eb22208fdc29c3c34992c6899c016 SHA512 6e8758e06fac7462821bd803a99f961017cd4e889eb39744fc1a3665983c12fced7bdf0538d83d709040cfb182e3694c1dc31e0c9e62aa08c4b1a7336955d35e
+DIST prompt_toolkit-3.0.46.tar.gz 425591 BLAKE2B 74d10e5bb93cbdf9625f621ca80f15bb012c2839956fa0edaecab7f7af4ce1209eea4eb8fcd403563be5da514f3d08f550d605d44ec2e3b7af136950a9f9428c SHA512 c75dc84a45c24ddbf6074c65aa5e5e0e4ba6d2f1c1a9211e771a534118571b1ad31db57457304365d08091fdf5ad0f8827893269d3963fc1f29b0dd56a12ca64
 EBUILD prompt-toolkit-3.0.43.ebuild 622 BLAKE2B 6f3d06debcf1b8a51555ef04865a7420ea529c69ebfcde04e04beb8a597754858edc0cd0ce6b6dd9ec7dd6cd3ab133e030f209a45ef264129b832274304167de SHA512 1a77a01b2a7e953443e8ef75abde1181ec20849d4103bc8d6c86187775337402339b327636c5fd94202b180f6888a13cd1af04127eec3b8140e5336214ebea49
 EBUILD prompt-toolkit-3.0.44.ebuild 731 BLAKE2B 3af40e8ee6481ea90db511fd1e3f4a3169af20f94fa1af226d3fd7141a2dd7b6c2903a0169e7bd07dcf7b5e5d4f6fca23a9023d35100788131f9303b0696ad46 SHA512 7ff984bdf0bc3d086fec7b35c42e223359d345690c3e60086539cc0e31f0e6b5e0fbbe8e2c19809725924f887f89395dc5dd93a5fc205fb3178ca7db28109744
 EBUILD prompt-toolkit-3.0.45.ebuild 731 BLAKE2B 3af40e8ee6481ea90db511fd1e3f4a3169af20f94fa1af226d3fd7141a2dd7b6c2903a0169e7bd07dcf7b5e5d4f6fca23a9023d35100788131f9303b0696ad46 SHA512 7ff984bdf0bc3d086fec7b35c42e223359d345690c3e60086539cc0e31f0e6b5e0fbbe8e2c19809725924f887f89395dc5dd93a5fc205fb3178ca7db28109744
+EBUILD prompt-toolkit-3.0.46.ebuild 731 BLAKE2B 3af40e8ee6481ea90db511fd1e3f4a3169af20f94fa1af226d3fd7141a2dd7b6c2903a0169e7bd07dcf7b5e5d4f6fca23a9023d35100788131f9303b0696ad46 SHA512 7ff984bdf0bc3d086fec7b35c42e223359d345690c3e60086539cc0e31f0e6b5e0fbbe8e2c19809725924f887f89395dc5dd93a5fc205fb3178ca7db28109744
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.46.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.46.ebuild
new file mode 100644
index 000000000000..4efb2ede21df
--- /dev/null
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.46.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# requires tree-sitter-languages
+	src/prompt_toolkit/lexers/tree_sitter_test.py
+)
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 1e7a51acb818..fd7f560167ac 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -2,5 +2,5 @@ AUX pycurl-7.45.2-skip-http3-test.patch 1116 BLAKE2B 9852580ab51cd978501d9662928
 DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
 DIST pycurl-7.45.3.tar.gz 236470 BLAKE2B 690e49f92f569352e26d95a0fa58508c4e96c845c7e3ae1169b8bc55036902f64859987880565217df56a57031dc2775e3c6979b4cfdf8a8c9a94c67ae94cb79 SHA512 12a55070602a1fd22b160ad582a4001bdd28531d2b2ccd365ff0136bc13dd23af80b19488bdbbc60a902a3a362b64383b9ae6acce6ed328c74dcffc8a6a3f4ad
 EBUILD pycurl-7.45.2-r1.ebuild 2932 BLAKE2B fc7d5f3744c0468d52ef6ea43861929a5e44023c783a7218d9d3c088940d982731b06582996bf3c032c7dd98ac274dc86a52bc4a3bf526395b23ead4df14be48 SHA512 05c9a4fca00c10d6b30abc42e929264e7271e44dc64c0080a181f0b1b12eb54ddd96ba17d620bbb706511e695adf0303e46d84dbafa77930ac85f232631b299c
-EBUILD pycurl-7.45.3.ebuild 2771 BLAKE2B cd714d9442ed7ef002a28a1a3bd24d97dacbb9133ac9db04575d2d3e10bbfc943ef969aa2132e19372ba1be45ae1a22048119c5d86ba58dc46e24195b6092497 SHA512 259a2c9f8b9e27af0e49e3de1ff8df521432ed9b63e38ad5533aef0089cc2cf58f0b38398439f8a9d5b66202252e689798120c97a99f153fb00336545ca963a0
+EBUILD pycurl-7.45.3.ebuild 2727 BLAKE2B 2097ae62c479c31d5343368cc3db75f6f53bddb85ca2b8fdf12771a887d9fa7fa57e3506ee10d64ba5e1984dade620c0bbee7fe9b9ebf278e72f73f6154a116f SHA512 843fed0127cafd5edfaf5e50630548444c2119839dca02599ca700e23fbc84ed9f5ba67002a17d84f696b8ffa43c14c90d037176b2053dcd1196692b22c8cfa2
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.45.3.ebuild b/dev-python/pycurl/pycurl-7.45.3.ebuild
index f1581a3aa300..49d977613d57 100644
--- a/dev-python/pycurl/pycurl-7.45.3.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.3.ebuild
@@ -43,11 +43,11 @@ BDEPEND="
 	test? (
 		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
 	)
 "
 
+: ${EPYTEST_TIMEOUT:=120}
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -83,7 +83,7 @@ python_test() {
 		tests/option_constants_test.py::OptionConstantsTest::test_socks5_gssapi_nec_setopt
 	)
 
-	epytest -p flaky -p timeout --timeout=30 tests
+	epytest -p flaky tests
 }
 
 python_install_all() {
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 21fb15b050d1..0dd9fd2b7f76 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,9 +1,3 @@
-DIST PyDev.Debugger-pydev_debugger_2_10_0.gh.tar.gz 4019265 BLAKE2B e72c96576588ac3cbfcdd71a1a8e96d41b9d6757b3468c372b45a9c91a887c693f7309467fe8ea27d29c4775cc8df9ebd610b015cecabaaea43c8aa75229bc25 SHA512 a475e4f4cd9f883307d30b0bb2ebd5095de426b52f0f70b1a557095c06241149ad105ca4cbb31d311fa54e4387bbed27e5cf2712ba7447b19720d46dac21a101
-DIST PyDev.Debugger-pydev_debugger_3_0_3.gh.tar.gz 4287855 BLAKE2B 2f9f9cc892a19e42a37190966f2d2897f3e5da477c88d76d4b61b3062b6482db4c4cf5672efe75a1c139aa42a6b017cb5b276cede1167d0e91ca50009706e7e7 SHA512 4a5d03ea69e9eb40ee09c8d9a2258655f1645076757fa02bf92c8ad1b4fbb0570c1ac55464d8dd44cea6187ad2fa858851e02a86dc18b2343411cd8c56dc0c6a
 DIST PyDev.Debugger-pydev_debugger_3_1_0.gh.tar.gz 4293466 BLAKE2B 2b820b44a37362dfe554f60f418ce6c94cfd9fb9b14b6d6f521e7bd2023f044129b440878a136d67249096ba8a4aa61bb465551c1d9930989ffe9fe40c68f464 SHA512 8afaab2a69cb6785c5453ce1034a70fa28ab33c3122c1e21c485d9023317785524144c76e87864a695fa1fd26b05bc6d828db22a7cbcf025bd8aafe0b9ed4d3b
-DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
-EBUILD pydevd-2.10.0.ebuild 4031 BLAKE2B a3cf8ec94770baf402bae877bc33d96cc6305bf6c6b3facf5b727deb725f629e667275e9f04692fe80856686d0189a925a0f005d5dce57a9e739d90c096154c3 SHA512 4100da7309d494045ee017bc0fb1d566a4b02176498fd62d21502b5e99ac5ccacd923808113033248a65754883bf18aa9e6e665d196271eb595abdafc5edb024
-EBUILD pydevd-2.9.5.ebuild 2487 BLAKE2B 6280a4631cf006bed5e2ae84f07155cdd3372e36427f66ca77f6e99aeedfb137ad9080adadd2436077181db427917c25bf688058ab50a3042f0918e2f9ff972f SHA512 122916be19c8728c0c155b23dfa8818def24fdfb66bb1806e0da6475d9eb460bb596e00c7958c4c52753f94987d05b23357e0d03d5ae5917c83e756f3e8abc66
-EBUILD pydevd-3.0.3.ebuild 3673 BLAKE2B 0f88582b01fc717cd008c3aeb29efdf0352b0881a6a3d2dae59ce6240bd89ebd97973c4535e4e3ef223e178da5b0f1d20818e3fd2743372c98e08dbac91ee07e SHA512 fbfcfc39dcd060ecd1f67ab9588b4babdf41202cf1e571e4c4fa97658429905e3b1c03369b16920bb7cca0e4c733fb0e43b46a75e5056651f374e11aa3d39738
-EBUILD pydevd-3.1.0.ebuild 3804 BLAKE2B 65533f7a910e6a641fbbb7175972fad6c3bb2dec2508336e33721da768fc3d1a74a652af962d37c3e9ed6025bea3913b52202620bb7c12a0fc1450573f81fbeb SHA512 ac6bd255e39a9fd6d8cbf686c6c72ef157fc8aa1622ccdbfef25d8af661c6f34a42391ba58fac8cfcbf2438de640abe5a95187613e57d4051966854a2ebc687c
+EBUILD pydevd-3.1.0-r1.ebuild 3961 BLAKE2B 0a3d6c522610ec67b9617e39adf4d20f33ffb80ef9a3bb875af378cef44518ee3ea2986bf9bcd3e6921af3f6749f3f47f040a915d5dc481d0b217d412379519b SHA512 f7d387ca8057007ca85388ee808c26237422bffc4c52529055aaae3bac125d95f2514e91f206db79f26ecbbdc371ce081ab1118e53686fa679be39afd302d026
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.10.0.ebuild b/dev-python/pydevd/pydevd-2.10.0.ebuild
deleted file mode 100644
index e4df47c1daaf..000000000000
--- a/dev-python/pydevd/pydevd-2.10.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 multiprocessing toolchain-funcs
-
-TAG="pydev_debugger_${PV//./_}"
-MY_P="PyDev.Debugger-${TAG}"
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="
-	https://github.com/fabioz/PyDev.Debugger/
-	https://pypi.org/project/pydevd/
-"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-debug/gdb
-"
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Disable tests incompatible with new package versions
-	sed -e '/TEST_\(DJANGO\|FLASK\)/s:True:False:' \
-		-i tests_python/debug_constants.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} \
-		-o "../attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	popd || die
-
-	distutils-r1_src_compile
-
-	rm -r _pydevd_bundle || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		# NB: upstream seems to run tests via runfiles.py but that script
-		# is a horror and it seems broken for us anyway
-		tests_python/test_debugger.py::test_attach_to_pid_halted
-		tests_python/test_debugger.py::test_attach_to_pid_no_threads
-		'tests_python/test_debugger.py::test_path_translation[False]'
-		tests_python/test_debugger.py::test_remote_debugger_threads
-		tests_python/test_debugger_json.py::test_attach_to_pid
-		tests_python/test_debugger_json.py::test_evaluate_exception_trace
-		tests_python/test_debugger_json.py::test_gui_event_loop_custom
-		tests_python/test_debugger_json.py::test_path_translation_and_source_reference
-		tests_python/test_utilities.py::test_tracing_basic
-		tests_python/test_utilities.py::test_tracing_other_threads
-		# incompatible version?
-		tests_python/test_debugger_json.py::test_pandas
-	)
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests_python/test_debugger_json.py::test_case_stop_async_iteration_exception
-				'tests_python/test_debugger.py::test_case_handled_and_unhandled_exception_generator[False-_debugger_case_unhandled_exceptions_listcomp.py]'
-				'tests_python/test_debugger_json.py::test_case_unhandled_exception_generator[_debugger_case_unhandled_exceptions_listcomp.py]'
-				tests_python/test_debugger.py::test_case_13
-				tests_python/test_debugger_json.py::test_function_breakpoints_async
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# this is only used to compare against getpid() to detect that xdist
-	# is being used
-	local -x PYDEV_MAIN_PID=1
-	epytest -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-2.9.5.ebuild b/dev-python/pydevd/pydevd-2.9.5.ebuild
deleted file mode 100644
index 8fd4f838ad1a..000000000000
--- a/dev-python/pydevd/pydevd-2.9.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-MY_P="pydev_debugger_${PV//./_}"
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/PyDev.Debugger-${MY_P}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# After removing and recompiling the prebuilt lib the tests fail?
-# For some reason the test suite is executing a slightly different gdb command
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="dev-debug/gdb"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-3.0.3.ebuild b/dev-python/pydevd/pydevd-3.0.3.ebuild
deleted file mode 100644
index be32f4c1ae55..000000000000
--- a/dev-python/pydevd/pydevd-3.0.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 toolchain-funcs
-
-TAG="pydev_debugger_${PV//./_}"
-MY_P="PyDev.Debugger-${TAG}"
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="
-	https://github.com/fabioz/PyDev.Debugger/
-	https://pypi.org/project/pydevd/
-"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-debug/gdb
-"
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Disable tests incompatible with new package versions
-	sed -e '/TEST_\(DJANGO\|FLASK\)/s:True:False:' \
-		-i tests_python/debug_constants.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} \
-		-o "../attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	popd || die
-
-	distutils-r1_src_compile
-
-	# C extensions
-	rm -r _pydevd* || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		# NB: upstream seems to run tests via runfiles.py but that script
-		# is a horror and it seems broken for us anyway
-		tests_python/test_debugger.py::test_attach_to_pid_halted
-		tests_python/test_debugger.py::test_attach_to_pid_no_threads
-		'tests_python/test_debugger.py::test_path_translation[False]'
-		tests_python/test_debugger_json.py::test_attach_to_pid
-		tests_python/test_debugger_json.py::test_evaluate_exception_trace
-		tests_python/test_debugger_json.py::test_gui_event_loop_custom
-		tests_python/test_debugger_json.py::test_path_translation_and_source_reference
-		tests_python/test_utilities.py::test_tracing_basic
-		tests_python/test_utilities.py::test_tracing_other_threads
-		# incompatible with xdist
-		tests_python/test_utilities.py::test_is_main_thread
-	)
-
-	case ${EPYTHON} in
-		python3.10)
-			EPYTEST_DESELECT+=(
-				tests_python/test_debugger.py::test_frame_eval_limitations
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				tests_python/test_debugger.py::test_remote_debugger_threads
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# this is only used to compare against getpid() to detect that xdist
-	# is being used
-	local -x PYDEV_MAIN_PID=1
-	epytest -p rerunfailures --reruns=5
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-3.1.0.ebuild b/dev-python/pydevd/pydevd-3.1.0-r1.ebuild
index 6dc4edbc8458..4315a5bb2904 100644
--- a/dev-python/pydevd/pydevd-3.1.0.ebuild
+++ b/dev-python/pydevd/pydevd-3.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -45,9 +45,11 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	# Drop -O3 and -flto compiler args
+	# Make extension build failures fatal
 	sed -i \
 		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
 		-e '/extra_compile_args/d' \
+		-e '/except/a\    raise' \
 		setup.py || die
 
 	# Disable tests incompatible with new package versions
@@ -110,14 +112,16 @@ python_test() {
 	)
 
 	case ${EPYTHON} in
-		python3.10)
+		python3.11)
 			EPYTEST_DESELECT+=(
 				tests_python/test_debugger.py::test_frame_eval_limitations
+				tests_python/test_debugger.py::test_remote_debugger_threads
 			)
-			;&
-		python3.11)
+			;;
+		python3.12)
 			EPYTEST_DESELECT+=(
-				tests_python/test_debugger.py::test_remote_debugger_threads
+				# flaky
+				tests_python/test_debugger_json.py::test_step_next_step_in_multi_threads
 			)
 			;;
 	esac
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 073f0551d934..2e36ee8525f5 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,5 @@
 DIST pylint-3.1.1.gh.tar.gz 1433456 BLAKE2B f51e253228b9bb2bddd2edac76c11ae1e5c712e755665bf3f808da832af313626037aded39eeb75941b7462a87668ea2de307740bd6a736d3130aa10850b5c9f SHA512 66a30a45a1ac816a1e2ff16ea774fb5b5d646f89645c8f551ab4a65feea3076e6bc1b54ff1b71e5d8586f344c02b0e85c9b34d2c5b0afba115fd92cb7cb0a3f1
 DIST pylint-3.2.2.gh.tar.gz 1443983 BLAKE2B aeff52756e03278da1db7478d0c95ca0d5fa0c8a15203ada4b30fe5fb2fa56bfc2fc60e020bee9b2e242339214cf383838c93cbf1369a82655bedd62e3b2634f SHA512 84d625b0cd1ea0c308ff4381a9f553663af52fec534856a258ee50f00ec7238cf9af98d1e2c851522a8bd440c55e318d5c89035652d872cbd812d19ff14a0698
 EBUILD pylint-3.1.1.ebuild 2472 BLAKE2B 9f5c8b4d93685914149c1c338e5b251b7b3adeccd697bc33d59e62dd61d8b1a1ad915c3cb928ba8434e1929a367fb4ab8549e425ee87b9c7d3a81f2274ec18b8 SHA512 00331cb31e14eff59857321ed4e84e0e1376209759a8d79724cbc9e93969503b02a7d6a144f3301978f7ab7b4ce23b61d678830abd95224eeed34a830cc2a32d
-EBUILD pylint-3.2.2.ebuild 2480 BLAKE2B 0e475a0778874bee9c6ad5571a30c0ad702365a0bfe148b4dc07acb73f5e79a7aa074d0bb1339cdd57faec332ffb3ff15ad41e87989bca5ad7fcafde9413313a SHA512 3c83609e60c1b07d49c8e75be8e158636df695ce19345be7f282cfaadcb13557473c592b9e73e538b6af9294ae622f3fb59369a58b16dd0817ea225630f7be6d
+EBUILD pylint-3.2.2.ebuild 2472 BLAKE2B d777e357935bbb5100e5ca1a5d84b9292ecad6991414717cb5e8de348d2316d6a16c4d524bf10808cf0ba4a497970ef747367e473cfb82f71d060b10aebfc2b0 SHA512 e3a518d99d77b327cf785f1ab2bc8f6683bda2935c6c5e4493f624354fde276448c16b2baaedda93d509619f0d832db76ccb19360b8d413c3e0e1a359347a642
 MISC metadata.xml 1105 BLAKE2B aa9d049b732f9198685901a0ec31f4a615da8398ce1741558e7b2c3840890da0c5ac6a2a23e0fd4cd45fb443b92f69b3fe4fb7f9d7570b1a75a0d0784231f392 SHA512 5f5bb3e31554bdc0cdcdaf1d7df9194e32da649784124714783c5d280c7ab4a9f65317b5d5e6de47698b2f30a019051191cb7ef3066902b606e2582a31f01c05
diff --git a/dev-python/pylint/pylint-3.2.2.ebuild b/dev-python/pylint/pylint-3.2.2.ebuild
index 0a91ce1ceb1a..631d265238d7 100644
--- a/dev-python/pylint/pylint-3.2.2.ebuild
+++ b/dev-python/pylint/pylint-3.2.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pyproject-fmt-rust/Manifest b/dev-python/pyproject-fmt-rust/Manifest
index c636c1d99a36..86b411dd7133 100644
--- a/dev-python/pyproject-fmt-rust/Manifest
+++ b/dev-python/pyproject-fmt-rust/Manifest
@@ -113,5 +113,5 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
-EBUILD pyproject-fmt-rust-1.1.3.ebuild 3081 BLAKE2B ad423ae0b7b93fbfb43159f4cf6a1d07d183d2b643d363e93b54506db6a9378c4411037b58fd9e9b896b819853893520b8aed486f9479bacff7ea0bfe25ccd09 SHA512 ff56ef537ed8f07f8cea73a806f28959027b13b18294fa2878cff574e58494f0aaf7dd9ca6702b8ceee6bfc31b50cf2caa0ea9e17a4bb93200a3dfb896851090
+EBUILD pyproject-fmt-rust-1.1.3.ebuild 3077 BLAKE2B b0dacaf8cb2cbf12db38803343d2f5c31f06f9cfd4661519e112b51bcc15db87aa484001e9a7532048a8633f0104e69deea4613fc372928adffc384112c312d8 SHA512 c96983edb7a031b3972667abbe4dcdfb56e4ede7fd9b4e855df6c45381caa6b2011c8260b4dbd95eaa9cec9ed74e32c834d8d3b7ee226b33d1cd9d9335a1e40e
 MISC metadata.xml 366 BLAKE2B 89345e39c30912e60dc066b2e40292a496f5e862a3ec290718d86c82061700f70655de8f856aceeb646476665a459f79f3af928d15652adc156a66ac4e316cbc SHA512 4581ece4e387e0497963ff90f5b434edc7f7aa93e624e757bf67bce929d826949c6f1aadae68ad8999bce4f4fbfa3d6208a0d79b4b8c6940e7f36772c7dd89ed
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
index 165231b06fe2..ad22e64b4a32 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
@@ -143,7 +143,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 10a87ab0dbb8..9b138bd28cb6 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,5 +1,5 @@
 DIST pyproject_fmt-1.8.0.tar.gz 16696 BLAKE2B 1614fd6da4bb7be818825138b69b826b7141ae0fcada4414daa54b1c883ec3bbdbe95377155869d0c393b1b9646b69ebb009fe47f1c530b1f1c9f02c8ba8f57d SHA512 0731ffbe514cf8788bf1cfcca506591fefce3b98b1c6d014a8e17825ab6c73edc4ad8e7214cd8f6fc9124ed2ff362d03b328d47e96a6246165b4dd9fdd68299f
 DIST pyproject_fmt-2.1.3.tar.gz 9016 BLAKE2B 742d29283f883f36a6705b74613455932057c508bb98c61d245254fca5d35c31333d01e1047f3c3c4fe46c41ea0633d6a491f59c9633770dd5fb5ee9b696f5ed SHA512 3ba7bc939ed555a58c41bc35563fecba4066e95b0fc4d9c0ecf77ed484cbf2ebd8067fb097dabb499d95ddd7be64712961b70b9abb2f147cc6491c3c8ca85877
 EBUILD pyproject-fmt-1.8.0.ebuild 1007 BLAKE2B 3470217c0557123987dc7d17f36b1511f0c9b2f4378d479d701544a6bcf99ada48f5487483fecc1d91cd92b996d044d144f7c00c91e1ddba337ebc38129d0421 SHA512 b2ef4f25f584556d650c2814aefa4294e9a5d8429112cb11d94710d31d1e1c0da81a203612d70509dbf22c8a535e95eb9c8102ef8931ae7d90b257802eadea07
-EBUILD pyproject-fmt-2.1.3.ebuild 825 BLAKE2B 3ff4d3015a2adbffcd3abc157331ee68ae645cf9e8777a9172f441f2c171b077d4e716cdfb1332b6c00d0f47f7d6952a7cc66430543163389b0d4d835d72b04f SHA512 85ade0e93855d0d34fe01936952fb9c2692ed27ae3de6a77f8fb2688b8e5fb71b85f0474859e744fe4ef1d408ad8a172b5197517c32da9b9735b3376b3eff879
+EBUILD pyproject-fmt-2.1.3.ebuild 821 BLAKE2B 890251ff525fbbada754fa41e7c468fe630efcc164176dd4dbabb0d4322d730c261f9382d5d9d3021e88c894565f034448741f861a2653e9b80b58a66d71a101 SHA512 45488a59b38a96160a29ae9f2dd7d8ef83aab82c2b018a5b9c0671131be24c7170d07d4db1d703e449a643d8bd64cd733777421372b140cad2a0520df594a070
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild
index 812e5d4f19f2..48f7e117200d 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	~dev-python/pyproject-fmt-rust-1.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index cfa205f0e81a..fbae3dd0e9e5 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-asyncio-0.23.6.tar.gz 46203 BLAKE2B 37dd3cafa2c77b0dd04a6f406e9e83705b31a98eb058fef02ad6d917cb291874dac0388a129bce5d80954fe8dd0a28fbe9e2b94dabc2ff59a1a055154b908cce SHA512 24ec7fef2f1db744c743c4da651106320d02e8a83af0a238f6335ef669751e541b7fa787fd007fd7208f1837c1cb684acdecd66ee5e022501a7aad97649fdfbe
 DIST pytest_asyncio-0.23.7.tar.gz 46296 BLAKE2B afcdba0928f07e91ed68f54de2c1241fec784f164e3d5edb09908b913536edadbba7c90a73a8c843715da4567b18cc27929f31c6d0c2be3940e6ecc23abcc43c SHA512 d7164b060c1d0aa7999537e5681d2153662d49ec94e056da93b4cb2ba3dd0e3e5e4a68691c15b920c8e0ced03a4256620da600a33bcfa76b1adfa7ee66cd8de0
-EBUILD pytest-asyncio-0.23.6.ebuild 1605 BLAKE2B 9851e8bc5341efda6a939bef60afb5417694f5789cbf052acf56720ca7b82c90884df10a24c85ae2a3c95d3fd9d7105e099871d440943a4f85a0208ab8d1f87e SHA512 fb51dbef93c4d3c236679ef66a549488b06b2a3470a08208e1eed15ca29e38c21443e77d519724e403f0f9c4953a3927172a7b2b2e7d0c079e148f302e2ea6d7
-EBUILD pytest-asyncio-0.23.7.ebuild 1593 BLAKE2B d6f54d0b041123f4f5f2b52e92bbeaa2f21ddb28955fc748cfe8fcb6d2be0c796b0e08ee4c4089ba81f0fae1a1635c8987b27980095786ead69728f955246cc7 SHA512 b3379d24765c15f24796056c7a8d121fcca3012356472a8ffb878dd42f9f79f339599b4f9e2264ee3614693e079b82b2ecab5e48078948de633e37beb18cea80
+EBUILD pytest-asyncio-0.23.7.ebuild 1585 BLAKE2B 1e2e0920696b7c6f42b5512c066c031c9b414b07d38f8f3f8cc8ae968c1fb6c6b75a55a985397e76c0562bbc2d8e7f13fb7d3777d48f19851731d618a5c0c26c SHA512 d2ef6709cf1d74350e0368ff320b1c6a31e7815b08c81cb2b8239d67115c70c9bea6c1082ec6c20107909cfdab0874a125d9add94e08f23079af2f669c9ea55e
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.6.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.6.ebuild
deleted file mode 100644
index d66fd182e5ed..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
-		tests/modes/test_legacy_mode.py
-		tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_fixture
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-		tests/test_pytest_min_version_warning.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-
-		# TODO
-		tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.7.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.7.ebuild
index ccbee1a2f1c6..40f237ee5133 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.7.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.23.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index de644ca88b6c..005743d68aab 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-bdd-7.1.2.gh.tar.gz 81260 BLAKE2B 5120a79a5c085976f379afbd4ae7bc68c0d07a8517b6653bb2c94407b9964cd3adcfc92e8abc31cb658caa5c108e0590913c13cbcc408021841b91dbf52b8124 SHA512 7630b119649502e36d7ae2b6027c11b667513eab451511104076617e50de1456ee4b2ff128254ac0db630556258704e21e2a5e73ce9afc20ed403d0186c0a226
+DIST pytest-bdd-7.2.0.gh.tar.gz 81301 BLAKE2B e47ec5873546596e913453f86d7c0654b8212de74b0bfa46022da093fa87191c9303559ec670bd37f94e282973192596c77a1f7293a608ae8dedbd863fc245c2 SHA512 d0991feb446f264f0f114693dccb67682a10a427cb5fda28dccafd67cc37810e00c34e3235bb38d02b7fa1edabf1359c6c119be9cfdce0ccf00235ca3dde337b
 EBUILD pytest-bdd-7.1.2.ebuild 1044 BLAKE2B 7e42bcf89034914fe6841bcf39d6e687e4d9d6ee160f43b04f66f191eaedd6f707eed65f3de97df6f4bb3367b7acb5ef3c2b173c8b525e8c97ec8b3d0ceb6d55 SHA512 48e68f5be29dffeecfcdc3a2a667b6bdda43fe67d4a9e08e2f8e492fe8c2dd73a221665013b361b57014bf52e8fb5b96c85cdea569bfc40316bf8dd40775c473
+EBUILD pytest-bdd-7.2.0.ebuild 1046 BLAKE2B f0266b1cb2a910cf19d1f073e3b68152a940d4dbecccfef802796a16d064b0094531e8c5af74834032603845b86b4d7d54bcc8069b24f2ac55a6035de3ebcc91 SHA512 06f5de0a6f741d143447c6e163a97459cab90487f245d7da163fcc0b50ce55931f41efcdc676b54f65b07375f0c2262129dd29c2d5ba84827ff1d33aeb3f7155
 MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
new file mode 100644
index 000000000000..4d8f0c35dffb
--- /dev/null
+++ b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="BDD library for the pytest runner"
+HOMEPAGE="https://pytest-bdd.readthedocs.io/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/parse_type[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst )
+
+src_test() {
+	# terminal_reporter test needs exact wrapping
+	local -x COLUMNS=80
+
+	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_bdd.plugin
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
index f820a53c4cfd..e1a21219cbd8 100644
--- a/dev-python/pytest-localftpserver/Manifest
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -1,7 +1,3 @@
-DIST pytest_localftpserver-1.2.0.tar.gz 48817 BLAKE2B ccccd0b2cdc2596fa12c8f082fd2fa3847541b731367abfccb7a57d3408d74c1637bfc644bb80482d9a1a25072d94b1f663b8ad8c0ad51c2d9dac65156a80638 SHA512 19e300c4ebb1d89ebfa4dce04296b8962014a139f82a409f6d46f748f653cfd1f4192a7fb65987015b2bf7237682507c4d6e42dab816c275ba7f8a302eb9a3e9
-DIST pytest_localftpserver-1.3.1.tar.gz 48894 BLAKE2B a90003e61eeeefaa0d0fab7e7e44d2c87c02fe976bbe75b9596c9a79c969636370f776b41a3cbe45ed949cffef40b176510dad8aefa7be115ca7f1c704634b2c SHA512 605ef5b96c046f9b949d62800bb37a74b4807718a1591ff9374526b0c990280ed32470c79943097afe101e2c8d7691c49510a0cb0a7170f470f3cef226879824
 DIST pytest_localftpserver-1.3.2.tar.gz 48883 BLAKE2B a1e78d632a24f1066e8e96dc54875379e471446d77755b5defd0a0b4a2f00e2f3812d82f7be364f3a414432ae023a9c949132d530d3a2f476dec2c0fe8285408 SHA512 d7be031abd616df9e146ab08f2fe406c1dd55b68e97271e945c20938c01deff53b48cbf5c6b46c90c2cb5388f377e078e5e701ddcc2fa4900d29df9f82c92c4e
-EBUILD pytest-localftpserver-1.2.0.ebuild 887 BLAKE2B e9ce11ed4a27ecea98869f1b295a32cd87255bc8bae00564a4e76ebcd56e07b4129848edc7c0839cc75f6c53db28c8a9cc71cb0db5c815651ede0f3cade85690 SHA512 93b0642a6715e2cb1e571f276b940e2ca7d91d86f67d27f95281d578ecfbce14e3c0fb7b44cfda2145634569d330afbedf6c2222e1cfc66f3a1232269c3e1290
-EBUILD pytest-localftpserver-1.3.1-r1.ebuild 1028 BLAKE2B eedb654cccf06f930aff04ff414de1136dead536a8f8417ec5a06ae902eb559f4c44458ad30b64ed293677a332ebc29143c9390f95131c3d68ea5945be9d831c SHA512 bed37b1f39e8f6553476129a116cfea4cc28916c60ce3013221ce330d7b1493781530a869db81d92105d32211205e761032f6bbeeb65a9103469c108f47a13cf
-EBUILD pytest-localftpserver-1.3.2.ebuild 851 BLAKE2B 2ee7e2349094316be11254f7d294d1512a1ab37bec0275cea3e4dd8bd6319a8996dae0bef9a000b97acf1a116a5a6bad907df4ad6b7f1c2b3cdf3591c49714a5 SHA512 5a942f3cc6010f858b08bc8af2abc9bc61162647c0840a53ad3ae5b8fcf13ab9e492f5579f5256c17f30f52c439ada65380a82dab6abb24273846c829082e581
+EBUILD pytest-localftpserver-1.3.2.ebuild 845 BLAKE2B c559e98d7134df3adb8589597bdd23c80c8c6972d6b04a60e4227424a0b7f9ac9f34b97dedc3e5c79b60ab180e4ce616a8c747944ba23055c4b85643486e5a8b SHA512 604f77fd6e92e5911f0c9255e9cd560b371400570650a882d6b755490d324f6cd936b245ff71a619821ae5a1941c93217c6028ebdf32b6edd64aaf432fa6f1c1
 MISC metadata.xml 569 BLAKE2B 5a2afdbd9c95515e83ac146f95c1c1da36e556402c625151fb52bf067e58d4178111e8fb0457113cc292b0f480ccb9b1d4026f9bcb212db57711b4c08e3db658 SHA512 cdcf50653ca1020b258d9c38e524d6a27c9e287cdb286f36d568dd2fc1b07dad241df07d0fcc2466d341d11d3d0ade5ddb033b026eba744500cc2931da44064d
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild
deleted file mode 100644
index 05f2de81ec1c..000000000000
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
-HOMEPAGE="
-	https://github.com/oz123/pytest-localftpserver/
-	https://pypi.org/project/pytest-localftpserver/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/pyftpdlib[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-EPYTEST_IGNORE=(
-	# These tests require python wget module
-	tests/test_pytest_localftpserver.py
-	tests/test_pytest_localftpserver_TLS.py
-	tests/test_pytest_localftpserver_with_env_var.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.1-r1.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.1-r1.ebuild
deleted file mode 100644
index f9822d4d7120..000000000000
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
-HOMEPAGE="
-	https://github.com/oz123/pytest-localftpserver/
-	https://pypi.org/project/pytest-localftpserver/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pyftpdlib[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-EPYTEST_IGNORE=(
-	# These tests require python wget module
-	tests/test_pytest_localftpserver.py
-	tests/test_pytest_localftpserver_TLS.py
-	tests/test_pytest_localftpserver_with_env_var.py
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# a test dependency wrongly declared as RDEP
-	sed -i -e '/wget/d' pyproject.toml || die
-}
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.2.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.2.ebuild
index 8b13b3a6ac9d..d8cc74a211d0 100644
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.2.ebuild
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.3.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pyftpdlib[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-twisted/Manifest b/dev-python/pytest-twisted/Manifest
index 62418ff0a8af..c35aacbc5357 100644
--- a/dev-python/pytest-twisted/Manifest
+++ b/dev-python/pytest-twisted/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-twisted-1.14.1.gh.tar.gz 17114 BLAKE2B 36b851b734acc03919dc03842d942d205468375d9318d4ce4f880532fca29d31354125fd2ab8149a50bcf29e46ec812898b7167e34c0fa1276dcd5c2aa36ccd1 SHA512 d5b6d629ed3cf7ae1537e76494fa7eb4bbb9767cbc50d97a5657c668b381f39236acc6224b3754d62e2cccd4dff7e6161265ddc6a939f0488cef53eeade0eae9
-EBUILD pytest-twisted-1.14.1.ebuild 1299 BLAKE2B 047d0c33600961504e0899b9ff50e405d252f2f598c5aade1b97522b3aa96e7ca57d26b135bf8314844b62ebf7c9bb76682df90b4896a77fb552afc063cc28da SHA512 70861274dcc3f382d0a1f1fc925397058eb1942f142cb83188ceea6ca0ea03c71cbe6d7a6629483d17a57eefff09c2a7c456cefb5fc26afb215d93ff7176b376
+EBUILD pytest-twisted-1.14.1.ebuild 1294 BLAKE2B 17591b68a9ce12b2398a7ca4592b8b95d22a9f4475f67a1367fd2ddcf46f856868edecfa890b9688e76675715bb09bedd009f9b7ea63d6bf0a3904afbae91fb1 SHA512 af2322832ababc1f1ea28e545eb4f64d4f523e9ae400008cfdc1cf8a86ffb7d441727bfcc394604fc2b73b834a025a1b23482638bccfccae9f2737c3f752f044
 MISC metadata.xml 510 BLAKE2B b0a57f26f53646876843a2d19d2eae54f4ba393afddc58dff646e5aa0a755c0920223d572fd4fcf5d6540c1512e52f798045424d09713aae15e4d4310cc3d10b SHA512 0faeb8637414016721807155ce0546912cc6b9507ad21936491397efa55108e60c5973753941b11d61070f35540113470e533f4e233a1925183d3ae77d2d4949
diff --git a/dev-python/pytest-twisted/pytest-twisted-1.14.1.ebuild b/dev-python/pytest-twisted/pytest-twisted-1.14.1.ebuild
index 13cc254026d2..d9db61f8173e 100644
--- a/dev-python/pytest-twisted/pytest-twisted-1.14.1.ebuild
+++ b/dev-python/pytest-twisted/pytest-twisted-1.14.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 55ad0bbe6c32..e89f1bb16427 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,7 +1,5 @@
 DIST pytest-xprocess-0.23.0.tar.gz 31350 BLAKE2B 71492aa1bbc438221c6ac2825bf2bd678a75c12e8b5a8654d333c1ba2ad5c66b21f85e572998f0e5f1835097483a4895942d664ef7d8f078cad7923a9ee2e962 SHA512 97aa2a8ba0bcca62d53c0a0523696f6ae5fec5eae29e3e2cfe1a3ec8f14622c2c31f0802b2e65b55aa16778dd6ea82951e15af768c9d84cfd13aa2d427f94c9e
-DIST pytest-xprocess-1.0.1.tar.gz 38665 BLAKE2B ddda66a3aed155f857d6f55c38ddb687e46cd5e0e8eefa0183fc853e884d6167d836f67045cf3aa8be7558fd8b56b98110bfd6b0e1a562f95428da124685d77f SHA512 4bf4545149e7cf99b51f0ba710b04d673664e5c93083d6848dbe5d0ecb7d948bb6180d0de5980a2d576381ed9f7a10085f57469f6ece93585fc451ac02441920
 DIST pytest-xprocess-1.0.2.tar.gz 13232 BLAKE2B c58128aba5437ddbb4e7b6870bd7ba67c2630a1571db19bc7033e7e078cecba7f77b2f2b86c12afa3e2a1780a2591db255ff63d4f2cffdea1bf880c5715e90ea SHA512 e1d797dcc6aa47f16fbbf488b395e048df7d603cf0b3a25b66546be2f33bc6ba97db3cf33964a821cc88e990386942225bec5f5606103d3615324efe716291df
 EBUILD pytest-xprocess-0.23.0.ebuild 658 BLAKE2B ebe2633c4a6631441658ce417ffafe5c2578da654e611e3b1c21198d8a80aadb5568af7d858bff8db4568267ceb99c794f5367d764382478df7f9bcf26a8a339 SHA512 7f7a578e89e29cd51eb21e9db7f8fbc6d774712a19a6871fb10ec324d403cbb4379c74e8fbce84fcce640f73affa55451dbadbdaa4f8f3f88ee62370a772bdd3
-EBUILD pytest-xprocess-1.0.1.ebuild 658 BLAKE2B 340ae5d311ff2f049ad4fdc283bb20cd9e78cd40f87054b23f8988cbf0f8ea73328e94c844eacf4fdaed15518346f39e74d24368513b3f1e8094113774b7f80b SHA512 83f46e9b1defd4d30cfde28d9d1cde9d1168a38d172888428f41451c48f5c78c9b43a5e041d89156185a7bd1a4b5b7db245bfb856857b9a93559bde4ebae6304
-EBUILD pytest-xprocess-1.0.2.ebuild 666 BLAKE2B 31cb86115b4161b9806e9c5e6b68307ec7c39ecafb5484986db6323e7da6963c01a1c16bb0ed3302b1d93b38ad39b1a28a7ee3ac88448024eca60c80e19b8215 SHA512 1b3a64d08bf43b0007e1ca63893ef8e5124ca7f7aa545fd8d5ea50b7868e194ee52989b5fb4991565f59b70f42b885e9f9bffe825ae3f40444823cf96d7cbc46
+EBUILD pytest-xprocess-1.0.2.ebuild 658 BLAKE2B 340ae5d311ff2f049ad4fdc283bb20cd9e78cd40f87054b23f8988cbf0f8ea73328e94c844eacf4fdaed15518346f39e74d24368513b3f1e8094113774b7f80b SHA512 83f46e9b1defd4d30cfde28d9d1cde9d1168a38d172888428f41451c48f5c78c9b43a5e041d89156185a7bd1a4b5b7db245bfb856857b9a93559bde4ebae6304
 MISC metadata.xml 422 BLAKE2B fb18d498d2325613b4ddb9262d90108aca85cc28c4dc298359adc0cb589565df894b5c48bfdc7a7f83cf30421f324fa1af93333ae20fc793910993e0a93db90b SHA512 19e96fb0695284d9adfd71eccee8f3ab0661d5e0231f3f55db0456a3dfe797fb683985cb776e45a183a710462e990f539f75a764dca68d0c2e631abf68d8344e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-1.0.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-1.0.1.ebuild
deleted file mode 100644
index 5e9eab62aab3..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xprocess/
-	https://github.com/pytest-dev/pytest-xprocess/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild
index f86a1d7607d9..5e9eab62aab3 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-1.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 9f041fb4aaab..9ad76f4684d3 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -5,10 +5,12 @@ DIST pytest-8.0.2.tar.gz 1396924 BLAKE2B ad95d246f5592cfe54faea6c96e38cb60d3e271
 DIST pytest-8.1.2.tar.gz 1410060 BLAKE2B 1379047c5ba434e98a383756c53a9cf31dc3bd3abcc49820f872b9110ec70906ca14080ce17ed2770b71195fbd79627a0eb16ee00429e165368144b20153a02b SHA512 a6ffae29da98ee4c357ebb03f00c4bc1a33f093ef867ad118841695548468c7f229eaa2c029a2ce3b158bbb0a65be5014e91555a223d04c1c72e614cb1d00546
 DIST pytest-8.2.0.tar.gz 1422883 BLAKE2B 91f39aa14bfc56f7f98789ef9eeed80d1aa81c864f56181bf1e819b73543043eda307fec53151bf5dbcf8e63abd8dd8ad1290dd245c387cb68583d2160981cf2 SHA512 1a74a2269010804101fc4b8efc370c5d8d484eb145eb4e181feeb1a17046457b97071d2de925c3e8bbd4c6090cd00ca532d69286cb9e10ea023e59a99cd51088
 DIST pytest-8.2.1.tar.gz 1424649 BLAKE2B 56c63526b7bb2c7eb6b260197bb1b52945b92598a9697bc99c053540caf4fcc7432cf70cfa1455da668b38ddf81a7abbac1b91a5e58688640519a16e4155ad6d SHA512 c837b2031c2b198345ce090cc5fcbebd2640a521131a60b882250b70825dc85e5072403a80e9a73f62e429156b57dce405d8400255457c55b14d4a2f700c5331
+DIST pytest-8.2.2.tar.gz 1427980 BLAKE2B 7f343e5ff05e4d26f816595ad1c52ee2b79d38029e75e3641ed0bbb7477e0a47e5ae48ebc3058a8e9f374cd1a391d360d9eda73eca2e41d8b533eda7948aedcb SHA512 896192f0d41f3fef49915dfea6ae33dbb939f6bbe54de27861bf1554bf87f910702169293e923af9bc40466e7f806aa19ca54cbe41a848c233f70b52bb86a63c
 EBUILD pytest-7.4.4.ebuild 3796 BLAKE2B 1bee0d6df20d013802a7de4abc2937af9e3bfe99215d07a9ba888538f8526b6a14f1e4c41554f9a847d47867bb3dea34d8678e9a61a1e6b8fded8f336e21d4da SHA512 74823f180543e26b51739781b369db414ecbd0784d9cd8883ddc053831922001ec120247d7adac275830e5fe836972f7b6dd7c05c018f0ff122c4248b6c1fa3e
 EBUILD pytest-8.0.2.ebuild 3768 BLAKE2B 504e70b6671111e8d2f7ee0505d56c9dd3da36addfcb27093155c4d83708a36934acddb40d62c770e8fdfe53a59a58181d4ab706d9560bb70217787340c6b99e SHA512 8ec6ec4f723f00eef59966a3c4f5cc57b9eae51f5cb50aa20416741199d6c3dbf7b8f361d17d5bccdc983ff822d0b7432a1993e19eeda066a9fdb0e25d4b03ae
 EBUILD pytest-8.1.2.ebuild 3749 BLAKE2B 27968ad5f5ead2630694233c690e5df7ef8866a3a6a50a009bda1d3923cf6a10f1372fa24fa9bdc0760bfa7abe1512a9fbd6fb85fd62e0782a9b575d54a58761 SHA512 cacd0f1909ee1cf40d444c628d76921722c4d28ba3a864ccb19909e763a7e66ce8b77cc682fe8333fa97944d8ca9be1c06a94ae7fb1123a0f2c3ed0fc1dd5826
 EBUILD pytest-8.2.0-r1.ebuild 3809 BLAKE2B 8805f0d37486096f6cac4cbf0abfd14e1ba3b1e2fca3e95e2bfa12e6e58281d0551e57fe2b3c87f8b88a0575d0bf317aeb965cb18777bd3ba8e542cb50388682 SHA512 998ed3377518bc5fa38ae553a3c018c6bbf9778df0b6af6506ccef0571a4a551b1d448637ca89e2b95aef31b5a12a4883e653cc1c045e8f43791c1570b4e8456
 EBUILD pytest-8.2.0.ebuild 5038 BLAKE2B 0913b435e5664b207a8f39ba797ebe26c8fe485ba57bae694126898ca4511e142268a65c490ae080bcbe0074a320df7f6e3e759c2f20ca15469b576d2b60c975 SHA512 30c920b2754bdbc99316a73aed5fcc80e6101140c36ccaa148683ae34d9056d39d3408178ef590ce044c20c9b498657f3ae43fa7461c7fbb3ed6a00158ee4d54
 EBUILD pytest-8.2.1.ebuild 3713 BLAKE2B 4ee4d1bd29667578c688f0a73f0deced876fff31bd0ee2e3f401c499f9c1c6c764b05312d6c0c3795296e33d1a2005cda673363beff4650e428b06d5af230cf0 SHA512 e5ad570d2b58d82bf1562a2f2e034186b8b980f4081d18565ec6d87b1d1ff485468f176a7a38ac8e046d72aadff1ba9b2c04554abc18775db913102b52c1aaa7
+EBUILD pytest-8.2.2.ebuild 3713 BLAKE2B 4ee4d1bd29667578c688f0a73f0deced876fff31bd0ee2e3f401c499f9c1c6c764b05312d6c0c3795296e33d1a2005cda673363beff4650e428b06d5af230cf0 SHA512 e5ad570d2b58d82bf1562a2f2e034186b8b980f4081d18565ec6d87b1d1ff485468f176a7a38ac8e046d72aadff1ba9b2c04554abc18775db913102b52c1aaa7
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/pytest-8.2.2.ebuild b/dev-python/pytest/pytest-8.2.2.ebuild
new file mode 100644
index 000000000000..a6ff2735eb2d
--- /dev/null
+++ b/dev-python/pytest/pytest-8.2.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="
+	https://pytest.org/
+	https://github.com/pytest-dev/pytest/
+	https://pypi.org/project/pytest/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-2[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1[${PYTHON_USEDEP}]
+	' 3.10)
+	!!<=dev-python/flaky-3.7.0-r5
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/xmlschema[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
+
+	local EPYTEST_DESELECT=(
+		# broken by epytest args
+		testing/test_warnings.py::test_works_with_filterwarnings
+
+		# tend to be broken by random pytest plugins
+		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
+		testing/test_helpconfig.py::test_version_less_verbose
+		testing/test_helpconfig.py::test_version_verbose
+		testing/test_junitxml.py::test_random_report_log_xdist
+		testing/test_junitxml.py::test_runs_twice_xdist
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
+		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
+		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
+		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
+
+		# unstable with xdist
+		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
+
+		# TODO (XPASS)
+		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
+		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
+		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
+
+		# setuptools warnings
+		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
+
+		# PDB tests seem quite flaky (they time out often)
+		testing/test_debugging.py::TestPDB
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# regressions on pypy3.9
+				# https://github.com/pytest-dev/pytest/issues/9787
+				testing/test_skipping.py::test_errors_in_xfail_skip_expressions
+				testing/test_unraisableexception.py
+			)
+			;;
+	esac
+
+	local EPYTEST_XDIST=1
+	epytest
+}
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 6320ebd0e423..719989e90526 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,6 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 2953 BLAKE2B 84794d759a96cdd2d56f9b254a4564ab1d2a6e0453c8d3130ae2f461db487875d5bc6f6989b2423f36b6cae38e578cf3afc5d1f1576534e33abdcf846c0de6f2 SHA512 903caa29a67b9332cee721882e28da7cb3f565ad97d0c75b6a1b14e8e62156a6afea370843cd2bf700d4703a1fed94a3eaa932a0ee493681190897ab80dbae6f
-DIST python-xmp-toolkit-2.0.1.gh.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
 DIST python-xmp-toolkit-2.0.2.gh.tar.gz 3577828 BLAKE2B bc24224c5dc789b0f66545a85b10bcab2dd64dcd5195ef04eae6cac94e1c377466aa40adc4aa42d014a7094df4dbe6f437b78e38b5a0e36e0f2eeeb0a08f1f4b SHA512 7ab70e78abe3f315863c444c5d841ff4ae9e95968ccef45e15d20df5206140939f0e857e6c987a643ba908aa8d92dc4870e77d94cfafc547208e4705fa9187e1
-EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 794 BLAKE2B 1c830dfcc5d45e1940ddf4b8138f5369a18b711f45e0b8787022423b508a3dc199886e6f800fe673644a4747da9f4c8353ecf9c2a4f1a5d93de1e0933175fa8c SHA512 09e0d93a378bd2ee46a1b2f22ba5c791864a241127aca688dd84d30434a1c35cd5d54718fe14ce3a576568e5de869365b5b13ad93002743b18c767a126d35b80
-EBUILD python-xmp-toolkit-2.0.2.ebuild 802 BLAKE2B b3a598002d17e9c954d6a6560abe8663779835732eb2844875999d334d58d9855b8c406e7f67be5ecbbba2a73ac092ca9be42dde55802d34416b1abbae32e2e6 SHA512 28c8796b435720693f2c2f7f2de88033fbbcefd47adbf2ac2ef0528706fae91da25f953e94e16bc67a2a569447a036c57e2ff0b030db4ed3b333f6b4e391a1c4
+EBUILD python-xmp-toolkit-2.0.2-r1.ebuild 759 BLAKE2B efc7a0b029a07fbf022e7fbc35d88a9ae63b709e6414489cc0da65d8a59e58de8e4aeac9f406688b0b1aac6c846bcf09fc1990a35fd1d0c1f75d34f2ffd54e22 SHA512 5e7e5d2e7e0826a18a2b9fc7e245b52a544e181238a19a45f2661e3c3e23915b4e65e229da8bfb1756b95326db3ae4799fef171d1703b2e40b7d540b98ea04d1
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
deleted file mode 100644
index f7dd1001fd8a..000000000000
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for working with XMP metadata"
-HOMEPAGE="
-	https://github.com/python-xmp-toolkit/python-xmp-toolkit/
-	https://pypi.org/project/python-xmp-toolkit/
-"
-SRC_URI="
-	https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	test? ( media-libs/exempi )
-"
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2-r1.ebuild
index 4e6a1e186b3a..4998ab1195fe 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.2-r1.ebuild
@@ -20,13 +20,11 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 
-DEPEND="
-	test? ( media-libs/exempi )
-"
 RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
+	media-libs/exempi
 "
 
 PATCHES=(
diff --git a/dev-python/quart/Manifest b/dev-python/quart/Manifest
index 285b48e86c07..65b5a7d76f7f 100644
--- a/dev-python/quart/Manifest
+++ b/dev-python/quart/Manifest
@@ -1,5 +1,3 @@
-DIST quart-0.19.5.gh.tar.gz 494282 BLAKE2B d908638a00d67798dc71bb84ab51b2b35ee55c1b16ba88781642a1b64b70e0206e33c4e61cb397451969d0edde593ac2639ce8000838750e312b1ef47b8b154a SHA512 a764f50b19c84f7b4cf368488a703c726b2e98785cc7e0c15de0c3293f764658bb6e1489be53bb03ca135ccd847383424fdba8706383a45f406c39fdceb26d71
 DIST quart-0.19.6.gh.tar.gz 747457 BLAKE2B 2912e8e951ad94e8f86e553ee8fac2d3ea679f71be54ff6638aa36d3d3027b48de47994a2f264b3cee69b483ffe4e153c7ea0080b8f6904a2ebaddce2fbede96 SHA512 2a28a36638052c26265122771936dbe8a12332c8abe177a9addafc71b4a0987c864c26f73160492d6e849a5b0a576346ac24c961c5e461afd11981c45aecbcd7
-EBUILD quart-0.19.5.ebuild 1267 BLAKE2B 34eb6e24291cde9977f1bf8b4acaa6b485f29365141e7051222060b4498f2e95d88d042cb45d48c6365be623f1a691d5f012e5fe44b1b6dbf0614f1a5d556e60 SHA512 bfd67f88462cf2deff687a4609d86be7d4f4bf843b896f1b0279afee3654a606a66412656a469f8c8036367be87fd99715dd29f08578040e894db396a471b03c
-EBUILD quart-0.19.6.ebuild 1274 BLAKE2B 6a17c8d8269da51c54221c8a2fd967b003e858ed7afc3ab7b87df6372ffe98e01ad4c5543edd00ba4e4a98710fa3293b05296274ecdac847637b2f345e240940 SHA512 2c3c28beb940069195e33e9898cad6a4152b518fdcfb48b5f485d545d19d42e668e6e0dae23e5c70070d7aebe26bedac305b0d3b1e5ad5895140ab06fa6346e7
+EBUILD quart-0.19.6.ebuild 1267 BLAKE2B 34eb6e24291cde9977f1bf8b4acaa6b485f29365141e7051222060b4498f2e95d88d042cb45d48c6365be623f1a691d5f012e5fe44b1b6dbf0614f1a5d556e60 SHA512 bfd67f88462cf2deff687a4609d86be7d4f4bf843b896f1b0279afee3654a606a66412656a469f8c8036367be87fd99715dd29f08578040e894db396a471b03c
 MISC metadata.xml 364 BLAKE2B 207d3328ae2624ec61834adc055ca2b01ee1a587c2b6ef8cfde8c72d7370f4bb912dbc5fefdb5432959dcf273b9ebabc394dfd163dab7be00413daa85a0b6162 SHA512 8fc752b94e06ea29021c7e73c67a488f17fbbd6b8dab79c58f8647989e9c613071b539e626bf122e6693b8b670cc57bea115581801d57d3212c037d0f91df7d2
diff --git a/dev-python/quart/quart-0.19.5.ebuild b/dev-python/quart/quart-0.19.5.ebuild
deleted file mode 100644
index 5e909045481e..000000000000
--- a/dev-python/quart/quart-0.19.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python ASGI web microframework with the same API as Flask"
-HOMEPAGE="
-	https://github.com/pallets/quart/
-	https://pypi.org/project/Quart/
-"
-# no tests in sdist as of 0.19.4
-SRC_URI="
-	https://github.com/pallets/quart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/aiofiles[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.6[${PYTHON_USEDEP}]
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hypercorn-0.11.2[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/quart/quart-0.19.6.ebuild b/dev-python/quart/quart-0.19.6.ebuild
index ce5f5a18a398..5e909045481e 100644
--- a/dev-python/quart/quart-0.19.6.ebuild
+++ b/dev-python/quart/quart-0.19.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/aiofiles[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index bfc8438b9fe8..0850975c8458 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,5 +1,3 @@
-DIST requests-file-2.0.0.tar.gz 6863 BLAKE2B 845c8b468131f5958c2e648553aaba5e2a9da9942b333dcf3eb9c70dad3941945f0d63d65747c6ec1bb9f2c3e7ce9665738665bf76a691b85048d998888ff9ef SHA512 d37a35d50a2d5f688e431c15c55bfd789c23e50445d94abedfbe75c9ccd825142850dc2ea7e9426c3fa1ca8e4aaaf0a230f5f6921d3c42d157ac95d7e7352b70
 DIST requests_file-2.1.0.tar.gz 6891 BLAKE2B 69d92d836f184b48420ed3a0cdc44905ac0c495e3cbc574a62c1c3b4088770654925a97775fedfdcec25e247ef4d06df82a52f2303d5b29f875f77d8f13c3952 SHA512 1c13ca665797987ad2908ebe0cdff97f03cbbbb110c6fe782a03edb6035575ee8eb89683e197336d6ed8d5868873d88eccac642d45996e88368af234a9318611
-EBUILD requests-file-2.0.0.ebuild 579 BLAKE2B 6e8b0b74de2cd399f775e6f30fc91b63115643d6bcc74c3e9f61dfb6cb84f52c4677458ac3a5ec2e3b34607da5d3bba840e178240841f0cd47ca19bbf0dc2df7 SHA512 9beaa4d42b5393638f9da63d3fefb9fd7fd76d51767b228e2bb528e1a4099b467b3ee0d6b389e6c57f4f8027f04e459bf902979db4505b79c43831bcaf27b17f
-EBUILD requests-file-2.1.0.ebuild 562 BLAKE2B 6ea04f98471935c13157fccb224ecf5a1eafe9931c9d1dcce341d5bdca7b7740e7538f0f48d32f4a2d1453de0ca1d77b16f3b55cf4e30c1eba2d0f8dd3a917c9 SHA512 cd8cd20c1a9744280a2df49db8e5538786510331d9ac45987815f8464c1167cfe61767502fba0afca2de9444a7a80b8602279c586a908dc3e176439e1addd7c4
+EBUILD requests-file-2.1.0.ebuild 559 BLAKE2B 086eb8e2bad532feae9e3cc805e87c0ffef78869845fef980432fb5a65ab96a1c71be1a6bc20bed41a1284b97600d4961bbbd55de4aea0981f925f1a248d020a SHA512 58cb4cffffa8ed8c9cc311526c8c2fd03d7b8efe79f04e3e006631a57595bdecd59bc2b3b981e15d9cd2b2ec9a2c1b390027058e54216b4a4822107c04ccb57b
 MISC metadata.xml 476 BLAKE2B eb2da8f47418e2152568b9888b3fae9a87350ab45f310b6d21179b4a707b7d112bb175dabeffb6eddd0835d9d82eb8c3514d5512ef6d375ad1454017f6b4b5f5 SHA512 23dca887bbd51d5fdda6270693faea3d598f1d376800511293927500e221c3fbc9233e96b1880e9ce1f8bff9b0b2f9f6ff78a35376ed0d2ddd81f2636cc50542
diff --git a/dev-python/requests-file/requests-file-2.0.0.ebuild b/dev-python/requests-file/requests-file-2.0.0.ebuild
deleted file mode 100644
index 2294e62c29bb..000000000000
--- a/dev-python/requests-file/requests-file-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="File transport adapter for Requests"
-HOMEPAGE="
-	https://github.com/dashea/requests-file/
-	https://pypi.org/project/requests-file/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong x86"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/requests-file/requests-file-2.1.0.ebuild b/dev-python/requests-file/requests-file-2.1.0.ebuild
index 80d1f3424abc..ae887f726648 100644
--- a/dev-python/requests-file/requests-file-2.1.0.ebuild
+++ b/dev-python/requests-file/requests-file-2.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+KEYWORDS="amd64 arm64 ~loong x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/sabctools/Manifest b/dev-python/sabctools/Manifest
index 8d8a3c1cead1..6baaaee1cb2a 100644
--- a/dev-python/sabctools/Manifest
+++ b/dev-python/sabctools/Manifest
@@ -1,5 +1,5 @@
 DIST sabctools-8.1.0.gh.tar.gz 8963885 BLAKE2B 36d6bbc34f636ac4e892f941eb6e583166ee1f5f740440b3f07faacddf7715d8b4c642a4e6252ece1bdef69017be3d04ce5d6c8e36479bb176e4cd0635f1567d SHA512 862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6
 DIST sabctools-8.2.3.gh.tar.gz 8974172 BLAKE2B 15b15cb1a5b7e923cc43e5e619e02f09d34f69d05d692b11bf3de8b12a1f33efcf6cf8cd8b251c646f1e2be7e2941c755e2e30a205b9e066d280038b287b262d SHA512 7bf1b0e9f55d9f6384166cca911c0d1dd79b3d4d1c33effe295fe4e053394a674a36548e5241a86817ce109a1165e0814954550436f5381daddfc8c1a7c188e5
 EBUILD sabctools-8.1.0.ebuild 762 BLAKE2B 6ca7839b09454d14cebeb9de943f2fbe6b7e1a09734c2bf1190b020d1bbdbc9eed74756051085c47c5bc86c3d0fe8cecfb19706e340a5e770575621c384b07b4 SHA512 82555f53deb0e08a2c46b363664d0ab082ce4e23995f90df3e69435764f3acdc55b3f3f530d2c84a1d6e53dc6cc18e55733635b60489a418d08a6c8ead7cbaf0
-EBUILD sabctools-8.2.3.ebuild 763 BLAKE2B 820e12930508b48352b2a2f847384aa5e32043030aa904b0b1cb6ceea47d4fc837de1394d4d8fc13451959fc81561e01f098fc3c004487ff59c368ace2754634 SHA512 0a26ad5fbea52258a37732b50ea753e38c0a189fa18bc3afa0fee6762abc1b1dc2824eb9d49a06e951ea30dddfa7ab782851c3c61136d4827d8544e6aa5e16f8
+EBUILD sabctools-8.2.3.ebuild 762 BLAKE2B 6ca7839b09454d14cebeb9de943f2fbe6b7e1a09734c2bf1190b020d1bbdbc9eed74756051085c47c5bc86c3d0fe8cecfb19706e340a5e770575621c384b07b4 SHA512 82555f53deb0e08a2c46b363664d0ab082ce4e23995f90df3e69435764f3acdc55b3f3f530d2c84a1d6e53dc6cc18e55733635b60489a418d08a6c8ead7cbaf0
 MISC metadata.xml 373 BLAKE2B edc4fca97bbcc667510d4ef70c33512a3b82f05cefe62f9791cae70f5e99d757a4050b60f81bcd7bc5e0227ba12ac36f069ffcfbce37aa9b80e1102d4deed82f SHA512 adc4d0e1a96bf35378f12b93456d06b9c57c3db2be18951a91f6d308c6edd27fc44d81c39f66c6cf8b9de76923fff014487652652ab652a6e3b0f44fbe8721c1
diff --git a/dev-python/sabctools/sabctools-8.2.3.ebuild b/dev-python/sabctools/sabctools-8.2.3.ebuild
index 0632a9976480..daa91eaf56e0 100644
--- a/dev-python/sabctools/sabctools-8.2.3.ebuild
+++ b/dev-python/sabctools/sabctools-8.2.3.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index f163ff461809..34802e835988 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1,5 +1,5 @@
 DIST scikit-learn-1.4.2.gh.tar.gz 7907022 BLAKE2B d52b808ae981883438592ee9155797fedf832181b0fe66c25728aedc43143143d44af190977b22844e3322da77cd21a1ce5c733e254686722df7f4c43029192c SHA512 ac4eea3d1f1f7c7280694d59ccb1e58362e77080f65dc2d4644dc257e874d7ff0d2d5b7abeb18acffc2752382527c6e9bbf5ebc47a8a74a2fab2a543e0220951
 DIST scikit-learn-1.5.0.gh.tar.gz 7806059 BLAKE2B d58a92fa230ee3f249cd9d9cf2cfd9406e12b0aaed6f3d3360fc5f914b7d690709786477474b95d90711f61b44d5490b01bcb57e36a320235591d3b2520dd9c0 SHA512 dfa6364770a982642c94e70a6ada8d60d3bba5e0a6e1d4acb622c102f176b39ba1c8b5ec8df6a12142afa258974cd606f0bdda4461dc23b7518bfaf71a7319cc
 EBUILD scikit-learn-1.4.2-r1.ebuild 1656 BLAKE2B ca94678a5680be66c94d94da969a17718649b785d08df56d3039a764180c01afdfbfe1458b25d9326bfe34dbeb22aa4f079477c3eb096057e8f6ea8cd151a536 SHA512 d96b58e8ad17180adbd5981f5524ee28a7e2f4f1cf4c4aaaf2a091445d8002543d7348fb4149aa399172819ccd3ae82917935a701190bf284c247f1ce8207310
-EBUILD scikit-learn-1.5.0.ebuild 1625 BLAKE2B c97373c6c1e259df155c3a26f84f7de3d8e6542b0b96758b2936b6ddf49552574b80cb92fe38d9ec779e1c765bc304c26ca261d68e44aa6a2755612bacf47308 SHA512 cddc9ea7abd2ce8008132fb4527383637c036456b82d21025c68fc857fb72410d4e813633981dcfacf153c40a90e4bf4f9b1370eaf99c0109236397fbf131fbf
+EBUILD scikit-learn-1.5.0.ebuild 1624 BLAKE2B 29ced128b8e56ecfa7646d4c2c6a89045b6a3d1598fb395c854058a4018f32d2b3fc530a1def1d53e06486ed0cf635e09e8d0736f3a6153d160e294f985bfd4a SHA512 71a9cda37f69eaf6b49eee5d725d46a25ddeb1e225895cd8831a025a94ccf4fe90063238ddcd5be4c1e17f7ff9d7d6a614d02b1d9deacb288c8fc0152d97d0cc
 MISC metadata.xml 614 BLAKE2B b5425c2d022592581647c9b97c0ab22bfc2afe347b2e5ea22f141245238f145322f39406c62318ba1e6af1462b2691267b39976bfde38faaf1d28b1d29c4e015 SHA512 74ac79123848bc385c29fcfdc4a1e780529dda685c1deb5eb722f5d4919ee6ac9d80798d52c4af0be0cc8dbbaea3784963dd97e2b7c1258cc2f5605b0bc8907a
diff --git a/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild b/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild
index 0cd7dac9d239..8a91a9ff51b4 100644
--- a/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild
+++ b/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 3d7b446f1f20..ed3c8bd63df8 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -3,8 +3,10 @@ DIST sentry-python-1.45.0.gh.tar.gz 475425 BLAKE2B 8dc46154dfc1c7c9104a706be032b
 DIST sentry-python-2.1.1.gh.tar.gz 499979 BLAKE2B 92a401dd0b7202cff288ea252bcaa52c6b7175607aeddcc8f0f6506b722c694bd4499bef1b058e886bed28493408b197916ffff5b698c8c4470747d80a39e098 SHA512 13566786b97ddc571bbb189a3e57ea6721c57c23805be99929883e37db52fe65b636e6f129118dcb7453cb20bb00a352c4a1fa0d43dce7a71236c9d3a9ad5451
 DIST sentry-python-2.2.1.gh.tar.gz 506079 BLAKE2B 396664193906b1712950d6776f7e6ef63fe3c8001bc9a1866ff275bd9885abca82d04c02788d74d9c57ad020c10efa6d0db74c5a3112fc670d867a1189d5ad88 SHA512 b6d55c54342e0847d11ada5844641ea1052763c7fa4eda0f104df983195ac3fab0668b1cbf4dfb48d6b5d285a686ec8b10dcbe4f812fd7b13c05be15d54cd852
 DIST sentry-python-2.3.1.gh.tar.gz 511775 BLAKE2B 5cc0cf6a225b8619df76492abbce76d01631148dc73aeea47d13c71435e973af7cc7904ef50e7edcde5821bce28b213b5e3ca3208887688e2d4cec1d03c7d54e SHA512 12ccd25142fd42262735babe986f9972571b4a3c48607c47c8b6887e722f53a964e259e82be56cf4c4ba6d14efe8335ebb32ed98a40a763a63a5f7b52ef6ce9e
+DIST sentry-python-2.4.0.gh.tar.gz 512867 BLAKE2B 6473ce92ee5d9886bdca7dd13770f6639de64e7fcf4bc6cd0aa966aeab483abc6a884a96158c9627402bbaefd6678fc987518380e2b395fecd386e12431a89a5 SHA512 a1b539ffe6b538f0f3fabd3c6df2997b08ca2ba9e9bcef19f01dbde384de5b31c9795a80c2862172c0ccd918e878c90d42e04b15ed44222340ffc56d1f7f1c7e
 EBUILD sentry-sdk-1.45.0.ebuild 5762 BLAKE2B 293cc9193b547971c44392b9500900fabe5f8dd7da6a237e58a42a38f4f9804db47fa539df90e6246e7be6574733ca883621e17e57d035ebb32596a281b86566 SHA512 571b8fc9d0f0e4b5ea8b5ce3426af73e713220158c121ddf9bd833a097edc027708c11aef53d911f69d0362277996776c4c428c3af1a013766f190e8f9179adc
 EBUILD sentry-sdk-2.1.1.ebuild 3920 BLAKE2B 12ada374c234f7ea7f74c504ce6bb9bd73e7a8495c6a47844eedbd4006a007a572203f5d4764c5167d74af7d3825493c2e1611a0071f26c009d097d81e1c8c9f SHA512 0bfb8b5a65a1d37697f91c740c3431f8e9a4ed54c1c7e407c84b719ddbb718dec79aa554c29803d19f8e3447a6765e2517470a60d384a2ed4df1122530a253d2
 EBUILD sentry-sdk-2.2.1.ebuild 3924 BLAKE2B bd6ba86a04c40053bfea9193d6a636897b74db623077f5bfb98293545631f32f2e486d8651fe9a482a5ff4e372119655b0e5c21ddd1806756c23ec2693fcab28 SHA512 0c4ce2ddfd2bac232a872c9b4d339ed317317b8d9228423180bbb8c2e09cbb66c65e289c3b5c96fbca4b38e11886c98ea983cdc182f3f76ae992d14be34bd56a
 EBUILD sentry-sdk-2.3.1.ebuild 3767 BLAKE2B 64bd76e3ba081b5d0aff67278d35bee44f3be382ea3fa976c93f514bce9b9a71175edb28b702faf75fe2a6e5b89e5e3f2e5bb567179a9632085e586d1c62158b SHA512 f628d86c927894221a1a6f86493b86ca5d5f13202a525c02505ca6ac79dd92489c970aab2d795ca0d0b18780c3cbb7aad80f792190d3397971fd73dbf56301a2
+EBUILD sentry-sdk-2.4.0.ebuild 3767 BLAKE2B 64bd76e3ba081b5d0aff67278d35bee44f3be382ea3fa976c93f514bce9b9a71175edb28b702faf75fe2a6e5b89e5e3f2e5bb567179a9632085e586d1c62158b SHA512 f628d86c927894221a1a6f86493b86ca5d5f13202a525c02505ca6ac79dd92489c970aab2d795ca0d0b18780c3cbb7aad80f792190d3397971fd73dbf56301a2
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.4.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.4.0.ebuild
new file mode 100644
index 000000000000..e76b77593e45
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-2.4.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/python-socks[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/django/test_basic.py
+		tests/integrations/socket/test_socket.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# TODO
+		tests/integrations/bottle
+		# TODO: most of them hang
+		tests/integrations/starlette
+		# TODO
+		tests/integrations/tornado
+		# requires mockupdb
+		tests/integrations/pymongo
+		# requires AWS access
+		tests/integrations/aws_lambda
+		# requires quart_auth
+		tests/integrations/quart
+		# TODO: require opentelemetry (with py3.10)
+		tests/integrations/opentelemetry
+		# broken (incompatible rq version?)
+		tests/integrations/rq
+	)
+
+	local EPYTEST_DESELECT=(
+		# hangs
+		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
+		# broken teardown?
+		tests/test_client.py::test_uwsgi_warnings
+		# too many dependencies installed, sigh
+		tests/test_new_scopes_compat_event.py
+		# Internet
+		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
+		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
+		# TODO
+		tests/integrations/aiohttp/test_aiohttp.py::test_basic
+		tests/integrations/django
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
+		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
+		tests/integrations/threading/test_threading.py
+		tests/integrations/wsgi/test_wsgi.py
+		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
+		tests/test_client.py::test_databag_breadth_stripping
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_utils.py::test_default_release
+		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
+		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
+		tests/utils/test_contextvars.py::test_leaks
+		# pointless, fragile to packages being installed in parallel
+		tests/test_utils.py::test_installed_modules
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio -p aiohttp -p pytest_forked
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 98d1360898c7..91d37c5a2527 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -5,5 +5,5 @@ DIST setuptools-69.5.1.tar.gz 2291314 BLAKE2B 3756dd587136c7e688bdfecf4c0434c0e7
 DIST setuptools-70.0.0.tar.gz 2265182 BLAKE2B 436189fbd614473c42a08da75837c5bb2f6fb6bc03bfc9b99db22810fa043fb071c2344659125439d507d10354d42ea5b703e91c0572caad90f5d805eca9ee8d SHA512 13a5ac09401165dc36d2a365c0ea236c01153374c002b062c4b403a537157ce86593848e93e3c26f5c81f5783e43e6aa96d813f9a39a55732ea3911ddc5c337a
 EBUILD setuptools-69.0.3-r1.ebuild 3942 BLAKE2B 7f198d6bf946f17df21143474c91c61be21ebde1c035f1dabdb78cf5308b978113bcb5f0d353ded961493ee8b0b9636f3354c6ac8fdc06bf16b75c2e12c32499 SHA512 170054320f5213dd0e9532836378415191796149bd6ea97824a4aad5019b5ee0e459b0a260aab176ae4cab8cc795d037ea29620d742f35b058d09e5ef5918136
 EBUILD setuptools-69.5.1-r1.ebuild 4599 BLAKE2B 3a113c6de01f5bbf85cbab2b99106d67df61a8565da701b9eb36a40353421a99fbee48cdcc10c6a979e19f95cb8e952168b1651d90b958feb20c9f5a0a19a135 SHA512 c9c5e3c170f1c5af4031dd975c954403ff3c1589118172a73654b10b73375e30c497ac45aed8ff8415753c1c4ccbaba8f3cebe7e2f5c35deae422d19b1050c01
-EBUILD setuptools-70.0.0.ebuild 4619 BLAKE2B d772ea54b718c070211fbbb71484d6acc25e76b167f6e8a08e64edd4fccdc71ccef4cf8c9828f719d9c2abc6ca33e4111fee00ce3acc13f6415eda909cf0176c SHA512 f242a180649a9611ffe375376bc365afc5d5cd696b005aee584b27d1cae980c99672685c43703dbf01ea73d013a51f892d0ad4840f9c293ff1e593f9c86930ad
+EBUILD setuptools-70.0.0.ebuild 4615 BLAKE2B 9224627d7c18575c57d0e03f58c17f171f5a41a19870579483bb7e9b9ad6feab058b4c8cc13b19b5969482041f2ba99617beb80cf82b90f44b893c259ed507ce SHA512 8c09897f0fc25ae11a1117382b8896fe6d9f88c987f4221c35ea37b757c949f571b640114dd2f909d241250fa0513116752fac8f59f782b9b29981c9c7944e7c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-70.0.0.ebuild b/dev-python/setuptools/setuptools-70.0.0.ebuild
index 26e58e6cc750..53039a9a2fb5 100644
--- a/dev-python/setuptools/setuptools-70.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-70.0.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index 43d2fc801629..a5edc790c626 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -3,5 +3,5 @@ DIST simpy-4.1.0.tar.gz 407835 BLAKE2B 840815663c65e22cd8fbdf74d70fba6c5badb38e3
 DIST simpy-4.1.1.tar.gz 408997 BLAKE2B ada00417f7eb1b61eae47afd0a095c33ef493ddec48f79b2330319ff3ff2f9776cca488a5e3ec51e6c792960d2c0e649828ec1c248a19adacba6f08b713cb627 SHA512 f7e84ceb92285eb0f282892be5eba7bb6e2ba538ecb45221600c41a39aba77cfb0455c9e99ed2c688af0aca8d390f1afe9b6849b4a30be05fb5b7faec27b7253
 EBUILD simpy-4.0.2.ebuild 993 BLAKE2B e503390e3b8bc37e5f5b187291062cc8ff65c626df00eab638929ec5fb07d4306a88e332a1d0e1634a244da0a0d1bcba59fa622dfc7879bf02038cc014b759f1 SHA512 0c2159aa6bbd90c2053b30f609daaedd071fc185a8d96e4f1e6b1802e110f15b83bc4663f763fa00f93aec68237784f441e4e5a70bc7dc02cd3c600faceef535
 EBUILD simpy-4.1.0.ebuild 995 BLAKE2B 8994f1ee7211e178726cd24fc700300f25b29960245fd248e6470a1f838dc34193b9572321e76e5c078a58efd56e25260e7efe7a878e2ffc0f4ae2ca783d2083 SHA512 91c2795fdec50403f550cea4e68a9cbba6e122883c4fe3eee1433382db8a6435231f5122c8bc5ec623df453e7a068c0eb86bbd7e8af926d0bd8d544222c31bcc
-EBUILD simpy-4.1.1.ebuild 994 BLAKE2B 7badc904ae570b97dea1be0f923a2ddad338c23af917d37ff930a220bd5489793cc3a29f97a533c35e75d4b30fd063b8c8def94bf1c747a6e0ade4c540ee4c4c SHA512 5f92b52463821e1647644c3ad98a8ffda15ff3411cbcd2043d1b24fee6b551c722a9a57b73c3d071f930e31c267a4ac5db0b5d79b87406aeb7381cca383cfd11
+EBUILD simpy-4.1.1.ebuild 1040 BLAKE2B a2f093e13a7a15bc72d1339fd2d8ec6d26b069ef24758baa6a728129ecc0504b1353979441254448dff37c6f20ca3fd014bd69ffd357fe58424e90b80e419521 SHA512 7b82e5c4e60bde68b7d689f9a336a464a0c61eb27afea5e565c022bd5eb49c65323e209ea0bbfddb7ea0dd2e5eded1ef54b19f63e2f50215635a72634938e0d8
 MISC metadata.xml 390 BLAKE2B 69ebc7a2e53d6b632403d5cb184e351b33fbca28b380332c961d940c6ef852b830363ced8768f752ba29b9fe2d533bc17d5af6eca2428b491efeb407d8259e31 SHA512 7f7c6e1efe74ff01be746ecdbc68845dad65697e72e3b160683c4587cec353cd314294df5c3b46ea8d5e72bb8f38a5c3f68097c3cb93d020daa5d9601a4131a7
diff --git a/dev-python/simpy/simpy-4.1.1.ebuild b/dev-python/simpy/simpy-4.1.1.ebuild
index 86e3ba5a6814..b28cb3004ef4 100644
--- a/dev-python/simpy/simpy-4.1.1.ebuild
+++ b/dev-python/simpy/simpy-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,12 +16,15 @@ HOMEPAGE="
 	https://pypi.org/project/simpy/
 "
 
-SLOT="0"
 LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+	)
 "
 
 # Could not import extension sphinx.builders.epub3 (exception: cannot import
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
index 82c9dd185a8a..409b56ed3bcf 100644
--- a/dev-python/stomp-py/Manifest
+++ b/dev-python/stomp-py/Manifest
@@ -1,5 +1,3 @@
-DIST stomp.py-8.1.0.tar.gz 39808 BLAKE2B c6efb19fbee81142f251c4bf4114b445878b81fa457260a306cb82ef5e9c57f0b75e3dc8cd6035676e688f1d33081cdf936ac6ccc0628819722849d60f4d8602 SHA512 7385842a23fbe6022c386489641948932e805430ce71c09079d9484fe17d02241ee705d92a1bcdf873eebcbacf68f44bbf884ea103c8963944b84758073fdac7
 DIST stomp_py-8.1.2.tar.gz 39163 BLAKE2B 49d096369b427033cf1210638875cdd1501711a05183d7d186f8f926033e898c7323a8d96f319311999edc86a49515a92ba4c0ed0982712789f7ba78f4175e5e SHA512 2cbfaacdc5762b8db5c28721e01511c32a8991a866d6ced520a27cb82deacc4716cbaf5f298a8daea7f91c9038859d4c39069ad5b46ba6d0efe60e4c19ab09ae
-EBUILD stomp-py-8.1.0.ebuild 978 BLAKE2B fc0f5db9d10272c3c2aa2243a15bcaadaa4f6131aeae578f2eb0a8dcc3c8609798021fa0b6e451fd97954a5861adc28248a6b374911aa53bc650adc8b0160279 SHA512 417f6e3a0fde40a5ef49c583041f5e53d217ce3e6a2f33cacf6d0c1049804859b5bbe27f4a7d6353834729aae2adfd82333ae295e8d0a5b57d4e867079322fe1
-EBUILD stomp-py-8.1.2.ebuild 991 BLAKE2B 6152cac78d0559d62cafef3237e6d709f0c5ad331f7bf4919e6c6ea818d15d6f6c03f818ac1462f823810473d509c4c36f614fd3b7d33e173a60c9f0e8509a2a SHA512 e2139cbdbb7f90def2c1e6c7ae59e595db353ea44c23543eb9c7ba0ae2bdf0236b0e49037cac7d0becc1a411603667a0c2a38715017ec7e7665f5c137bf67efc
+EBUILD stomp-py-8.1.2.ebuild 990 BLAKE2B 3d345453d8e1203c466b8d91121b52628c2bd5a7f66a5a53fdfccc2b51568c8d03f8b4c7de872c7180c874bfe94f5b69e5ead21582a91b5f6ecdd48081beca34 SHA512 b2eab7d657c45d862046d1ee6df186da3f779838ff20d922f23eef9e740f27648cac6141df425b848cde679b707f20d25f2c530521ce1a4a576375836f34ed19
 MISC metadata.xml 402 BLAKE2B f4a4997af910bccc3ffb2e847ae3262f087d6546ba5b50a078498d651388b652b2f1647661e7870b2517d257330ceb234b31295ef7b7130abd4b8693abb3f580 SHA512 d47bd175f6a78efafac027a1ae84bf84fad84893aa285ba7d21acae6cb01406a52e31a83999f13584abd7219cdcb73eec3b435c3093d1b340c31d600b469747f
diff --git a/dev-python/stomp-py/stomp-py-8.1.0.ebuild b/dev-python/stomp-py/stomp-py-8.1.0.ebuild
deleted file mode 100644
index efea6287b7db..000000000000
--- a/dev-python/stomp-py/stomp-py-8.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python client library for the STOMP messaging protocol"
-HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
-
-# stomp.py test suite requires quite a few appropriately configured
-# messaging servers (as of 7.0.0: RabbitMQ, ActiveMQ, ActiveMQ Artemis,
-# stompserver). Upstream relies on Docker to provide those servers, however
-# doing the same in src_test would require both granting the portage user
-# extra permissions and packaging the base image (trying to download it
-# on the fly would violate the network sandbox).
-# Side note: PyPI tarballs do not include tests.
-RESTRICT="test"
diff --git a/dev-python/stomp-py/stomp-py-8.1.2.ebuild b/dev-python/stomp-py/stomp-py-8.1.2.ebuild
index 3a88a66c6b28..d87cdd071b78 100644
--- a/dev-python/stomp-py/stomp-py-8.1.2.ebuild
+++ b/dev-python/stomp-py/stomp-py-8.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/stomp-py/ https://github.com/jasonrbriggs/sto
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tables/Manifest b/dev-python/tables/Manifest
index b27a1ab3f525..5239aa55a709 100644
--- a/dev-python/tables/Manifest
+++ b/dev-python/tables/Manifest
@@ -2,11 +2,7 @@ AUX tables-3.8.0-blosc2.patch 842 BLAKE2B 1ab97a9b0d5c5e435671c00cb8d5ab77048f9e
 AUX tables-3.8.0-cython3.patch 1443 BLAKE2B 064d0175ecd337d3e5628da11c784158d40459da40d5e2a9ee38033e5ab6bcb6e3bfeda5b67f5e3768c3a7554740dcbd2c063f7a786dbdbf40bc603c75f091d5 SHA512 ae3c76ba53b02f0168f1cf997980e2cfa20634348238be5bec0e9f0693d0b719ce4d7b9c547a0e635cc160c75e95bfc15181c82b5199bf2a9978a878aa894c3e
 AUX tables-3.8.0-optional-cpuinfo.patch 3185 BLAKE2B 1e5afa906c427408a81b477f4d6aa09ee903d73db3cee048464b277a69ee0f96cdc23ca660d4eb68b49ae4d88386711e5340cb4deae4632a8af0512ca5b64437 SHA512 3f9da3a9f2a95d80b2af458744a369a45725aa72fa64a316f6e281695e710aadf0d785cc80fd25639a032a9b3bf04a3f06c73c21b1812656251e8ebdaf842032
 DIST tables-3.8.0.tar.gz 8014052 BLAKE2B 28d120ad609ebc9ae8cd97286bb3fb9c484bd8a179edcf0de1b96e4400b7a21b4db835d94fae3aaee84924bd46b84b84da12c538b39517362d805651e7aa3aef SHA512 1616c00787a2e88ff3dc2aebe3a1b2ad428b5a8ea48fc94058b49c509f1c040b540b3f62551b16b3246d2fed58e0b33443cbdaaf1dfcba5a6eead5f3e8028029
-DIST tables-3.9.0.tar.gz 4682294 BLAKE2B a4ff5a67c0376e90ca4f1f405878ead3bbb807b2fc972ba17a1026782adb473a26e15561ba13fb3c477defe3157ead20cf672d7150735fd5555821d1091d9b3f SHA512 2f7e14af6a1759c16a3d79c6b26276aed49ddfcb60f8e157646f0e59f1b9abc405961dab48b55ddfaf046e69b39552a2d003d5ff7734edb195027f9cd6dab684
-DIST tables-3.9.1.tar.gz 4682299 BLAKE2B 0f873cbf82aea0651ced49d92416c5c3c1420dc527c8876a25c0631b1ee59d0b44c920780a9026674d217553d550e57b0ce87b1f6af81ac5bc27c32c161007cb SHA512 c3350a818f11674d15c87edeb9a5b32303d81d533a5473051b8ecb82780d7971fc106fa2e7df3a2bec333d19cead29ef80e2c9355f76a4a1297e44bf7a99ef76
 DIST tables-3.9.2.tar.gz 4683437 BLAKE2B 7044aede85d9eca67260a309d19b5c80944b80b2107f665296ad7ae6a3c3f9a8717a41ae7298a5ae45e5b9de7ae0a6678a83d4bd914bd8709512333e783367bc SHA512 9b416222304b7798585a20d4d7d61934023f151d4262a58a4f0ee969aa365264270c12a734461a194d2c857a13a8e09fb7a1386042267113f601560c041cecd9
 EBUILD tables-3.8.0-r3.ebuild 1909 BLAKE2B 975bc068d3662a9ea39cf4fd6446fb69a159fd2414695ed518251a174c59ffd71f2969d053d97152e31cf9933dcbf4159e45f4fc49e4588a18b050b5b70c5c1a SHA512 52c6c84534807ef1d98ec8d1afed1eb100ad4f90e122278444c98e70480a6b6ed6e5cfd0f270f417192a9c81c07da21f8bc30ed19d476e14380dc3a56a7897c3
-EBUILD tables-3.9.0.ebuild 1736 BLAKE2B ba9f80b737c239755874b841664f8646fcacff94e7e7a4ee7cce24e6ead30ab8626163e2850f9c91ba8ef7af496458ad4687a6eb0d273504d5a6de08f38414aa SHA512 0a612ca1a28e42d7764281c04a94dbf7105df0c258008c416d9f89a0f85923fc42c5dd5b0156e57eb4c9a425c743cc7bf9b90ca4657151d8af79a760873e10a8
-EBUILD tables-3.9.1-r1.ebuild 1738 BLAKE2B 9be5a16e8558f6d41d0c16eebe94ac68d8381568d9f02a9d0ecf4d95959eadb264d4be0864665946f266be9687340f99efc714bef52e30f5884061cd7861048e SHA512 35866707ea3d3a1435ad96ac2014837ca1d9b9d21ad9ff630060705a9c54984ea6a9da7be3d0854c4b0265b30429682a0c421812fd7482d2a67638be6b33dbf3
 EBUILD tables-3.9.2.ebuild 1751 BLAKE2B 21214014c3f362ee096c77013acbc63ed5613f75c6918b6d486011e1135bcc4e7e741628e25c3301fb6b4478404b0eb48173d2894955b4716fedca4cfb9beaa5 SHA512 22035786cc3e2f8042ce3a1d71cdefbc1e76f547e4f6bad0f6bd497e4b338a2b00dc4b38f7b78210053ad926c6abae7145d1e32f69381888986da48dc882fa42
 MISC metadata.xml 1090 BLAKE2B cc213079beb7f2888b5eab4886711fe8a4b7a4bc3cf13ff4d2247bd04edc05fdaed19c464ae28beac27de511ea997bcc873866bf9d544d6efe8cacd095e8640a SHA512 bd322eade443a3b1b610d262a0a6a30088246b3f772624fdfbf6eac85f240deb3f9001be1e2e20e334e65701c24e1d57100c67864d14067b1ae16e99f2136e8a
diff --git a/dev-python/tables/tables-3.9.0.ebuild b/dev-python/tables/tables-3.9.0.ebuild
deleted file mode 100644
index 39352a717e50..000000000000
--- a/dev-python/tables/tables-3.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix pypi
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="
-	https://www.pytables.org/
-	https://github.com/PyTables/PyTables/
-	https://pypi.org/project/tables/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cpudetection examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0:=
-	>=dev-libs/c-blosc-1.11.1:0=
-	dev-libs/c-blosc2:=
-	dev-libs/lzo:2=
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19.0[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.4:=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_prepare_all() {
-	export PYTABLES_NO_EMBEDDED_LIBS=1
-	export USE_PKGCONFIG=TRUE
-
-	rm -r c-blosc/{blosc,internal-complibs} || die
-	sed -i -e '/blosc2/d' requirements.txt || die
-	hprefixify -w '/prefixes =/' setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" tables/tests/test_all.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r contrib examples
-		docompress -x /usr/share/doc/${PF}/{contrib,examples}
-	fi
-}
diff --git a/dev-python/tables/tables-3.9.1-r1.ebuild b/dev-python/tables/tables-3.9.1-r1.ebuild
deleted file mode 100644
index 3c62e7d519f3..000000000000
--- a/dev-python/tables/tables-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix pypi
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="
-	https://www.pytables.org/
-	https://github.com/PyTables/PyTables/
-	https://pypi.org/project/tables/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+cpudetection examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0:=
-	>=dev-libs/c-blosc-1.11.1:0=
-	>=dev-libs/c-blosc2-2.10.4:=
-	dev-libs/lzo:2=
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19.0[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.4:=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_prepare_all() {
-	export PYTABLES_NO_EMBEDDED_LIBS=1
-	export USE_PKGCONFIG=TRUE
-
-	rm -r c-blosc/{blosc,internal-complibs} || die
-	sed -i -e '/blosc2/d' pyproject.toml || die
-	hprefixify -w '/prefixes =/' setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" tables/tests/test_all.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r contrib examples
-		docompress -x /usr/share/doc/${PF}/{contrib,examples}
-	fi
-}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 38453ae29b9d..3e50c9324274 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,5 +1,3 @@
-DIST trimesh-4.3.2.gh.tar.gz 13597959 BLAKE2B 538c3ecc9153bbef04fd004076277d50e1ac80e73231ae5faffadb6a810e5c6aa23953206f8a9817a16c3d104d0a38b0da07fc6f8460f2bfde0a356c760048d7 SHA512 2bf40f2290875547dabf40101004581e7287cf2a954d4c1bd0df1adbf044e72bd30d8fbbadb8db44e8bfc33049cc68a075b347eeb538f8fef5225a724a4ddc3b
 DIST trimesh-4.4.0.gh.tar.gz 13599198 BLAKE2B 41fe6d8797bca600ef4526420b9a4bc3fe722adff3a6154625801b2e9a8645ad573f4f62926cd00763899d049660145d6e5614316fcfe3c4f4b76c59d59467ba SHA512 227f3da9e42bd2a872d312d5128d7ae169fcee8ef5566e533812fc6222fe6e5dc40c7802a5a7f1bbb583c700e6c8d1017ee1c6a946284e64679f3a138f31da6e
-EBUILD trimesh-4.3.2.ebuild 2071 BLAKE2B c596eb24796a9307e85669d7b22d48804f33364b36ecf9a99594f3991f317336bb3b90ae7da57bd9af6a38ac57bb1f7a2f449bea964a2304fb357ab7ab7a2e71 SHA512 70aa6ccf6e2034d9a1e20b960276445e86853c980710a438d6e65bffa1acc89b9536394ace44cf10c32e7e6da33b0f8ed92eb68bf1e44cb61e672ed4e1bd6727
-EBUILD trimesh-4.4.0.ebuild 2034 BLAKE2B b4d56e6f87b5615fb567f25962478b00412f963cd4ab226d39e4efbd7c07de8c83551ec7cc2abbdad4d8b8fa638a39f2904f1cd697232563c490fd13ee632b53 SHA512 80a4847b9b39554144fe08ebbd835aaf45d7dc72317c6416e48c6b1c3cb1dc8b547c82ba9b05e3773ce13c529238d2358a5dffa755f2e3d14c4f1c6337f883da
+EBUILD trimesh-4.4.0.ebuild 2032 BLAKE2B c2bb4eb32305d76b72862f868661df44344f4de1987ce65d5627df2b8a16c7b20bc11dbaf30ed66b27ba3826eb76f2bbc3455fc349c00ea46cb9112628f3f5e8 SHA512 beaf67d1d2290e1c538e489ee3f2e3fcd9786c7090bede09cbec3c5e08851fe3401bf6168304301062245d5e086b02c563caf73c9080de52d9ba5d1403602b9c
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-4.3.2.ebuild b/dev-python/trimesh/trimesh-4.3.2.ebuild
deleted file mode 100644
index a30c12d1f37a..000000000000
--- a/dev-python/trimesh/trimesh-4.3.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=1800
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require pyinstrument
-		tests/test_sweep.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.4.0.ebuild b/dev-python/trimesh/trimesh-4.4.0.ebuild
index 90df68a2c9dc..2ba9f811f9ea 100644
--- a/dev-python/trimesh/trimesh-4.4.0.ebuild
+++ b/dev-python/trimesh/trimesh-4.4.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index 56054f63873a..c3deb3d0adc8 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -1,7 +1,5 @@
-DIST unearth-0.15.1.tar.gz 283687 BLAKE2B e43a0fac6023974c877ad7b82eac402d38da61920ab905587bf19d6e506b127785863ae45064392ddfee042e3fa12868d996c4375acbd1baa7c31402d31da80a SHA512 94db664b45f6e570437a0e24ba12c0c8ac6358ef5fda214bcd2f5665158f4e314a23f77dcc5f923804a7b8a30e0c580c3efae854ee5a502504b48db405d932fb
-DIST unearth-0.15.2.tar.gz 283748 BLAKE2B 8387454676d6253ba1df6cf2c857d416c5b67ac5c9deafb6b34a70263f07147688f12c8bbd4a76dbca6a98542ccb31233d9ad19260f7800bcc67491ab0b76500 SHA512 1763d640153b53ce18b5b7c0ccab811402fe8dade87ebe64bf8984284710fc739c9ef0d0df20e7be356f4e93dda126bec3d6d801c92ad2c5b5381f8d6f94c04e
 DIST unearth-0.15.3.tar.gz 283726 BLAKE2B a805720628c10f7594b8deee3b9fa9a922c5c85143ddb80d863a4aee3f8524360339540ca035060d5f46534fcc93472d07dd40dfb7712cffd3e5e17b74128c70 SHA512 68cde14908a471e0d1d8c75eb33ec352f4d90d6f54692c21039315961b906c90220fc718881c9e0937a34677e05835108bca1298aa0c825dd0666bb84529f100
-EBUILD unearth-0.15.1.ebuild 973 BLAKE2B 57c319b16762a79973ba325686efe311339149a10e0f0cc0f724357e890b141216814a2e47a9a5c2d110f5e5e5ff8b0f7c85476cc0676bfa308c064acf4101a7 SHA512 5d161de817cef9f888eb2152b160528de3f4748188638457712f41ad6d16d57f35323a04cb088f36180a7261aa0ae52cf66ddad3faf8bc18f0f6d3862468c4c4
-EBUILD unearth-0.15.2.ebuild 973 BLAKE2B 57c319b16762a79973ba325686efe311339149a10e0f0cc0f724357e890b141216814a2e47a9a5c2d110f5e5e5ff8b0f7c85476cc0676bfa308c064acf4101a7 SHA512 5d161de817cef9f888eb2152b160528de3f4748188638457712f41ad6d16d57f35323a04cb088f36180a7261aa0ae52cf66ddad3faf8bc18f0f6d3862468c4c4
+DIST unearth-0.15.4.tar.gz 283788 BLAKE2B 57d3da264e8a0574bf8b208cee87a9fab6778eb9e9da0a0697a91bffebc28c27d62b5d22584b02049684269709012a060d075f62887bb8685989b07745c80da6 SHA512 a6f759108ec0bdddafd653cff840549a57d9656af2c768b2bdf745f5e9d0688c4f14ca0bb8ed86ffa8d38cb9e0a8cdcdb076db0585df3734131f24ef0cc5c995
 EBUILD unearth-0.15.3.ebuild 973 BLAKE2B 57c319b16762a79973ba325686efe311339149a10e0f0cc0f724357e890b141216814a2e47a9a5c2d110f5e5e5ff8b0f7c85476cc0676bfa308c064acf4101a7 SHA512 5d161de817cef9f888eb2152b160528de3f4748188638457712f41ad6d16d57f35323a04cb088f36180a7261aa0ae52cf66ddad3faf8bc18f0f6d3862468c4c4
+EBUILD unearth-0.15.4.ebuild 973 BLAKE2B 954d1d0a965598bd6a1ea438a54575d7d902638b9da5631b5babca972885cb29ad338ee5392502730784d707bba730ea788c6df2d11072e51c635ea73a49250f SHA512 02ae8087266e8d28d9717e3e5acf3291172f4eb733547a5bad3402153aa5b53ec437c2c91b0259f5bab02b0aff38e4a19c493578cdbb5111bcc91593c64a7eac
 MISC metadata.xml 480 BLAKE2B 489aab9c338887392b943b48593bd9d752083d82fcf89a419e3677f2d24939af51cabe16641c3a16942f9658fe79f804af61cffc807cdeb909d44a6cff5ced5b SHA512 9fe2154826a2399f5570fa150445220f7490e10741275f77791b1d29522336912812e3f8905c026cb748845d2f2a005196185db6576708b47f1cdf582216182f
diff --git a/dev-python/unearth/unearth-0.15.1.ebuild b/dev-python/unearth/unearth-0.15.1.ebuild
deleted file mode 100644
index 5260d38a7421..000000000000
--- a/dev-python/unearth/unearth-0.15.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( pypy3 python3_{10..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 ~arm64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/httpx-1[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.27.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${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 -p pytest_mock
-}
diff --git a/dev-python/unearth/unearth-0.15.2.ebuild b/dev-python/unearth/unearth-0.15.4.ebuild
index 5260d38a7421..a135cb39bbf1 100644
--- a/dev-python/unearth/unearth-0.15.2.ebuild
+++ b/dev-python/unearth/unearth-0.15.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index de0e644d425b..e07c765084e6 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,3 +1,5 @@
 DIST weasyprint-62.1.tar.gz 475687 BLAKE2B 80e5f24c2a52f60baada23239427cc80f34d9885d7decca172dcb420bcb76cdc49a4d15e21d4328e86bf9c7f9228f9a01da1244eba21f35a90f80a8e358b74bc SHA512 8eaee6daa610accd7594141102aecaf1b5debecbae196c442c32d522d4dcb54c411a215b77956b6e66deeb0abda66cb36d0e081d5d3fd69a8bf5a82716209aeb
+DIST weasyprint-62.2.tar.gz 477895 BLAKE2B 918852d2eb9fd1b1e29101927e6251d827dbb7add8efa448dd7888c42bbe4079a514ff6d3d764ebb0cd96c0a1890f343b72575b1cc4e86959293a95054766d69 SHA512 d5254a39f6b5554e83fb2f8b88077a36d6f5a44f6d731b5f07c952429994f32a79c4d6c1187ed8ea9bdccada320c4347693bd4a21c61c6ad76f866161adfea81
 EBUILD weasyprint-62.1.ebuild 1051 BLAKE2B 626080aed3dc3d3e2a02bd20330fa036a288af6c9319bf8bf39055d79a2d20df232182179cc663a46a16c3217c9b749d776b6d0f8f541287092469c1d6269869 SHA512 bac1750a85d63f080265adaac0b5b97ff5c243f41dc7c5525353b5aa3996c7e07ea18aa5d0876b518e339995f0fec8c52b01585704a1beecdd0e63d8e2f49c46
+EBUILD weasyprint-62.2.ebuild 1052 BLAKE2B 782577cf81a0f16edaf1cbab33303df787fb0d785ef1585885132176b4671a856282901e14d74cbd96a4530e6df17e967762245ea8f048eb0f31ea97da1c84b4 SHA512 0a5782efc2bfcdfbdf46338548589b281801a91f69bec108369eb1dc86e30b099aec2afc40d50ec9901e2790cdca190276c66ca567b3c4aec5475989b659d138
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-62.2.ebuild b/dev-python/weasyprint/weasyprint-62.2.ebuild
new file mode 100644
index 000000000000..ede5b4b196eb
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-62.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="
+	https://weasyprint.org/
+	https://github.com/Kozea/WeasyPrint/
+	https://pypi.org/project/weasyprint/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.3.0[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		>=app-text/ghostscript-gpl-9.56.1-r3
+		media-fonts/ahem
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index c4113517aeb0..6c4a5b3be385 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,4 +1,4 @@
 AUX werkzeug-3.0.2-pytest-xprocess-1.patch 864 BLAKE2B ff18777cce9debbb39ae524a54912417a3d3bd46a54b4ba91322f9abe038b47e4091049f4e4ebb9bf5c0e661b0d88bea2d157b840d02d81442a323b222d840d2 SHA512 8208a0b6695d6079b0bf251bba8cf2c3c7fb89a37aadeb74c534e6c61a7455e71fb61ec6a44d2689a311e77d9d00302a7d2dafa449deb7d4e207038bd43ac372
 DIST werkzeug-3.0.3.tar.gz 803342 BLAKE2B 8c47d3131abeb8ce2d92291e08b603152210c44c40156b5399d24b167d0a02daf6adbeafec43e8b33dff940271feec95e9333e637e825f511cd5d03686c1e02e SHA512 fc771c161b37a376a86930c29c8b8052f81fb869cedea8c3c83af1e8b1aba271358c918e3067f3b0ac6d4a1689c8c355bff410d521c73a1909fd0ffc90fee6c6
-EBUILD werkzeug-3.0.3.ebuild 1976 BLAKE2B 36c8f5efe2d142f57596a824ab32e68c1b0196d8a66db755383cf422f975706b35ddafc749747039242f301e9ed4b03eda365089cd95e2a641d3539bbd0a672f SHA512 b53346bf1e3736cc7f81890c2583533e4d15d2108d9115887623231728f53c34b0f5fb19bb619d4479d0d0edee5b508b71a78e602e20e7d719d69601a233e796
+EBUILD werkzeug-3.0.3.ebuild 1718 BLAKE2B 8a23f6f4bc308b41590856d284587a4847a8b0ddec08218bbb2af2544b90aa9668b5a0db77bd777c30a43e6506dcd84fbe58197d4e4aac94c02c7a0de5c8bf5c SHA512 9f0fafcb807ff035fa5deca355606971e61701cac787b6d997d328a9dbfad42962f0b7981268e30b6a6f0e611f6e6ac28416c772e3e11356e9d826857d6f46cc
 MISC metadata.xml 392 BLAKE2B 59644e2ff4cdd9ce2db59e36b9b3ec6ce7b7a87186c962bc6b1fa1ef490c30e542b62e8739b059a679f843af79ee7c8b13099bcbefa7ae3102aa3f5d1bf7055c SHA512 a79201b2e92c427248a4448a9734321f955e5431c46e0e58ead2e06c31945309c20f7de76f80e80d4c81ffb45deb4837e1a415a4d2596b7644b01735120899dd
diff --git a/dev-python/werkzeug/werkzeug-3.0.3.ebuild b/dev-python/werkzeug/werkzeug-3.0.3.ebuild
index 7f74f61a313b..b4d41ca18a50 100644
--- a/dev-python/werkzeug/werkzeug-3.0.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-3.0.3.ebuild
@@ -23,8 +23,6 @@ IUSE="test-rust"
 RDEPEND="
 	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
 "
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
 BDEPEND="
 	test? (
 		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
@@ -34,11 +32,6 @@ BDEPEND="
 		test-rust? (
 			dev-python/cryptography[${PYTHON_USEDEP}]
 		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{10..11})
-		) ) )
 	)
 "
 
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 6414c5093cc5..74fc65884a0e 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,5 @@
 DIST widgetsnbextension-4.0.10.tar.gz 1147204 BLAKE2B 16b81a1ad6c1d527c27d1fe48952d8ad89c14c2ae7cd1f7f00eea43263f9fde481df1db18d74a8a6417c9270bd29a46c77b495b520848c4782c1d60295d5850c SHA512 0e16dc994093712851a3ad0385844fd3f807157a024dd6ce26c3f6b3953cfb01421d877363def747405c8c887a00a880dcc06664d45d142b3c548b7d67b7008d
+DIST widgetsnbextension-4.0.11.tar.gz 1164354 BLAKE2B 85a96be89592ad08c8722c389d8848126da0e9fc235a126c44779aa1188aeeb1cc9e23c5e4f447562f8660dc637947da3410f7068d14949b337ef8d652705b01 SHA512 22b2bea35633212635718a49b33e219dac7688190c2e9c3b0eb560d830c984e7250d357c14e8b13102f493977863722e18cd77dc43dd7e309aa03006d63072cb
 EBUILD widgetsnbextension-4.0.10.ebuild 615 BLAKE2B 6331a551d0cd276f54318f4143500fc2a4c9f0ab9b37539145b7ab18d476eebffb4b322c71fc6258690b081860857390e370f47deaad7a57ddd5b2827d110540 SHA512 98041a0e8c8e613876cea7997dc4a71c32d21c5e89ddf5ce23ab9eaeed160326dd337b93677f430a55af0af3ffb1384286594772b4a433b9a6979e3305d43643
+EBUILD widgetsnbextension-4.0.11.ebuild 620 BLAKE2B 0da8861620c25a9a57c21577297deaf4fa1cf218e430f8bdb8c79610a47a5e29c42df7257ca879ae885f78e8d8a50ab33a5537948fb99d936e08ac63113e772c SHA512 3226702485d9c9611b659c8f34e10fc39f8873f3e7e3524fe44c21380bd827b47f0d158e3edd824c4a0a793c719a11093696296d4edd9f1191c52e70d1019c2f
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
new file mode 100644
index 000000000000..bc66602f85b8
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipython.org/
+	https://pypi.org/project/widgetsnbextension/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index aa8e824c8137..c59e84f78d70 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,7 @@
 DIST zipp-3.18.2.tar.gz 21783 BLAKE2B 488c7ebe2a37d5d38f8aac86a578144aaa77d9acb375cb2aa45eb16e5f5d2db30be00827f580ee35b5aa85559001e457054cca1dd34dec7005c0169bd4a4f1b3 SHA512 c8ba020fe210a3c9b54da2f868c324b41d281dc50342f9ce68e493a695d8c8620ab19303fb81bd64cc458667113ef31a890e8e71180a0155a83ed9ead6049bcd
 DIST zipp-3.19.1.tar.gz 22625 BLAKE2B 283754c1b2280ac7dcce867555bacdccb59f4183e6b722c7916b5825bc16e1922a15c0b1d5684be0a89ce6672be58f0752e21b85ad02afabeeeb26d9d4706b7a SHA512 c0a4b4055f6652852526b7749d738cedda6534ea21945933ec727b5364a5558697fce6757e4045d30df55a1dce57509c92046f25d6914707fcc97e07f3088c3a
+DIST zipp-3.19.2.tar.gz 22922 BLAKE2B 8f4a115079b6faa730a3502592983c13b2db27541cdbd91723fd20f320d22678f3740b01f24b46f7049607c49953ea64fa8e4855d26f28f0683d330b625a2d0b SHA512 3f1b663c4befef774e076845a8a2d2fc414cb768af0e3bccc57b6b694e9ef28e8dd8ae59b596b269f610b082e9c7a92ec3dcd465aad4e5ebe250ea96df89b2cf
 EBUILD zipp-3.18.2.ebuild 1432 BLAKE2B c4d2e793eae3d3169efbff55cf3d9cc26050977f23235a55685ad0c86f09eb121b7a10bc4cb21ff8612f7e68e45c52fd7fbc2ca87d86236118d3ffbf9742327c SHA512 a7127128dc8edb9616cf83f259c2a935db15fd1af64121f39e6f370724807f96c14c3556579bab1420c3c369b31862a6ad488691b8dcb14cba625c12266d73d0
 EBUILD zipp-3.19.1.ebuild 1440 BLAKE2B 435cde79cd5ae1b3e48c35ee2af93e402622f25ca7c79939ccb9abab439de25d82a3276561d9820ceb04b0ef48d3cbbcd35abd6031f7daace421b5b71fb1b843 SHA512 9d9747ebda1c88ab6df4aa01de6b56b8c532c34e29ba9142057ec231740dda540b8574909c04491cff89bc1fe5b2847e262cb37a40b9dc3442d8bde6a98947cf
+EBUILD zipp-3.19.2.ebuild 1440 BLAKE2B 435cde79cd5ae1b3e48c35ee2af93e402622f25ca7c79939ccb9abab439de25d82a3276561d9820ceb04b0ef48d3cbbcd35abd6031f7daace421b5b71fb1b843 SHA512 9d9747ebda1c88ab6df4aa01de6b56b8c532c34e29ba9142057ec231740dda540b8574909c04491cff89bc1fe5b2847e262cb37a40b9dc3442d8bde6a98947cf
 MISC metadata.xml 442 BLAKE2B f16ae43bab98bfc1f62cb9d4f117ed5c01874bd856781e80a273ff200c2d4de285181d99205d82b714fbc06cdb31625d0e70c0ff8333aa985099fcf8e2e7b795 SHA512 a75626c96d34c020b591e0207d2407f76d766c85b1d2f7e76477c21f309d2c9557ed5156d40940b41d073b3f80a71d25270e08f3baadba3cd6b159806af0ab32
diff --git a/dev-python/zipp/zipp-3.19.2.ebuild b/dev-python/zipp/zipp-3.19.2.ebuild
new file mode 100644
index 000000000000..4c2c0b9b1eb8
--- /dev/null
+++ b/dev-python/zipp/zipp-3.19.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="
+	https://github.com/jaraco/zipp/
+	https://pypi.org/project/zipp/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# big_o is only used in test_complexity, that we ignore
+BDEPEND="
+	test? (
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+		dev-python/jaraco-test[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# performance tests are flaky by design
+	tests/test_complexity.py
+)
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "zipp"
+		version = "${PV}"
+		description = "Backport of pathlib-compatible object wrapper for zip files"
+	EOF
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3d7f5dbc588a..1a874c9eb807 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index b271b7235ae4..7efa0c41c004 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,5 +1,7 @@
 DIST curses-1.4.4.gem 524800 BLAKE2B 00749022a097a69b8a1a42b88b64a81a60cd6e6914dbc0636a1ed17db6f7b3f1f0e583b965b9b296ff27a5dc97786024f0511b2ed59e337ef29a799dda0fc577 SHA512 5e275b7bc035c9745ed19d563da97aba090f66d4831a4cf07144ff29f3b49a36bbee592e1292719d6bcfd1f6a77d2955de5d7e5ff34ce487d574482a0cee1a53
 DIST curses-1.4.5.gem 525312 BLAKE2B 7b225608ea88ccdf6c128fca0601452fbc7e684cfa617e8a3d3f42b97f9fcf72f6a15486d2a494838f8650ae4b7562cfff6a5f0177ebd93b2009b6594abbe5c4 SHA512 3ac95432f7cde24b5949f2be0935ea3dbed704012eb756b0d58b971406e7d0535f02a249993e712ca491a793b079d41743e159edc1a80ec9ab65161df13eebf3
+DIST curses-1.4.6.gem 46080 BLAKE2B 1b83124a5404903aed8d7d4bd78d57dc6cf437c9f5b2ff0b8ee840f53017f1493f24808285e987c902c5e03c9ed663546db49b7b26b80999bdf042a067dded48 SHA512 e98879517afb7248a8fac7575e9ef85f9be63e76a269e1c3dd5ac2ad0cdb2636f560a0b875883f58ec86c0be89a3fec4f8088179c77319db5fe4e324edae280e
 EBUILD curses-1.4.4.ebuild 759 BLAKE2B a358eac8afa63d9010ac627cf5c5f329ac63ec56204967724440b81055f3dfe7b116d3ffa787cd235f70731096338b95e15d07e30e0eed7686434f4a22c816fa SHA512 0ba7c48feed4794f677bc7cd1e9d7d92e7c86c3e1c3a4848145d2ca8df4114e2abfc3a84c1a216455c65a1bcee6f18f6ca7529811397c689bf265e02316d1fdd
 EBUILD curses-1.4.5.ebuild 750 BLAKE2B 45a0add9338ce95084c9673a3643158d128b2a8ba835f33c0be8796a335ffbee6f006f7167cd558e420d6dcfe219cb3c321d9c3206480d1404a1484f4f646bee SHA512 a953d802df4e0ce80bcbd9275a1bebb0222077c502e94ff7975b46a7cd85fe2b1d4f2324c32eba12cb6a2e9e4a05600209d0de273a779e8fbe3968aa819615fe
+EBUILD curses-1.4.6.ebuild 750 BLAKE2B 45a0add9338ce95084c9673a3643158d128b2a8ba835f33c0be8796a335ffbee6f006f7167cd558e420d6dcfe219cb3c321d9c3206480d1404a1484f4f646bee SHA512 a953d802df4e0ce80bcbd9275a1bebb0222077c502e94ff7975b46a7cd85fe2b1d4f2324c32eba12cb6a2e9e4a05600209d0de273a779e8fbe3968aa819615fe
 MISC metadata.xml 338 BLAKE2B abd01018668395bdc0e27d71ccc6341beb96b969dc215cb05760e478e46766948116542416274e0a99284458f2773dd0ab73e6041112f62181efa441d879082b SHA512 d074a3168d313769de5bcb360d0e70bafa37a5c37fd9416ea3d0b9c992648d7e5416c71256d16bdfdf83abf11b77e1fec8069fcbf56bd2c909a9ade07adb219a
diff --git a/dev-ruby/curses/curses-1.4.6.ebuild b/dev-ruby/curses/curses-1.4.6.ebuild
new file mode 100644
index 000000000000..695e0006b304
--- /dev/null
+++ b/dev-ruby/curses/curses-1.4.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/curses/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
+HOMEPAGE="https://github.com/ruby/curses"
+LICENSE="|| ( Ruby BSD-2 )"
+
+SLOT="1"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND+=" sys-libs/ncurses:0"
+RDEPEND+=" sys-libs/ncurses:0"
+
+each_ruby_test() {
+	# No specs so we use the smoketest that upstream use in CI:
+	# https://github.com/ruby/curses/blob/master/.github/workflows/ubuntu.yml#L26
+	${RUBY} -Ilib:ext/curses:. -r curses -e 'puts Curses::VERSION' || die
+}
diff --git a/dev-ruby/io-event/Manifest b/dev-ruby/io-event/Manifest
index c19771c71c77..2cea633966cc 100644
--- a/dev-ruby/io-event/Manifest
+++ b/dev-ruby/io-event/Manifest
@@ -3,9 +3,11 @@ DIST io-event-1.2.2.tar.gz 35405 BLAKE2B 9fb96c920524db8111b8d3650f2559df71e262f
 DIST io-event-1.3.3.tar.gz 46284 BLAKE2B f2d6fe2a1eb3c1d0f26097847b9b0d464fa274d215f620ffa46e7718d89f97a7ff8bb00b145d29763caed527410d0e3040dab313445e11b26b2ef3891d05f604 SHA512 71391822d2664f9c9534cc474b2e9b052d98f44d7c985b768c93ff2956379f2c107094ba4ab9e376bb3820e085f15187f210566229a31ae493334cf4af073bad
 DIST io-event-1.4.4.tar.gz 46919 BLAKE2B c66b410c1eb3e1b398b2ff8f1cad103f0d75e680b2b79ba8e0144ebfe0d0ce29de4996c2c758447c665231c07a939e31af5f3fc47725be33733dcfed8afcd12e SHA512 f8c7503d5d924de2847a57e6af0b01cb8c1638f4b3060a3afc58ca7cc3a719d5df2fa7b83252d1d761f4a3dc8da68b759797e1d1cd6168ad16421924ef3ef316
 DIST io-event-1.5.1.tar.gz 47618 BLAKE2B 239beebca88dac137ab826df0da9f4c7a0b910a9401e46a542dd73a151009ca6d3b0d94584421a039e693e1f5e3f40e37fa98611ff8f603dc5d4bd30bc0788e3 SHA512 71f343ffdcabde14f1737574e66c198934cdf5c88db0c9dc58106da588a7156d4b36cd2a3bd0552758468bcd78c8ee3ae1d59eb0432f7e66f57e3d9dfe75fa3d
+DIST io-event-1.6.0.tar.gz 50641 BLAKE2B f9af9426e2626f101e7ec45ac601e72b60bcda02ae8cdfe659f2440a0c1b084e8a67501104854a7e896864b5a94c624a27b7e013f03df26b1372a098af2ca3d8 SHA512 92ae37e390718b166eeb0fb5ef148f093d90ab623def9cfc9201086fe332b4139c038309ffab9dfd300b80d079bfeeebe14099a1674678f87a60c540570c3526
 EBUILD io-event-1.1.7.ebuild 864 BLAKE2B 037dc38604de903a4042610ba47c7328911e9092e3ca19b0822c2f7e2439d1fa013682efb1cfa34f7e1d8a2b00ee5bfa8afeb2a2694b98418686af56007ea1de SHA512 d3cc42893d9bf4a7aa00564306259bdbea3d5fbc602e8359889d023e31ad8b786595c2dc319755b6b1c2efc802efabd9b67551c1408bb1b754a97f8f9d9d3ef3
 EBUILD io-event-1.2.2.ebuild 992 BLAKE2B ba1a508df70f4258e119355786979639d20158160f6636ae430f9b62ec01dbf52d68848df9221d8672475b51a66a994c9aa9fdac5b40d363b58dc48d57c45978 SHA512 3cb74b7e67a94fab22bb4bb8c6298ab4a3c599d782cc803d92c21c65b94754ba878dc5d2f994e493901286858ce10c67a4de450fb4eb2a04952ac1c269b9d7f5
 EBUILD io-event-1.3.3.ebuild 983 BLAKE2B 1aa0f8a2ec73822402defb15b19fe21e10ff4fca6aa5c71c993482ca7aacfd18d9fa5a6abf7e60c790ca3be93a4d1f8701224e4f8b6f5782e00520606d6668d8 SHA512 b1062b3c43d9c90d409733ab9fc1f7df421f14e4b99968ce51685eb066087756eae4761e3ba0b59f4a1327a46f916ca874baa1283606f204c8b230258b9b7843
 EBUILD io-event-1.4.4.ebuild 990 BLAKE2B 0ed85c57bfd4c5bb8ce3bd6f4bdd0dd1ac2de8985eb44c2ced441ceefc0416ff50c9ccac0158a1adb7c09c4eecf991de3f51d313f948921c0dffe94f56d1137d SHA512 c3034285f5ca0b111afac0b0ae54ef680435a47fbe8b89de82770a6d73cd29150216c766089748b1b4eeb899b699e0645271e8589eb15b02112ba0753279313e
 EBUILD io-event-1.5.1.ebuild 990 BLAKE2B 0ed85c57bfd4c5bb8ce3bd6f4bdd0dd1ac2de8985eb44c2ced441ceefc0416ff50c9ccac0158a1adb7c09c4eecf991de3f51d313f948921c0dffe94f56d1137d SHA512 c3034285f5ca0b111afac0b0ae54ef680435a47fbe8b89de82770a6d73cd29150216c766089748b1b4eeb899b699e0645271e8589eb15b02112ba0753279313e
+EBUILD io-event-1.6.0.ebuild 990 BLAKE2B 0ed85c57bfd4c5bb8ce3bd6f4bdd0dd1ac2de8985eb44c2ced441ceefc0416ff50c9ccac0158a1adb7c09c4eecf991de3f51d313f948921c0dffe94f56d1137d SHA512 c3034285f5ca0b111afac0b0ae54ef680435a47fbe8b89de82770a6d73cd29150216c766089748b1b4eeb899b699e0645271e8589eb15b02112ba0753279313e
 MISC metadata.xml 453 BLAKE2B 6f734840e504644c7d84ca58d0ac13f4f36a6e3f1d4d7a412871e224199d0efd071bbab9133f5a95ecf64928b4234787172b6d61c9ce085a6cc15c362e60195a SHA512 cc8b195ee59e7927a6cf1d9c1e82c222d697044cc917ebdcb4406ccb6372b3a51f09696b1618559e83b0ba98fbb2a8fd4b2977bb4adb46d437df90d2474648cf
diff --git a/dev-ruby/io-event/io-event-1.6.0.ebuild b/dev-ruby/io-event/io-event-1.6.0.ebuild
new file mode 100644
index 000000000000..54d45037491d
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/memo_wise/Manifest b/dev-ruby/memo_wise/Manifest
index 3a29cb0b8fc9..a73c937df707 100644
--- a/dev-ruby/memo_wise/Manifest
+++ b/dev-ruby/memo_wise/Manifest
@@ -1,3 +1,5 @@
 DIST memo_wise-1.8.0.tar.gz 186795 BLAKE2B afb1a027c6c981601d51262f13508fb8cd0074f6283bdb953537e300cc4970856765db60a92afa8331139ff98e50ba97529366f9adcd4d1ab93c93f52dcd2e48 SHA512 173dbab6fe93f21ad1ead34f4fbe8b0425747e1f2640472b9a1e4b79b935260cc0163d907d8ec423152d91165f32f2e8f1691dcdbd15830f375473415089ce6e
+DIST memo_wise-1.9.0.tar.gz 187663 BLAKE2B 02028a5f9ceae77702f3e536bbd33e17232ea1f443da70101e87ef0bb449eb387602fe710d20b44ffa39d112aaf8f2f8cd2897ed0e941c56ba8a6792c2f6cd14 SHA512 bdab3eca584c68055e806f825cc9d29c09f3798f0b5bffb634823021dc26227cbb85ae562193f1ed288275583e9939cd0eb4cd611da23d0c0c305bd283eea618
 EBUILD memo_wise-1.8.0.ebuild 1010 BLAKE2B f24bfe1859a3b70a1aa3249f3336a05f8c81af87a48d7af36ef1652f124e9c61483ad6513790c36e41aeaf0301a698e700334b90fa25a9c4311d2ccdf1a38e6a SHA512 64847edb3ebedb0a02321631f41d6670d352d789c28639742a9de2fab4731f42609cc61bc7c87e7efaaf8fd3eb104f598a3a1ed93a88365dee367de045c6e4f6
+EBUILD memo_wise-1.9.0.ebuild 1002 BLAKE2B 48020d0d3c4784d5901f41a4b5ecd93952e82f5f6f15561a3bcc5ce2020ff683a98c00405e81d7c5302029ca84a537c7fd62d244dfeb3216bd87e511bb876a8d SHA512 174ba6df585fa9b624c92409035719661a97b8e26dedea22b8c955b1c9d89c0c6131dc5fc50d264a8ce228d0f34322788c89f8a9d6d3c56b7c7a974196561b34
 MISC metadata.xml 348 BLAKE2B 4e33571301410e52989d249f0e424cfa24b622cd4ce2a83322932adf1cfcdc78d66057bfcb0763b77ea5727e0f77a20b5e50a6677314682285a5922e2953773b SHA512 658fb8b4243ba73f5c55265ef99a2706462f7d6cf90ec1c048e959fa61520058333b8b57bbb67dce231c52173b8a9a94449096df1751edeae697c962a0412bc3
diff --git a/dev-ruby/memo_wise/memo_wise-1.9.0.ebuild b/dev-ruby/memo_wise/memo_wise-1.9.0.ebuild
new file mode 100644
index 000000000000..1c45be13eb68
--- /dev/null
+++ b/dev-ruby/memo_wise/memo_wise-1.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="memo_wise.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The wise choice for Ruby memoization"
+HOMEPAGE="https://github.com/panorama-ed/memo_wise"
+SRC_URI="https://github.com/panorama-ed/memo_wise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs for an unmaintained package with old dependencies that is optional.
+	sed -e '/require.*values/ s:^:#:' \
+		-e '/when the class is a Value class/,/^      end/ s:^:#:' \
+		-i spec/memo_wise_spec.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 5bcd5458038b..dd5a45ba4bd2 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,7 +1,5 @@
-DIST rdoc-6.5.0.tar.gz 762645 BLAKE2B cecade491f0d18b2c50ec710cb27a28b6cb946f321503e0508e8d4802e93033a78867346eb1d68ca56884ea0d68d51d6fdb92eb61fa63034a01332e8b572dbcf SHA512 10382e66ca778f85f236614fe071b2b0d598065d3aab8f5a89cb0839da7713b5e16a66e3f7a2bff2e2125d26a42f088a86c6d339dc36479a943bb7023c1cad0c
 DIST rdoc-6.6.3.1.tar.gz 766103 BLAKE2B 15cef9df763e40e105155d49c6c0c1a449c366ac35ab6036c43773c52114f00b19109b056033366b873b5b3317a3bf11c574dd76094d8f606fa0916a84257d0a SHA512 c6f3aae83e895e2de28e5a7c27456160dd53007ceb4464a045e0211473eb3d51f49a7c2ac28f2e44e807c5b36447140d15eadff65bfa52335e94adc9c8b56d2e
 DIST rdoc-6.7.0.tar.gz 767264 BLAKE2B 7bedae692e84e6b0b587dbcc4b8ff59401d5ef012bbfcacdf9d8ac216dd9a0c90b43c8cf61af2584280387ee7eb6c869b0a3205f9fcb4d4e1d98b0f326102a51 SHA512 d53fc591b6c8ead457c0fd04d3d20039fa1820d65d3fee0d8d0c584ce49a9a58f30d5bfd8fe6fd02efed77bcd8fa0c2cde8342430a9be483d17b31055e58570e
-EBUILD rdoc-6.5.0.ebuild 2732 BLAKE2B 254a80d4442f1179852aaed6a98aa7ff488c1f87cc8c37ecde832f4954979091ea17b9b6e9bcc12fb649cb257803e58a5aed549e37664458be9c5672d5a41fc2 SHA512 1d5db6b03b09668ec089ca199cbe0a1b7ded3d7a1bd5e3abd40e2ce67381289f16e88d056eaf8ca2c5d446e714c066d98edc299a84f8bc68b705640ad04f86f6
 EBUILD rdoc-6.6.3.1-r1.ebuild 2756 BLAKE2B 3b252bc5fca8a32a78a3b1e1bdff796e4c46f73f4ba6570603656be2e98c987f4586072d770fbf80396c785bf0f39a089e1dfcd087d1351dd8f6d5ab0c50fac8 SHA512 da89ddbee4843fda2683a1e79a9b6d8463a8b87692d1098c7d50965ca66d2a088bdd8e0f1ac941a6dfcb0c82b1944b66bb851d19e32554075d902ab9b0669422
 EBUILD rdoc-6.7.0.ebuild 2764 BLAKE2B ca106a67fdd00d48928306dcdab968e8e977766019342b16c3850aeaa8f14a5ca688d20330a9ab1765e0ac83747dc68b125c30117482b8450af13b01ba6e873c SHA512 d2dfcf82e351f0f8e031b7ed105165d0405ddcedb8fd2f38acea24d6c0f89d46523324c6017940c9d5257a60c9fc1fd016ddc6748d2394765dd19aee0bc7822c
 MISC metadata.xml 336 BLAKE2B 142894745c624081f44dfccc6509273287120a43ceb8d7471634d92ab970bbc7747ce12b3a770b085c8c55a30f2c52ee34e0f27ba4be804ee2056150fb3b035f SHA512 438973812b1541e96ffd4add9422bd19e2c09f3f5b8ddc3ef86a670827c6bce9ed9c1bf9df0601927c959584b63a9d0986d0377807856ab8301fc8a8176922e1
diff --git a/dev-ruby/rdoc/rdoc-6.5.0.ebuild b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
deleted file mode 100644
index a49d07120345..000000000000
--- a/dev-ruby/rdoc/rdoc-6.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_rdepend "
-	>=dev-ruby/psych-4.0.0
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
-	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -S exe/rdoc --force-output || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_compile() {
-	LANG=C.UTF-8 ${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 8234fb0cdf17..6c28fe31dfcb 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/bigloo/Manifest b/dev-scheme/bigloo/Manifest
index 253356433576..2f1dcd83f1a4 100644
--- a/dev-scheme/bigloo/Manifest
+++ b/dev-scheme/bigloo/Manifest
@@ -1,4 +1,5 @@
 AUX 50bigloo-gentoo.el 110 BLAKE2B 520b6b4d89452d3c9479c92b3f2f31e46e7761bc2c03fd62236e277ff1f9613cd237ba799d7349cf8bc8311125d3548956dc1947bd8d79cb72349dee723a9190 SHA512 73fda359d7c09c291eb1c3d38d3352b57acab0e800e2d89ee815a1c58202e8a5603abe847409e58bd69ea0ed7245abbb4a60de4fa8285287523caff47f19d6e2
-DIST bigloo-4.4c-4.tar.gz 47714106 BLAKE2B f30775cfa3e29f781f31dc5ec80087712504ffab528a911e2a29746562b6179b03cbfc63a45ddf337b2424fbfa476005ffed67674a75b4629ab70459c47147a6 SHA512 b1a7f7f610303dbbd7339ac4f80679b07d1bf5304865fe61f28bd5af8205f1a5c2b5b3edb1c47a0409a6392a2242d2adde1f5129b026b6a7ee022b8f5faec157
-EBUILD bigloo-4.4c_p4-r6.ebuild 5524 BLAKE2B 09f65d70801c7b8f03d83a27d4b085b47356da163c7514f7f517018b94015be59ad69f7710583162d72712d042b54e7225cff27e60cd0946a4d497da2149b23b SHA512 51a00a4bcb5a2bfaf5930f3bf114c3ebd087d29e8bb6c414fae0200a5be32d5a59090b5338af7a98743d9d96df74284f72c64565b1a7cfb5accadf3094f6c5c2
+AUX bigloo-4.5b-makefile.patch 1314 BLAKE2B c92cec0a597ef53ae748bd56689b92aec05f3a84003b46082482aadc82453d69869970dcf163a9e036fd2cab64d1bd813fc7ae416d05c2033d58b800a283d388 SHA512 e886a5bc9c5aa1fb97b4714c404e74b4cc7819aa75296969b32004f32ceb0de6b4d95fc30f79952e66f84565bfffa37bc2885d20ce0ed4e2c003130235197b1c
+DIST bigloo-4.5b.tar.gz 59015812 BLAKE2B 8dfa73da5ba50a2ec92adde7c9c3fc76841bc0702139238776af2c174099aab85ea28b5d2ec640b6d85f986759b63950f3cfa55e8ec2eb2e73930093b767c93d SHA512 7810f9895ea373f716cd2c93a7b1072d289e2b333632b5b4f293a6317f31a56d2b098790763e96c2d15ce212dafb45c70ec6a7941a344fb8c53a3ef3c6b67feb
+EBUILD bigloo-4.5b.ebuild 5617 BLAKE2B 63018703611fb6ccd9e07ac4e40e8d70e820620f8bc1e83ec4e83a0202cb660ecac3f417b4b93ea8c537d8f51f2caf1b33231a48047e5d7d291ff0417089adbb SHA512 3dcae165f0310c4e7a280ec9f3eea57918ba62bf4e3eef2836ee5f39a055c829e318d62b68ab2377d78cea021c03650c52c970b023f6d724a8f0c7748160af2a
 MISC metadata.xml 1113 BLAKE2B 20eec442cc5ba556fb5e30dc225bfeb45851be9ee1bbf111662ba3eec8573275754101d863145874cf778e27715792e1757189c2e4cec8ae6d320800e22dc0a6 SHA512 fb58869479a3310d1eac93ecd8127f2759fb93c45a73d1d2835802d201c6fb0a95592238521b7c385bea1d27d83da650000685978067dab272615f81e6ca5c4a
diff --git a/dev-scheme/bigloo/bigloo-4.4c_p4-r6.ebuild b/dev-scheme/bigloo/bigloo-4.5b.ebuild
index 4fff4bfd6313..15820af36235 100644
--- a/dev-scheme/bigloo/bigloo-4.4c_p4-r6.ebuild
+++ b/dev-scheme/bigloo/bigloo-4.5b.ebuild
@@ -9,7 +9,7 @@ MY_PV=${PV/_p/-}  # e.g.: 4.4c_p4 -> 4.4c-4
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Practical Scheme Compiler with many extensions"
-HOMEPAGE="http://www-sop.inria.fr/indes/fp/Bigloo/index.html"
+HOMEPAGE="https://www-sop.inria.fr/indes/fp/Bigloo/index.html"
 SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa avahi emacs flac +gmp gpg gstreamer java libuv mp3 pulseaudio +sqlite"
-REQUIRED_USE="flac? ( alsa ) mp3? ( alsa )"
+REQUIRED_USE="flac? ( alsa ) mp3? ( alsa ) gstreamer? ( pulseaudio )"
 
 EMACS_DEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
@@ -59,12 +59,14 @@ BDEPEND="
 DOCS=( ChangeLog README.md TODO.org )
 SITEFILE="50${PN}-gentoo.el"
 
+PATCHES="${FILESDIR}/${P}-makefile.patch"
+
 src_prepare() {
 	default
 
-	sed -e "/^ar=/s|=|= \"$(tc-getAR)\"|"			\
-		-e "/^ranlib=/s|=|= \"$(tc-getRANLIB)\"|"	\
-		-i ./configure								\
+	sed -e "/^ar=/s|=|=\"$(tc-getAR)\"|" \
+		-e "/^ranlib=/s|=|=\"$(tc-getRANLIB)\"|" \
+		-i ./configure \
 		|| die
 
 	sed "s|^ar |$(tc-getAR) |" -i ./autoconf/ranlib || die
@@ -94,6 +96,7 @@ src_configure() {
 		--cpicflags="-fPIC"
 		--cwarningflags=""
 		--ldflags="${LDFLAGS}"
+		--gclibdir=/usr/"$(get_libdir)"
 		# Installation directories
 		--prefix=/usr
 		--bindir=/usr/share/${PN}/bin
diff --git a/dev-scheme/bigloo/files/bigloo-4.5b-makefile.patch b/dev-scheme/bigloo/files/bigloo-4.5b-makefile.patch
new file mode 100644
index 000000000000..a9604c76c77d
--- /dev/null
+++ b/dev-scheme/bigloo/files/bigloo-4.5b-makefile.patch
@@ -0,0 +1,36 @@
+diff -ru a/bdb/Makefile b/bdb/Makefile
+--- a/bdb/Makefile	2024-06-05 17:06:40.098823516 -0000
++++ b/bdb/Makefile	2024-06-05 17:06:45.520796235 -0000
+@@ -23,9 +23,14 @@
+ #*---------------------------------------------------------------------*/
+ #*    Booting bdb on a bare system                                     */
+ #*---------------------------------------------------------------------*/
+-boot:
+-	@ (cd blib; $(MAKE) all)
+-	@ (cd bdb; $(MAKE) MODE=final mode)
++boot: blip-boot bdb-boot
++
++blip-boot:
++	@ $(MAKE) -C bdb MODE=final mode
++
++bdb-boot: blip-boot
++	@ $(MAKE) -C blib all
++
+ 
+ #*---------------------------------------------------------------------*/
+ #*    Populating bdb                                                   */
+diff -ru a/bdb/blib/Makefile b/bdb/blib/Makefile
+--- a/bdb/blib/Makefile	2024-06-05 17:06:40.100823506 -0000
++++ b/bdb/blib/Makefile	2024-06-05 17:07:40.738518401 -0000
+@@ -80,9 +80,11 @@
+ #*    The implicit rules                                               */
+ #*---------------------------------------------------------------------*/
+ objs/%.o: %.scm
++	mkdir -p $(CLASS_DIR)
+ 	$(BIGLOO) -no-hello $(BDBFLAGS) -copt $(CPICFLAGS) $< -o $@ -c
+ 
+ objs/%.o: %.c
++	mkdir -p $(CLASS_DIR)
+ 	$(CC) $(CFLAGS) $(CPICFLAGS) -I. -I $(LIB) $< -o $@ -c
+ 
+ $(CLASS_DIR)/%.class: %.scm
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 81df11cfd10e..8ce7d4077243 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index ace283c630f3..aee2a5d28b39 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -34,6 +34,8 @@ DIST lua-alt-getopt.doc.r56414.tar.xz 3320 BLAKE2B 5c165fe265ef36b12f4e4552fcde5
 DIST lua-alt-getopt.r56414.tar.xz 2008 BLAKE2B 9fe768e1070b66d076b6083b0f8a5f4c6320b5081d2218584dc5acbaa3c1f5978cd75215866d68bc933b933dd07c6fd29b376c1676369bb2fee64395790b5eed SHA512 60ad4731ac61f9b5c4360bb3d0c6475e2abd358418e20bed29cc94761fdfb97fcf02829b9785e559ca6052a1e82ee7f0b104b166592b9fd87237679ac3caa2e6
 DIST luahbtex.doc.r66186.tar.xz 30240 BLAKE2B 9f34b53e124b27e90a0fb68dcdfb9cfd0c365941cf21bfc6d9a3ec3f623ca27d4435627c1a0eb5402527b8434afb5e72651f3fca3553fc1ea4242945fb563efe SHA512 3016c12de8386af715932819701a6da1b106c504a7d13ba9bb5a04999737709f474b50c08311c1d4c23b5532ba7c1546cb0585e5375babbcd2091adf52d05664
 DIST luahbtex.r66186.tar.xz 460 BLAKE2B 968bc635fb4bfe101aea1d13a32dd259b77e2e15a3a1d81b9e7ca81699b1d40d393085ae1031ca57e906d159409f441c748396a8f5ebdef0a30d9415a2a7b8cc SHA512 30b1fcd361cff27688c65ecffbcffc65053696200abfccd543a14253b53a35de2af53b37f7ed1580510a8c63293d2d002cf4d9fd2d44f86678e2ecb09f02e4b8
+DIST luajittex.doc.r66186.tar.xz 30360 BLAKE2B 9011b987bee46fa3fd857c4a7c122911e5e614857a74ba6fafc18a768bd99c5c87a6255438c5cf5841e4a2f0aeb53137244313326d3276408591d90259c9b078 SHA512 7637835fae934f4fb1aea954270281a986733d0e0592204346edc290f2cd7d5200ee2fa0d9e15a27be8221c3c990a8c3d4654e314f96441a65c197d3bd259129
+DIST luajittex.r66186.tar.xz 484 BLAKE2B 9832037e5fc311ffa73cf68b63b5c462d9619c3351d8c0801c83d949c163321886d3ce1c9cca8158f288d63d169015e734a92d7ab20d2365c6a2cc21e22dcfcc SHA512 21313a5786f2bea08ce55db3a7beedabaf66f3331bd0eac1f8f3d7b926f68e103b14b1a5beaa271c37b60fc56735cc180e424f91db62f6e740530a65495d8e82
 DIST luatex.doc.r69182.tar.xz 1956816 BLAKE2B 43dea0a99a1db57b98447a8ad58a7c4e2dcee975230d1ba54b5fa700bfd6ac9eb80dc1136e8a71266c35b350650aaef48aa73edd1b9557f9a7a7ef79f48ffaf7 SHA512 36a5dfb6b7ca09adad807d2fa74df854363107eb3fb514977e3ed8c69eeb1181a19a55a49eb8c001a3532601c0a222a3ae9d130827caa19864df03705af7271c
 DIST luatex.r69182.tar.xz 13432 BLAKE2B cebbf54237e3d908746ad7510675ab6b98576ebb61302edcaf360c4cbfd039c7b5f422adc123e21cd2656d975484922d0e0d577326a518f7c87beafd8f5eda77 SHA512 5ddb75ca2e358bea261363cc19d39a37a9e467f9cbf4f8006f036a96fea61cb00f86c4000c09d7dd07f71f9b9a01ec165ddefb862aa84f0bc3da6a387ca1f42b
 DIST metafont.doc.r66186.tar.xz 53096 BLAKE2B 46b3696de3af1c116894bea54cedd035904cd31dcfa7724a55e4bd37ccb3541cb9ed92d2f392743baafb94004a9b4a1c26d48d054b537e20149bc9d2d53da474 SHA512 48b1def32bfba5ab1123712fe41d69f979e33a77456801c21f030de8a39b37fcae179db44a517d7b194d7e6e6eb93d770e179ca49db9014cd433c86ef91b07d0
@@ -127,5 +129,5 @@ DIST tlshell.r66771.tar.xz 33104 BLAKE2B 2abef9f4ffb38d591930a407078e3be3c13a85f
 DIST unicode-data.doc.r68311.tar.xz 3864 BLAKE2B 9a7b3122e02dd004c8199cc7636bc9c37f952e98b4980579a538ed859a6d5cf4879f6928046a270433fcac2aacb50ff2498d046818cf18ca1b167d82f2eb7590 SHA512 a8e147ba4d30bf80e1c1bdfba67bb3a0ff9f765c5d41734aca1708adb58c5c357a17401383faab827477fc837ac1dbbdcb55ee0b3146acc737c094d6984709d4
 DIST unicode-data.r68311.tar.xz 304228 BLAKE2B 59c072cdbaea633cade9996cd992b2495ab61f8d40b7c32d3f7c0cb8cbbc3ec4ba055aecf48a547f0770b5e4655312d1ce9a31e6671f8199e3335f20305e60ed SHA512 9e74ad2fd167a913e004aa77c705f0f8b3ab3d8e717384ee150db076660bda4e2651bea97292ef9e747d4e2519d9ffaa113947dd5241f830c3e4d653ee061d71
 EBUILD texlive-basic-2021-r1.ebuild 1535 BLAKE2B da645c1ca5cdf1c8e1ff90ee9e2494f0370bd38ad5c32a6b1f27ba748aef6baac250a68431ef8c034f71341ab1e3224403f53c7232ecb3a65131a90e1db9a784 SHA512 21abb5ca7ea857722c090005cecf9aa3165766f6c8305d6d13a1aa830d1343bb8ce67a5c2081ba549acd45c17cf26efce8e3e66ed4b8fd019b32388b616def4c
-EBUILD texlive-basic-2023_p59159-r3.ebuild 1963 BLAKE2B 447524f6fb523f2d9383674441dff5f85d2b1099cba57de8b41450e3dd6cd492757dbcedd6d1e25d47ef2ca5522c127240ade5bf1b072c864f75e0117e5863a8 SHA512 288e5041884d43d69e2a3d1270b7fa4df80b819b62f8b3b0ec0c4d0718b25b9aaf3033b5e491630db145d1b13d0fe4f9a3e1e98e0c8a825ed4fd68e6d2fd432a
+EBUILD texlive-basic-2023_p59159-r4.ebuild 2143 BLAKE2B 43a12bb25e86151918494531049b7f77cf781b06d937cc764ec77c4be389abc028d8ce0d48dd69bf89ad8d84b2be1c302ada3312ec1235a8885bbedeaf0e3808 SHA512 93cf293056178ddac2e849b90806787167d4143e73fc89700fc8ca754fd1ac508ecfd88d7e4a653308b36a41e21ca1448bfe018971091142927a84c98de2978d
 MISC metadata.xml 689 BLAKE2B a38d105c0e20629e4bfd6a9d8e6262ce4fb6ed3048a3e813ccdf7471b1a3f64a043e7033779d24c4d88b51c47a362c09a4de9828897a31b8a601ffc1245bcca2 SHA512 5b5c99a3cbd1290b661618067b97fe767c2695dfa1c26188ecc7c4c4af48405d60927dc70588ea79ccf35828fd5ff968e9826a52ad1c45ade2a6aecca71845f5
diff --git a/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r3.ebuild b/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r4.ebuild
index cdfc7df84292..4cc55a415891 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r3.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r4.ebuild
@@ -22,6 +22,7 @@ TEXLIVE_MODULE_CONTENTS="
 	knuth-local.r57963
 	lua-alt-getopt.r56414
 	luahbtex.r66186
+	luajittex.r66186
 	luatex.r69182
 	metafont.r66186
 	mflogo.r42428
@@ -50,6 +51,7 @@ TEXLIVE_MODULE_DOC_CONTENTS="
 	iftex.doc.r61910
 	lua-alt-getopt.doc.r56414
 	luahbtex.doc.r66186
+	luajittex.doc.r66186
 	luatex.doc.r69182
 	metafont.doc.r66186
 	mflogo.doc.r42428
@@ -95,3 +97,11 @@ TEXLIVE_MODULE_BINSCRIPTS="
 	texmf-dist/scripts/simpdftex/simpdftex
 	texmf-dist/scripts/tlshell/tlshell.tcl
 "
+
+src_prepare() {
+	default
+	if ! use luajittex; then
+		rm -rf texmf-dist/{,scripts,doc}/luajittex
+		rm tlpkg/tlpobj/luajittex.* || die
+	fi
+}
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index e5416a1fdb7c..c74aaf5466bd 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -39,8 +39,6 @@ DIST context-visualcounter.source.r47085.tar.xz 6744 BLAKE2B f8b6822fe8a488888f8
 DIST context.doc.r69665.tar.xz 84867548 BLAKE2B bd7a8817a865c9d3bf7ccad0de4f13333760592a615791c58b7344edeae4bf3ae0cf1394097e81d290f3f4d4752599aaee0d5178f4c399dccc1edce52f47b1c3 SHA512 b2558db5417c5c1ca10dd80be258fca33d9e5fd1b16c3f1baa7c871bb4d65e42a75c95336ae988864e7c4dd350c722eaa96c446839ca6d147949b38fa78461d9
 DIST context.r69665.tar.xz 8275472 BLAKE2B 04d8bb1c999639276a5637df82ca074b1982816e7aac30d407b4d1623ed5678ad175724450a5e9dc3de3f95c142614761383c1c297a3b20cb8f50546153b516b SHA512 8951a79ae04a0bbcf7ec5f4d5f68e0f6ad3f79cfcce7379523b9bc74dc6ce3d0f07f628f3e182198ff37d313ca549b7b2512eeb28ce4a9c5460ec20ed7f2d2e7
 DIST jmn.r45751.tar.xz 40048 BLAKE2B e3f6d9bff7a3a5d438a688baf76c0bdd58797461c0020929031b07f47d49b59359d791ac237165284e48951075c4512619be880e2b3dc1bca761e4703a3050dc SHA512 2e250c3f115911c56f9b8d46d358fdef289c624a5b24c9b4213bbf7818bf42c7b778df55d4bf181bce115b388915cedc90ef7cfa99ee6ad8dd621e7853fc7c29
-DIST luajittex.doc.r66186.tar.xz 30360 BLAKE2B 9011b987bee46fa3fd857c4a7c122911e5e614857a74ba6fafc18a768bd99c5c87a6255438c5cf5841e4a2f0aeb53137244313326d3276408591d90259c9b078 SHA512 7637835fae934f4fb1aea954270281a986733d0e0592204346edc290f2cd7d5200ee2fa0d9e15a27be8221c3c990a8c3d4654e314f96441a65c197d3bd259129
-DIST luajittex.r66186.tar.xz 484 BLAKE2B 9832037e5fc311ffa73cf68b63b5c462d9619c3351d8c0801c83d949c163321886d3ce1c9cca8158f288d63d169015e734a92d7ab20d2365c6a2cc21e22dcfcc SHA512 21313a5786f2bea08ce55db3a7beedabaf66f3331bd0eac1f8f3d7b926f68e103b14b1a5beaa271c37b60fc56735cc180e424f91db62f6e740530a65495d8e82
 DIST tl-collection-context-2021.tar.xz 596 BLAKE2B 319e103a3568f2e4e6fd0ccbdae8b5ae97cf397fa97743bd2131a080c171c10fd20e3198676e6d419776a588241fe80ed122add0dd0352a188b5874d4e1bfdea SHA512 5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765
 DIST tl-context-2021.tar.xz 8353772 BLAKE2B dfc11d25bff6a85cc780c047b5c6cf6b664dfc39063414910cc55ac6e4abee76dbb82ceb5cbadde8134cf5ab602fe513f564ab696d231166b4b8877e36def79c SHA512 3351a0da659954026a8ac4f25c246f82fda0f63ded2a8dd1dc463bc71b237977b4beffa3e44ee932f2e22e7fbc396ffee3c70ad5a85d153ba032ad46040b176a
 DIST tl-context-account-2021.tar.xz 6324 BLAKE2B 7a519311c1b35e1ead942a9198d60fa652b6cf1bfda03214546e45107f856825623a7ea213fb6ff82829016015163c3b1e73f9e112e3bca7bd77da1c2cd3e677 SHA512 755ddb4c62a496873d5362df01307163c79d2a6c3fabce6ea01b442c16dad2f23d72909df71dd44eb4fbbf5c57366e20eb49bfce240807c2e2a9a52cbd76680a
@@ -117,5 +115,5 @@ DIST tl-jmn-2021.tar.xz 40048 BLAKE2B e3f6d9bff7a3a5d438a688baf76c0bdd58797461c0
 DIST tl-npp-for-context-2021.tar.xz 664 BLAKE2B 5882669c85f04553ad8d5f1722f4f27b967367cfb109ef782a90b3fc1fe42c8a898129f296e61e6ab3825447e798544109e1556533aeecad01137396058649ac SHA512 6d5da8b6e2f2bb6b514d43e8b72157a81285b6c15cbe74891a94f21a09a313813ebcf9e3a0a12847875f13d5599436ada4e5febb694c0a480931dd62a23035c6
 DIST tl-npp-for-context.doc-2021.tar.xz 2136232 BLAKE2B 241dd233f3faec33222496aca1c6a9823772af68b2daff4256f532e2f5a28634bf0ded0c733524a053b6b985472009409fd99ac0daff719f8c54f9b181f632da SHA512 b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd
 EBUILD texlive-context-2021.ebuild 3328 BLAKE2B 6e1bd326b502190278ce66a3fe5e6716d86e667baeb17ca72811b101f2891a57036707b03d9231905e3ec13587c30092c6c4df0c3b6a90ae5739da07441b4000 SHA512 ad0b3a2694e3deffd9555e987d261c5981304937c2a17463918a28b43093884f5db7eb2472a82fa39370e93b98ecd137cc87c0827362491a0243bdfdfae1ee37
-EBUILD texlive-context-2023_p69108-r2.ebuild 2929 BLAKE2B 23717473d9dc4d64b6583b07977fd55d554b669187ccdd42565fa452c69470e10960ec02025b3f4cdc2d3ef2ea3f79a0b01c1f6011dca579d51d258597855a28 SHA512 cf372349a2563ce9cbdd19ba2f5d50ebae3f0fb42678d1fe8aa86bffebb44680581e0c99587d5148ec92afb1523cdcf2b127fc782415e3dce51e5b2492157c99
-MISC metadata.xml 640 BLAKE2B df6206d129c39035f5a95f4e91613a5d1f87fa050e2f9b24836f0e540c9a7eae3e0448f98d4c5e2557f725a1797f6ba10053244ab61909e7e3ef8d362b6de486 SHA512 012bc4d22e234c3b666765b7d6430922350129d82fcc2b6ded7a24588d099ec74867304b8b4a5eb92b438dcdc6072a2900762c3cafa9075018426e57e1a5f8cc
+EBUILD texlive-context-2023_p69108-r3.ebuild 2834 BLAKE2B 50b5c79c5f1642a35746fee77d1f080e596dedc6ad83e78fc742331059b34a05aef365dae22c8d3cf8d140ba6ae914c83305cc7ad71d525fb8f4f50637f93fd4 SHA512 10916d28a67a2b20d0822650d68b7a8f69efcf6304b3aaf6a9308395d154652cf229e8a87e2ec08b631142b7363c37468bb7f9d76358a742ca4be133c14bee55
+MISC metadata.xml 518 BLAKE2B 4f1bb46596517c4ca589b5b42971521d7b32cb555a913db2739abe92e4eb4cf84ce1070f641105854ac4f82a6d9d40d07a4e76f1f8e79536ecaeeb38c4ca662f SHA512 1ca4088892a62994ed83929c8ba701a732dc46104d253469a4a6a98e183262ce010d2e7402fe181126c2b956690479e7b3f673cbb967c04cb86c15287636d58d
diff --git a/dev-texlive/texlive-context/metadata.xml b/dev-texlive/texlive-context/metadata.xml
index 631cd7535765..a91e8498da9f 100644
--- a/dev-texlive/texlive-context/metadata.xml
+++ b/dev-texlive/texlive-context/metadata.xml
@@ -13,7 +13,4 @@
 		Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
 		Also includes third-party ConTeXt packages.
 	</longdescription>
-	<use>
-		<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-context/texlive-context-2023_p69108-r2.ebuild b/dev-texlive/texlive-context/texlive-context-2023_p69108-r3.ebuild
index eef6029a8067..8115ed68681d 100644
--- a/dev-texlive/texlive-context/texlive-context-2023_p69108-r2.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2023_p69108-r3.ebuild
@@ -25,7 +25,6 @@ TEXLIVE_MODULE_CONTENTS="
 	context-vim.r62071
 	context-visualcounter.r47085
 	jmn.r45751
-	luajittex.r66186
 "
 TEXLIVE_MODULE_DOC_CONTENTS="
 	context.doc.r69665
@@ -47,14 +46,11 @@ TEXLIVE_MODULE_DOC_CONTENTS="
 	context-typescripts.doc.r60422
 	context-vim.doc.r62071
 	context-visualcounter.doc.r47085
-	luajittex.doc.r66186
 "
 TEXLIVE_MODULE_SRC_CONTENTS="
 	context-visualcounter.source.r47085
 "
 
-TEXLIVE_MODULE_OPTIONAL_ENGINE="luajittex"
-
 inherit texlive-module
 
 DESCRIPTION="TeXLive ConTeXt and packages"
@@ -71,7 +67,7 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	>=app-text/texlive-core-2023[xetex,luajittex?]
+	>=app-text/texlive-core-2023[xetex]
 "
 
 TEXLIVE_MODULE_BINSCRIPTS="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d6934069e97d..1ff0718d3dfa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7069584ee0bc..33e1ab992236 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -4,6 +4,6 @@ DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 373f3fa4a340e14461ab4881ae17cb8266e
 EBUILD catalyst-3.0.21-r1.ebuild 1918 BLAKE2B e3a4746c61239f51104456b6bca825a7d53deb3d696e7ef3d366958d5db527b929171cdb51d93817cc97146dd7728fa81df71e157f06f136dd6dda81e34c7418 SHA512 589a9d89eabde0d71f2a23e1e0a424a3b6aa0f05c41ed7949afd42425316166c1b9369cfa04af1308a48e53ee31ca69d3e352139a79073eeb860c640b8f3808f
 EBUILD catalyst-3.0.22-r1.ebuild 1918 BLAKE2B 3f76b8f2578f78564fcf3797391aa9b8670cbf0d0f12a8f8013f8f81d4aba8176276734608e50185782393b8f5698851b8c11368130230576aa3b1c24903a0b9 SHA512 e1676547fd7053be871b2ceef7ff91c2bbdb0c3174a0277eb9032a8e0b7e7920877c28052f169cede7a3f9f03cd94c75cacf337372df69f5d94ce83929c6f7e6
 EBUILD catalyst-3.0.22-r3.ebuild 2133 BLAKE2B b4d2cc49991cdba68998064a94d9f165b424ab542dc0e2275db610b7289b53aaaa7f8bc8ac8d60383a68020afc3ad71904cd11934439d258d54f04a21a74b1b5 SHA512 11d1cda758912972796093397576d558848f185ac0629749e6b6733ffcbc4b2d5caaa808eec4e203cd62c98ff9519db9cafdd55a3d69d77430990b47c5e38d31
-EBUILD catalyst-4.0_rc1.ebuild 2790 BLAKE2B a36f28b51caad1706d6060444e3250450f22574476dcc62bab54c16b6a1136cf7345ecdb46795e2e8542ab0da20c1919949dd53b032a554eeccd8053913bb51e SHA512 4fa36ad7b5c1642649aa2cfcfc78e1d12dcfcd4b1d0414ecade8184d45768741820bd9d48938ca12397b98ad2197867d3e6c6eca8268baf9097cdb392019bfa9
-EBUILD catalyst-9999.ebuild 2744 BLAKE2B ff6931e1e5d2fdcb5a531de6ffee58bb461b3ee6701d46066acfc474c2d7b39d09e2b45688d92cea50db147ca898d6919a61bf7c1f07513dace494b43160bfcc SHA512 a614855b5c88193bcf196ed4ddd6174360ca9f92ca3b999fa84218c398c5d10b785a9963eb568e9bc5a605c3146280eedad39940abaea7a00f71371df0246133
+EBUILD catalyst-4.0_rc1.ebuild 2790 BLAKE2B 180ba3de6172a758897d28d0e455c54d3fe72f2ef0b68c6fda650f0852235a8271dbb378d59117282536deea2f09734d7fde326c0bd65149712a8345b51160c4 SHA512 e7761cf37af91749a8687dfc3508a8c1b4bbbab7f9e6b78ba1a66cedfa85c17d4e7f5ca302329dd64d98ab678d131fe23cd9bdf80f3673dd2352e2c39cf3c2ce
+EBUILD catalyst-9999.ebuild 2744 BLAKE2B 0315b42c45012e7c56a43879333d7238980db05e94345edf6dbebe2438ea36aad8eaa8e3b1d1209c098a6d4ae024506498894757087a5711d8eb82e204fcd87b SHA512 84d50dd2a4b36003b96fbf89be94db8237bbfbc5b150fdc34ae950f4090ff2441cd866d83fbe327f28d4b763870a95338f8078283b687b33fd29d4c285269903
 MISC metadata.xml 652 BLAKE2B 798bed21d492c2404691dab86198b443b72c43cb0a68f8476bb6d31167d19168930fd2969bdd384fcbae0efb0285b1a0e6927ce4eeeb3a995e617e598ff2cd6f SHA512 ae5920383badc6d4678d3efcffd55a20693c711fd12f358e12daae5f131b7daf4df5171ae73de93b908798772dac193b7564f8df352682f8e323aab1f1f66b13
diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
index 9bf921904e91..7bc3d781337b 100644
--- a/dev-util/catalyst/catalyst-4.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -15,7 +15,7 @@ else
 	S="${WORKDIR}/${MY_P/_/-}"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index c5bd9ff2d041..541b54e2bacc 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 04c221484d75..27c0997a99cd 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -16,7 +16,7 @@ DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B e800b7bdce705db3ced97f0fe008e8391811f9c
 DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c SHA512 870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
 DIST ccache-4.9.1.tar.xz 583764 BLAKE2B 9ebaf335fda54666e4bfc8f2c402f2b908b3922f3898b6a739b0256481256c6121546021b80fd2dbc93f3aea254db63a8624b97b2820b88e73e502a243bf2562 SHA512 5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b
 DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B a157b0c2c0777732d9a51fb7519f561fac098bbac9ba33fe453b210a6e9a34372b5d00b0fa940d2b783ab0eb48e7bc98707de884b191d83120d9ad8239c9fb76 SHA512 43605eca0f9a62565486c6c7ff622fc4d18a400518aa9c9e3c9d865a99c40c63a6a09d42ccd3428d28575c4de8a69be89c93830d26261d3479792e67179d0839
-EBUILD ccache-4.10-r1.ebuild 4030 BLAKE2B 4934d641ae30145a47b8b82f20e22507643632650017a7c61fced2e17ea5e1dc222958d9a104afc342f95f516e0b811dd987cc5a3637ea5dcd55e41b0f0064a5 SHA512 d4e227d9396e9bfbae7b5ab03038e2412bd8fa5276d1895fcd8aa375f4f357adf7d1e2373b997bbea9e8ee2802d1336e117ddfbae1ad48a0859504bf41af644b
+EBUILD ccache-4.10-r1.ebuild 4036 BLAKE2B 635b71e88a8c8e31ae716e0eb81738a4929c657dd86d3f0f6b5317881cf0b349b56f5ac8acd9b769c4e463b606b0b610da57381c558fe39872e95d059486b7a8 SHA512 2d66be32242ed9409b3c5b7be4a4ca846d3edf088c1e452fe57d2a5d90b20e8105f71377de804831856765f0963580876ba0f6313a235c4a65b7cf8482d5cf81
 EBUILD ccache-4.8.3.ebuild 3752 BLAKE2B 0f308f104c92a68219f1a54b2122f6913030eaa59d72fe8730d0cdeff62d4db234146d4d2e6abed64f5c86b770ea335c8a06788590b6d23d040d869ab8e3347c SHA512 bec7baf39f9f603fa242be8bfba506431e1de7e8c8f182a6f1b15fe14823748478dc24db2672282831baadb65153a1a20d19441ced32c56f0da6ec2ccd68d190
 EBUILD ccache-4.9.1-r1.ebuild 3786 BLAKE2B 3e41e799c604cfc5ac812fe89e9db4e48684a72aeee08c6a0a281d01df9a9a892bd5f74713ffdceac450419510df8c5fac06a5a1aced7ec6e552d777968f3bc0 SHA512 af2a9f19eaad9512be78ccf8657ae0270f5d872f084cd9edc7978630b3c2219010cf58eeb108c734a0cdf04e513c3856c3f60af84b97ff3d0015a2eed724bc59
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.10-r1.ebuild b/dev-util/ccache/ccache-4.10-r1.ebuild
index f78605776994..7507908b00db 100644
--- a/dev-util/ccache/ccache-4.10-r1.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index db5f42ffee6f..e8574520e30f 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -3,6 +3,6 @@ DIST cookiecutter-2.3.1.tar.gz 273620 BLAKE2B 0f2122b0c9c46ece8da03d4431d4ace3bc
 DIST cookiecutter-2.5.0.tar.gz 276288 BLAKE2B 8f294d39a385909cf9c23511eae2ad28783ff8da767e31744ded45e4ce15857039d913f5449523a20945328547263f4887d73d44a951b4b29b628fc1dc25c229 SHA512 87ab0d21d6bb98c96cad420a52e08aeebe9a47ee34801a423339453e0099c4eb35950e0180af94dd5dd9373a0292a23c6a5c3bde23d3345c06b059da1294c374
 DIST cookiecutter-2.6.0.tar.gz 277486 BLAKE2B 967264bdf2b7f7ec7d2466d530e9ab6f689f88bb8537f833f76b952f4cbec07cfdf8c17c3f9690023f3687a8aab66ecb5dfe609e58ed933f1fcd2fc2174938f2 SHA512 619be103bb831cbe9c50c4fa5114d6151a462a29a233f8999305403dda449f90a5900940a2b9d98433a8cdd3dbad421afe6feded42f4bcb6ee83523570ed2c1e
 EBUILD cookiecutter-2.3.1.ebuild 1370 BLAKE2B 9d6934ab9091fca9e91432d5714e85fc81df1a56b5a7f4b8281a2339409711fd247e8d12b850f120c87021dac4899263194ec5842abd21d7dfa0c7e838ac0a0a SHA512 a51e54faf453efcc9fd783990b0af2ab8feb3812b7d5927f25fd4ae30c5ab65df66a8ed896cbfc4fcbebcb3234c2a3d115969472ea7803eb90bda6dd134539c0
-EBUILD cookiecutter-2.5.0.ebuild 1378 BLAKE2B 5d6bfe6a8ce4cf7642c7ece9ea8720425b026be306906c5638d8860eaa5164e557f15907caf5d34d3f89dd82ca58f4ce95697500e49f79b6381a61258805f3f0 SHA512 e6b35023e7b0fce23725b8081379f41259a67b62737b9286a2ff2da686f953804014d41e4da239126453a38ab11e369bc2f013d9d8f646d8fd3bdb94abdd7f0a
+EBUILD cookiecutter-2.5.0.ebuild 1376 BLAKE2B 8ca411889946425ef3cff61775a58fed8469292a22525b9f888f055933901a4270a2d4e00e310880a2a7269767ad70d15a61ae3d4bc6a45ad0fe503f7370ecde SHA512 6472a0a112c7706caa696ee97f178bfb29a07af5c6d8ed1cd2d85c608b9d9fef9b3fc5c758504c814867c242de1e172dce1d2314077ed44a52f8c10cf2d61d1c
 EBUILD cookiecutter-2.6.0.ebuild 1378 BLAKE2B 2db99816c40ed25f495421e20ad2f282b030e36bf3d938bd329ee472eadd74db2bfd747bb38933222de0b5fc1981f0bf4505a384eb3b4478d97f40d42136d623 SHA512 2de63bff490d11ee2dd8948d632751dff97c4fb9b63e3d9466a256e1e79bb447c9d75cfd0e2acc8cab251e2e20c0ab5c6a046c3638950091d55fbb226c9be882
 MISC metadata.xml 478 BLAKE2B 26a0ef11397a266f9b64252c88ffa45466adae6959d3f95d3d7c815a4820430dbd5de1b66c3dae57d4a6b947d69efe57e9eea5c448d288e7ceca3ef8b507356d SHA512 22ac873e11794cd7b00ee09d8ce643e018214f36b5bbc5eb3b53ef65cfadc2a9d7c1ca1515ea22657c9f0aa4afe041e45262280f53927f29a317ce4d2fbbc83b
diff --git a/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild b/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild
index f4f2ba68ec1e..c041dc6dae72 100644
--- a/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/arrow[${PYTHON_USEDEP}]
diff --git a/dev-util/gitlab-cli/Manifest b/dev-util/gitlab-cli/Manifest
index 10c67b494edd..4059fed7b7a5 100644
--- a/dev-util/gitlab-cli/Manifest
+++ b/dev-util/gitlab-cli/Manifest
@@ -10,10 +10,13 @@ DIST gitlab-cli-1.35.0-deps.tar.xz 47876656 BLAKE2B b76ba63c98fdbbbbeffe38340722
 DIST gitlab-cli-1.35.0.tar.bz2 16809995 BLAKE2B d0b90c8dac6f27b21f740c2538b1c9b70af1a0bb29c852233c3b0d8f694e95823c29ed17b2e0f45ca7b27fdd388ebeeb0e8b3574f694d14f0cb5ba9f78b3b571 SHA512 fb462914cd7004508a247a81d52a9812b70ecd51286a1a06aafa6d1c63ed086ae6bff8aa6311d279da6a23a0efff623280abb68df2c2fc91678f877783325249
 DIST gitlab-cli-1.36.0-deps.tar.xz 47874044 BLAKE2B 6d0c2a70a22c4baffe0bd015f10de302e6866e8c05b76aefdcf83123ddd7b8b1f30c3a23474c9364e0ea2bec96f770ab86bf26b3424048750210995ec6cb7a56 SHA512 903aed99128bc4b34cc51125e78cdd28f52ca2468ceaa792d3ce76280631a51078e7ad55198c98aa7ba3d24421ba1faf4a3ebed2b418557a54781423844ea3e0
 DIST gitlab-cli-1.36.0.tar.bz2 16818985 BLAKE2B efae5cd8e9a1851f61259d463b3b772035cbc07c4904b202c259e56af45d22ab5d3ae4865a5d3af781185800f45002249bf2d31065120d36365fdc2942bc6896 SHA512 77114f90f9cc5752761e3dc54590f6886a343484a24738068c78341f4625802e2ae2aea7e183ed568916c5beb9863a09698762945e6b8eb2fca9abc7292a5426
+DIST gitlab-cli-1.41.0-deps.tar.xz 16529512 BLAKE2B 263d605ad70546e47984e2ef229f5ebd1ef2709c6f7e1ccb07f60807c16e0f6cdc6881d698454688718da54eb1b386a3f4eabcd9aa09008cf3eddf2fd34c5f52 SHA512 d6565eaac2dbe443080c6846fe0bbb42214ad52414d6885cfe91ce53c93f6d49e29cd2706d650f3a7c34a7d095d1a23336846571ce903faf292e85d983ae5cf2
+DIST gitlab-cli-1.41.0.tar.bz2 16825512 BLAKE2B bdb6b271ae78b43fb721f48cc5e2ed272b5fc95b0f2f24b83b5816fa73a6eb276b677dca57ce207453fec696d89b6518846b10be9cf8cfb87a0e964a8fcb5bb5 SHA512 349393cc5893d1a703aaa8bcd933fb2981ed56a071fed662fe775524132b8c09326a61fc626b60733694146f0cf42cf71a0f3cfe45161135a15025c1f3d2969f
 EBUILD gitlab-cli-1.28.1.ebuild 761 BLAKE2B eeab83c2137cf556cf9ecc1f97941fbb808c3df1ce7d9137fb62eb86e2ed574bf454eced1be24b785a00d4cdd004e2921c96863b632e17c62599ca52754a0316 SHA512 5759b1f9cf1e6a84a3a854aeb310cefdfb84a07bf9290082e365d34f6de8d40cb24d5180a422c0c544b16ee6e56d6cd378fb528b157bfbc8ea1ee8bda2643fe0
 EBUILD gitlab-cli-1.29.4.ebuild 761 BLAKE2B d325afadbda01c64d8d94f4f9a4aecc22b0a0bf85ecd288f60ad2e276da2679cfd586f8b9f1c529880fe44ea9988820f799d570789739dc56f46e596643bfeba SHA512 4d96944fb2c67a7883d7866a296f74aab42d7037dbb14bb94a70d5e2eec7f86181ec65440046c30a7c59cfce5abbf0f2af3d2d556d856e71554a66c1fd7f7338
 EBUILD gitlab-cli-1.31.0.ebuild 761 BLAKE2B 065e135dbff8ca709739ef3c09c5fda33b373b1d1ccfbc63a55bf54e1ece89150a4678d304c5b6e739064ac44108669830e22151df22aac974b82fc38805b089 SHA512 2f19d72ea968638b2169365fb5c6d98e05be121dabe353a2ca72049e2e87796ada6b6f0a4b75aabe205f80fc547587c9c380213443190286343601dd172ffa11
 EBUILD gitlab-cli-1.32.0.ebuild 761 BLAKE2B 512f1fce3fcd970be1f1ccf1cfb429d542d2739177c9f4e5c9563ae0f527099b3258bc3d5713c2dd9539574a4d1d8e13e7bfb20b88587aed40bda53fa3b3e8ab SHA512 39bb47f3921c079677c2974179b43fac0f82d8c0fc4442cbcda26402b6ae86da1c09c62f2046918afd99ab2c92c6d6ce57c87741bbb3e9ad67e8f0d969dd2932
 EBUILD gitlab-cli-1.35.0.ebuild 761 BLAKE2B 32afed6826918498de1846b7ec6c9fb46baebd0c87050539f2952014b4df7ddc406598023d4893c1a4d25a76d033bc0d076152305faa88e249cd04bc9261e819 SHA512 6f3b7301127f283824c5eb973428f83859f7858857491406726f575bb567e812981b9368a65fcfe5a0dc19c27df558022cb4f7632e89b64ee10eddd32c190dc5
 EBUILD gitlab-cli-1.36.0.ebuild 766 BLAKE2B 8ab209b3378b94ad542dfd429030b08a09ba7a607ff3de6430017407c37a962ddf3885c3875db75244c6c6cc08ceed69117f8e6f6cce79921aafb926d4d0fcc9 SHA512 48eb71898f9c039c317bdcb01a5aa8c9000be2b28c40341072c78adcec3e1d9e7e9e648d523009a9ec8dcabd4a6571b6178221fcec811a6ca48db5f70180d92d
+EBUILD gitlab-cli-1.41.0.ebuild 766 BLAKE2B 82a738b6c9811cf69b160a052d8deabb3fbc1e637787c96b4834d7c549881c6f21b36974a7a7d45f994d5ef640769ae1e5f14fcdda6819711fe42aa7e86aaeab SHA512 4f6a4c48eadd103ab066fce1aaf2be943b0e11ba5e22fc22ad057de5dd2c710e2a03233ad9d17d0f9d46789e338bfc8ad3ee364ff99ad9c5292267ce4488e1cc
 MISC metadata.xml 328 BLAKE2B c15cee65978853695fcc911a6beb02ac29f8e82d7a82417989e497a0c014a2c5c2c22503cf2c099600e0885399496d0e7ce3b3590c8b8cfa0f6ecc6a63988d46 SHA512 4df241882ef7e722711132110271b672ef49913a92e9d70972857968e7d12a8403f5b19b5079fd78f3f08fb4aab8e615b51a6073db2c460aa2ae3ec31d8e3a28
diff --git a/dev-util/gitlab-cli/gitlab-cli-1.41.0.ebuild b/dev-util/gitlab-cli/gitlab-cli-1.41.0.ebuild
new file mode 100644
index 000000000000..9f497a5929a8
--- /dev/null
+++ b/dev-util/gitlab-cli/gitlab-cli-1.41.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=3657f322c1dabbbc3b6d31567df8d2c8adf16162
+
+DESCRIPTION="the official gitlab command line interface"
+HOMEPAGE="https://gitlab.com/gitlab-org/cli"
+SRC_URI="https://gitlab.com/gitlab-org/cli/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests communicate with gitlab.com and require a personal access token
+RESTRICT="test"
+
+S="${WORKDIR}/cli-v${PV}-${GIT_COMMIT}"
+
+src_compile() {
+	emake \
+		GLAB_VERSION=v${PV} \
+		build manpage
+}
+
+src_install() {
+	dobin bin/glab
+	dodoc README.md
+	doman share/man/man1/*
+}
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 57242088ed37..8899a7a47e4c 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -1,4 +1,6 @@
 DIST gprof2dot-2022.7.29.tar.gz 33948 BLAKE2B cc96bcf0cbce2159f6a03bb1b7d3b2e89212a2acdb948fbeb947b8664ed34123102792476d16d11b7b2bdb269aef9ce54a7224a355c5390fe6010e82bc2df189 SHA512 347e24c11f4ca3b5d6b50dfebb158f046e64aa302549b82949c5e089d081c741c9936272d45d378f3828d3d824ed632a98444e6aa3dc1a3b9b86abc27738bcb8
+DIST gprof2dot-2024.6.5.tar.gz 36539 BLAKE2B ed1d2b9417004b30e6c345302e5d081386b593c5bdd606342854a627bbd1910d48dc9bd0263683f13b0df31b4beb0acb6de06760bc2ec97a32e27dc0bb99dd3a SHA512 b81f01ad1c31862894831881142ffc38f598feb201cced53adf11c485885e0f25843bdf86ac106a814dd537932293eba2163eb55efc2361ebf70e4561032ea3c
 EBUILD gprof2dot-2022.7.29-r1.ebuild 427 BLAKE2B fa7e23623beaed11bf1868493afd40e1e0f4839452667bacd1c2f4a6ca66fd5f084c5c76e38b3b0609d52720115aa3749f65b4edc5e49f42910c4bf976b60822 SHA512 9f35ba5b1366bf8d09149e7f55811034162b28b9c391d0ecf9758f7db53e507bf7ac0eaa8ff0000a960233b23b6b0d3e4e46a6ff37da871db882ffbafd219204
 EBUILD gprof2dot-2022.7.29.ebuild 427 BLAKE2B e0dbdd4f535ff6c8dfd8f84d9a6cf88f7785dd91702414a810f17e2eb9834ab61e3bc6e1af2763c658ec6753ac1ae8977ff4271a7f37f02b3b1a310d8cede8a2 SHA512 1e141fe7b1cbdf6fcdb8f4aeefb3a5a8ff6dd7fd7dd4b1de35eb8df26a8bfb76272a02a4336e9480fdeac5be56c8ea54efc08a8daf915b92e0bf94c93edf8c7b
+EBUILD gprof2dot-2024.6.5.ebuild 427 BLAKE2B 0c766bc0b27d4c4f96e788c81bebd33d53c60543ac47923f9f20432f36a11f2ad8617354ec3a7de797eeee1f761da650bf7f711208ad21a056c3bfd45f90fbcb SHA512 7c44a5369631173c5de1ef7fe4037a5718897299b40981c3ccc52ea67bacbe95fb1622e0d984c567ecfd2c75afa84db288621779171f6e93a3a2baeacbe124d0
 MISC metadata.xml 381 BLAKE2B 2931140d66e423ae23ad825406f02e390a90ca75ad8660aff8b76349074cf7c877754c72ec0295bbba625ffc1fe33b218f288ed49b1df823b4f7264741121122 SHA512 a2c8a71badb61131a7a75c827176801310da9f242407a347d7715bbe570cbc0baea93481f7a0074b8fa3f0a2c236bbd892ed7832a506f5312c28bc77a176e0cf
diff --git a/dev-util/gprof2dot/gprof2dot-2024.6.5.ebuild b/dev-util/gprof2dot/gprof2dot-2024.6.5.ebuild
new file mode 100644
index 000000000000..7c934ff49e65
--- /dev/null
+++ b/dev-util/gprof2dot/gprof2dot-2024.6.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Converts profiling output to dot graphs"
+HOMEPAGE="
+	https://github.com/jrfonseca/gprof2dot/
+	https://pypi.org/project/gprof2dot/
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 7b2318da6b25..657391e57469 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-24.0.7.tar.xz 20144724 BLAKE2B d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce SHA512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c
 DIST mesa-24.0.8.tar.xz 20170168 BLAKE2B 1919e99e6ccbd51c8e74e55985ea9a3f47bf49c7e4260a195a609ce175eeded9fc5a56970ae35d21bc650e4bb802df484d2088b29ef3861d13942bd495891a9a SHA512 1e1be9b50c2a404a96960db87d2ba4cd1c602445f9ab8acfb6a8a023410063620c2ef891fe516afec3d830756e0b0f4309ef50c6caeefa44e164b414c4708b10
 DIST mesa-24.1.0.tar.xz 28994008 BLAKE2B 1558d20d426162bfe8cccf96107ddbf1373c8322f87f48daec73e23b283e00f95d6efd073cad9b92065928af4b9b4a339ff2d204412070eca903f77ca366e619 SHA512 4b7ed1940fc812ef4efb55978d3ffe3d0e2ae53d5b57a3baca10a52db2ba5852c5ee7e75c3739bd8d384c80bf1cba970a384250050f01f03bba98f255e12cec5
+DIST mesa-24.1.1.tar.xz 29019256 BLAKE2B 152ce5f4847a321689bf4aa88529963278f7dd24097c4c3de2b3a9164d06cd23d7cccd96bd31fea88311ded576c834a73e2d669e6d290404283f33f92b9bf262 SHA512 a23fc2fe479f21027095a7791042148586b23da848474209ca4fecfe5c4d499e66fff0ebfa06d07ed9f16b5d6a2ef755b362cb6079141aff5fdc47cc571e3b1d
 EBUILD intel_clc-24.0.7.ebuild 1741 BLAKE2B b4fc7184409bedcfec1cd559149b7d57b9a5bd708cc4aea847c47573cd194804e3435a15120914fadc4bd5f9172e946d93a9164a875809feae2cc7589a36f74e SHA512 d9825be298668fb6bc933ff6131c5a2d18b76bbcb9b6ca2176512d7a4273cf42f5fe00097478a4cd3e9c678fa53c8a95f83115c4f569ac37eebe940749ba340e
 EBUILD intel_clc-24.0.8.ebuild 1742 BLAKE2B d1e9907d5bf31fad49b648899ef86805c2b6fafe656e934179f9db17cdfa9a9d9a8a94ad57c6556a4f0d02b207ea32a57db8f1dfe6c5f0f1416637dcc5064644 SHA512 f1b41578a6297a7fa7bc48c16dc8fafce59bf9b58a9131168c9d9369092b5332f31e469388b35c98b799f694e43e868eec96b23ea6b9a4f745c4546c8ffc459b
 EBUILD intel_clc-24.1.0.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
+EBUILD intel_clc-24.1.1.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 EBUILD intel_clc-9999.ebuild 1748 BLAKE2B 1546870b9ef18aeaa21da10acf8edd2875015453e22dc15ee3c2bf6e37afab1454f83040af343c7fec75d5fcdd8819e4ff0a8f56f27691b6a78c6d5438601efc SHA512 3981e62ce60c42485d2faedf58ff68f261d264c5d0fa891b0db41cbc1427a9cdd761b2119afbbd04f37b5ec34d9ec516cff233a31445d72af0962b570e0f3c1b
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.1.1.ebuild b/dev-util/intel_clc/intel_clc-24.1.1.ebuild
new file mode 100644
index 000000000000..df38191345d0
--- /dev/null
+++ b/dev-util/intel_clc/intel_clc-24.1.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..18} )
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit llvm-r1 meson python-any-r1
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
+HOMEPAGE="https://mesa3d.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}/intel_clc-${MY_PV}"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/mesa-${MY_PV}"
+	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libclc
+	dev-util/spirv-tools
+	>=sys-libs/zlib-1.2.8:=
+	x11-libs/libdrm
+	$(llvm_gen_dep '
+		dev-util/spirv-llvm-translator:${LLVM_SLOT}
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/llvm:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}
+	dev-libs/expat
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	local emesonargs=(
+		-Dllvm=enabled
+		-Dshared-llvm=enabled
+		-Dintel-clc=enabled
+
+		-Dgallium-drivers=''
+		-Dvulkan-drivers=''
+
+		# Set platforms empty to avoid the default "auto" setting. If
+		# platforms is empty meson.build will add surfaceless.
+		-Dplatforms=''
+
+		-Dglx=disabled
+		-Dlibunwind=disabled
+		-Dzstd=disabled
+
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
+}
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 2ac66bf0c826..70faeef78119 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,10 +1,12 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
 DIST dwarves-1.25.tar.xz 2244876 BLAKE2B 1926fa1fa123fc3ad0f7f063406260b1e1e2611c563fedebee4c837e491164571fdb40408421c0c4ea2fd24e89c54a7a1ea669313b6dd6d7dcfa4934e2c1336e SHA512 104bfb8712d863e04d0c827c008b23ebc49543b17bfb5b44ce276a5b3d39f12cf71f721055ae2e5f430aa77a3c70f85f6eeaf72fd8c1cdf547260488bc5b5070
+DIST dwarves-1.26.tar.sign 228 BLAKE2B 211f73da11d6ed61383fc0470c298360e7acae5fbeb2f963533fd3a984257f35b5626f04de9de92326723f06bea95a38903cee7f602146b12b1333cea2b720d0 SHA512 2f92951019847cddbfe90cd0e49a5746ca4886e25a9f8e26697688bec25d667255556bdc1ab897021eaa739d067a8d3e4fbbd0d7c9f7f56934676616fa11bce8
 DIST dwarves-1.26.tar.xz 2250036 BLAKE2B cb86bf964f22633432e80d335937379c2096877c6130f49dbe03f2653b7c932bb1c5d87621ac93383be9e4f35294a4f95aadb6392491fb782812db519b39b666 SHA512 72e3c708ac6304d28daaab1c4365b66252d016987cbf33ec6d18456718478d7b96d6916dc3686069a386e97a9db355bb1e5e078c0c7b40e93bd7e8bd0b0380be
 DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
 EBUILD pahole-1.24_p20221024.ebuild 1693 BLAKE2B 3bafb0ab2e9278c0ff0f1af9f571311983d6545eae411b271e5bde9d5416d4f2c4dd5b671b291fccd0b03f6fbe5c99c92d620b6b91c1ae6edfb6f0b05e3f7b0e SHA512 0f9de7b39b1747e780322cf56e8a646e9980ee2dfcc4eecd2ea1d37dca369dae05c643a7be39898f0ef0264dd5a98890a600b282a7e1d759d0fc7c72fd8c4870
 EBUILD pahole-1.25.ebuild 1700 BLAKE2B 12734f1ae26bed113c61cb05386a0c9e57b3fae8aeeb9c54b117ca8f15456a529e1d2cd5656000662917c4c07e46e32da0f8332c1577ff0c5ebf6bcc98c19b83 SHA512 1c3fc2ef434ee988ad79fca27163fc3fd645faabe45d2229e6bee4d23c38f0ec59ad4255b4604db1b321b871fef83573d70e889af859e58422fd8be8bfe8411c
+EBUILD pahole-1.26-r1.ebuild 2289 BLAKE2B e398314c181ec3b462df196a18a4ebc7fb17edfae2e984410ef1842e8a8902480e1d345143dcf6def32ca2730449db675ce01f0f21300f57b0b38accf3257ad1 SHA512 d22965ada402a545e7f3a5b886c6e5a6844c5f8d716ffee672eb34afcdbb6dcea3239af240d84cc096b29a109ea77ef14c1dc9e75ceab98f8d4b526d098bcfb7
 EBUILD pahole-1.26.ebuild 1699 BLAKE2B bb9e555b23f0e59ba92d581234db077c8322d683c508363c1d85b485d0579bdf24818ce6d5fc180eb188c79df2acb3cc2dc56398a9d645585384395c8252c66f SHA512 4d0676ddd17feb8b744450b4258a8b39ec0f5d92252e6574cf4afce94b9f6bfd7ff9a7d86509e4cd9579240c4d4c317c686bfb4b2ea312921ede27ea52ce7859
-EBUILD pahole-9999.ebuild 1519 BLAKE2B eafa78fe33f44043e333f2b554b0c0929c0548195de0f85e4073daeb703aacedd1d03c858fc7f85d870720d0c1d62e1a11fdcd89d98653b6900560a385511b5b SHA512 b0029fb308ba153bae71b96c31605e6ee2e92a49e9f27a6542a9b8ba540b2e79c99675df8703d8a1e1a002e4905eb176f575c0876a853aa7fad51d7a84505a6a
+EBUILD pahole-9999.ebuild 2289 BLAKE2B e398314c181ec3b462df196a18a4ebc7fb17edfae2e984410ef1842e8a8902480e1d345143dcf6def32ca2730449db675ce01f0f21300f57b0b38accf3257ad1 SHA512 d22965ada402a545e7f3a5b886c6e5a6844c5f8d716ffee672eb34afcdbb6dcea3239af240d84cc096b29a109ea77ef14c1dc9e75ceab98f8d4b526d098bcfb7
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.26-r1.ebuild b/dev-util/pahole/pahole-1.26-r1.ebuild
new file mode 100644
index 000000000000..e9c3238b4568
--- /dev/null
+++ b/dev-util/pahole/pahole-1.26-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV%%_p*}
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/arnaldocarvalhodemelo.asc
+	inherit verify-sig
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz
+		verify-sig? ( http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.sign )"
+	if [[ ${PV} == *_p* ]] ; then
+		# Patch rollups from git format-patch. Sometimes there are important
+		# fixes in git which haven't been released (and no release in sight).
+		# Patch rollups are a bit better for understanding where changes have
+		# come from for users.
+		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
+	fi
+	S="${WORKDIR}"/${MY_P}
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2" # only
+SLOT="0"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	elif use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		xz -d -c "${DISTDIR}"/${MY_P}.tar.xz > ${MY_P}.tar || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
diff --git a/dev-util/pahole/pahole-9999.ebuild b/dev-util/pahole/pahole-9999.ebuild
index aaef5d2f6e6c..e9c3238b4568 100644
--- a/dev-util/pahole/pahole-9999.ebuild
+++ b/dev-util/pahole/pahole-9999.ebuild
@@ -16,7 +16,10 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
 	inherit git-r3
 else
-	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/arnaldocarvalhodemelo.asc
+	inherit verify-sig
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz
+		verify-sig? ( http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.sign )"
 	if [[ ${PV} == *_p* ]] ; then
 		# Patch rollups from git format-patch. Sometimes there are important
 		# fixes in git which haven't been released (and no release in sight).
@@ -25,6 +28,7 @@ else
 		SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
 	fi
 	S="${WORKDIR}"/${MY_P}
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo )"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
@@ -44,6 +48,27 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10-python-import.patch
 )
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	elif use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		xz -d -c "${DISTDIR}"/${MY_P}.tar.xz > ${MY_P}.tar || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
 src_prepare() {
 	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
 
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 6bab416890da..caf5f7877b3c 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/wmenu/Manifest b/gui-apps/wmenu/Manifest
index ea4d802c3641..cac7fdb8fac9 100644
--- a/gui-apps/wmenu/Manifest
+++ b/gui-apps/wmenu/Manifest
@@ -1,5 +1,5 @@
 DIST wmenu-0.1.7.tar.gz 19052 BLAKE2B 7aa1ccc5a8f4ea4fd0252ce6fe31168fb8346558093df0a72d29023fa2e8c38cec9562f1d4bb733abc3b00ba4bf952dc29ef22dba373db01a05229b420791a7f SHA512 2e949bc1b14e74b65aafa523a01acda3cb7b546dbd0fb4d6561ae0fbae9a017eaf15962e6231b9cd81df22f870477725c2279c2cb1f3d99ac802701b788a306e
 DIST wmenu-0.1.8.tar.gz 20353 BLAKE2B 3d08de95d9a85d2f8d28ccf2a0cd9fda4db93e9ff2cfa4198c40d6f0963020036a91c1e825dcf32ed3c7099f7d250653a55f50aca701acf835f42d527345c4af SHA512 de57f92e80cd4ab02e18e91df7cc4c923464224656f4f90adaf4f7788e2884ead6fb21dba1527681e63c64b5720d3c936abaa46259fcd8d7146d73feaa6bab93
 EBUILD wmenu-0.1.7.ebuild 601 BLAKE2B f494703de05ff5bcb15c4ae6fb9db17b7da291f8deefc51da4752a52f549d2c8a70b205def4fb760d29a2ab5af9d01e710d08dac797b44b5acad87e397ab86bd SHA512 196a2086df7fd8735078611fc70cf5d02339f0a459ac991397f2cafbcf3214f02f5989f33a45c2c984c765d4d33be7c8574a81e2158182a02731f1e14fc859e5
-EBUILD wmenu-0.1.8.ebuild 600 BLAKE2B e9b1a4c7cd56cae823c175f6a324bcf4606b780655847252957fc10cf4a05e95afc132f26f47dc9228fc037f6c7f2b3ba4dd31c01f0f918fb330cc50f371ed5f SHA512 d7a8d17ea288e013cf73ac2387bc199fe1e59c0f6a5f1bcba27e144a2e0207024222db46df048be155ab26e6f986514e5390635b4ab9fb2852c0a42105de86b3
+EBUILD wmenu-0.1.8.ebuild 599 BLAKE2B 5e9e2f7166f120d608aa62e7aab6a432ae4a63abd99edfde825409d47673cc586e4c808f3a2510b3c0bae5ee2ed5190431a9523bf404902b33c6b27f9cdf2152 SHA512 d12353d03d152511f27a90c5fd8c90eb9ae1ea32b0c0944fa6fbdd821e83df95e10e62a5dc8fc4e7fd36a97ce38f2ea1131ab22fa53b245e28a711f9ae068703
 MISC metadata.xml 491 BLAKE2B 9792de3322622a9942634b437df771ba37c51d44373a76a286a8d78862129d1f4344a4efc64f64edec181ceefd8a31814da0c0623f8abdec63db3a93acc95d8b SHA512 65f4415602b32e69397ae5b2080b2780f79271ca1bea8b9ff98d84a3b0f2da15c6966c46805e18669d01a14594fcaa033602f2dd888db729f4a0f36cb9df07d1
diff --git a/gui-apps/wmenu/wmenu-0.1.8.ebuild b/gui-apps/wmenu/wmenu-0.1.8.ebuild
index 086cf143faae..6ba9bf3934ae 100644
--- a/gui-apps/wmenu/wmenu-0.1.8.ebuild
+++ b/gui-apps/wmenu/wmenu-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.sr.ht/~adnano/wmenu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	app-text/scdoc
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 4698b5d8ec2f..5a7beef32ad6 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index aa80a214baef..4e01e1201371 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -5,6 +5,6 @@ AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca615186659
 AUX wayfire.env 80 BLAKE2B ff44da0d760ab3ba5e68009e4eea3112d4882331fd678b286f741bb87e2319c87e48d689318fe99a79bb6af3127ec97a99de8994f5c18d96086cc7f3d1e68160 SHA512 2118195fb4ceb6a994043a4bd5608ee9bb104dd769cf3ffba449b053fa05a6e7464ab9c3f812bd0f9bf4ed73eb7f5e2afa1ee48373765b8429317efa11089cd6
 DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
 EBUILD wayfire-0.8.1-r1.ebuild 2471 BLAKE2B 49d1238ea8136959b2acd3504a2a72a81b340660de7ba28c8935833e984a1b95272db93793bdc685aa9f9de7ef2c8500b3eccae143199f94a5f5dfa5a6dd3c19 SHA512 a8ac07b6ea9c6397345b5913dda1910a89976d36d37414f8debaca2c225c7ce545dc472b92aafec66f611fd91097dfbfdc7706d33e4abfb98aa14c70e164a947
-EBUILD wayfire-0.8.1-r2.ebuild 2280 BLAKE2B 147c76241aa0465a6e48a423fb33f63358d5b64f187b180c5f5baec38b9b361da191e87d16215699b9bdb36cdedf48eec483de13130e6a0dd415c7db50ae4619 SHA512 96e0ef86dd0b8b298c11389a6929b07e1182eccd8375b156838e7b03377411171967787af61a5e6daea232f9ce3b00f485f08ee370bf4ecadbba87222021d7a0
+EBUILD wayfire-0.8.1-r2.ebuild 2279 BLAKE2B ba1a9beee31e3ccb8953712516e0c06b5e57eeefcdcf364f73911b051fe914ff984d12c0c4eeae9431deeb796a00148734165a8ddcc7897de617fd704561ca35 SHA512 70ece1a8e70894c8872d9773cd54bcf4037b9dea1e9cf4db4426e2d4031714b4f7b926eea4fcc9daae2c1f032702aabfb02889315e257532323eab54f3b17052
 EBUILD wayfire-9999.ebuild 2204 BLAKE2B f99a53028c1b2cac6922f71a9e250857767c45692bc2d252fc58c9a6c855a2966ccbf78c364d9c9bcdf5e9c21c4048307e6a2ccb15bb44c9e4b575615acea2d3 SHA512 65f8095127deaa1433c0625e059322bb0ce73ef485677c5e848191330eee0df0682cbed29610b177b2257a5b6e204d9bf7cba689cc8fe5852a109966487dacc0
-MISC metadata.xml 1171 BLAKE2B 9517f1c85eb2f85a578d512d163a3f104ed8d621ce19ac42450897b499c033eff8bd121dd472946154c49b75151a01f282f39af5c3967e3192ec029db38b2d0a SHA512 9481f8f77574f9224b6e5ee3f4feabf2960b21b8331e16c4031b7d1f0068564a1567319d0e4246c5c918d4294d5dd7cca94fe015ca0327944c6047aa2c1b5f12
+MISC metadata.xml 698 BLAKE2B 9d37ee94b17887e40ddb08276d35380699c763326bdfeb307aaca933131f0bbdb0e7bbc2b0e6e06324127c6d85dd926abaf7d266f07cd215946fcfade114a78c SHA512 03b6a16d957b86c822e042c599b310bd3ae1f0d1fe6e97afcec27d0d948e742e1545f605eb3905c4d443f5bdf7174ed838573e7bf50344cab2302e6c4618a7ed
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index ed72465ca08f..6a9c1dd0a5aa 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -11,10 +11,7 @@
 		fisheye, wrot and all other desktop effects to wayland.
 	</longdescription>
 	<use>
-		<flag name="gles">use libglvnd to do animations more efficiently</flag>
 		<flag name="gles3">Enable OpenGL ES 3.x Features.</flag>
-		<flag name="system-wfconfig">Use the system-wide <pkg>gui-libs/wf-config</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wf-config</pkg> from being installed.</flag>
-		<flag name="system-wlroots">Use the system-wide <pkg>gui-libs/wlroots</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wlroots</pkg> from being installed.</flag>
 		<flag name="X">Enable support for X11 applications (XWayland).</flag>
 	</use>
 	<upstream>
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
index ff1a84e65576..886e64833e05 100644
--- a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
+++ b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/0.8"
 else
 	SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 	SLOT="0/$(ver_cut 1-2)"
 fi
 
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 390d8fe6ada6..0d1418f64ce1 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 8250745f7d54..b48e0b0267da 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,4 +1,4 @@
-EBUILD kdenetwork-meta-23.08.5-r1.ebuild 998 BLAKE2B 50b86aabc409cdd57b0ac65c99baf9609343881e4d961d3c049a70928fb7e5d4aed34b95c9c3b437d34c9513643fd16480e6c42942e4cb826c38c174c733bc83 SHA512 a0dffddac168059bd2a4122643607881afce52306f0fe1f6577dc3e260a5e8c91c9e1c1691669030fac13f17ba6d1df609c1db84ff41ad259db100c328607d0d
+EBUILD kdenetwork-meta-23.08.5-r1.ebuild 997 BLAKE2B 2f7488a191e2e8188f5d8a9ea5b416b3e2109af8f91f48a590fefc0a5c1ff01cf2afa45fcab2f5cd78fccdec3d9cd581a654ede9094f5f73758884ed5f83777c SHA512 44fcb6e2b96666063a604bdddff93d3707365d807eabbb40194496c11ecc2a54bb32a87284f8b207caa94b765e739d12cfd8a273e908bda3370e5de9e43b9bf9
 EBUILD kdenetwork-meta-23.08.5.ebuild 862 BLAKE2B d0910f45ac49679e93addccc0fa2ac3a5db14169e8492f3d64d991af38deb3a1b2d14d318c984a5280fee8fed2bad8f990136e377f1b76945824bb8f884a1fd5 SHA512 eb72cee122d58c80be7c8ca2008ff65fefdaa363b18f5b6385b269b4e9aa1abb18e5c67195717d62008bd2f8bfe1ae5f79496a0426311a058f4d9d88180de8a6
 EBUILD kdenetwork-meta-24.05.0.ebuild 980 BLAKE2B 8468fc8686e80ddd5d3dd1a56135e7c7bf6201b02cf5f8c73e0af48eb1b06fbb5849c0114f710d61af9893de3e00901a07d58950cc386048ecb407722d844ad0 SHA512 7f5cabd6b71a5f8f5d86318295187645c93413ba892c67b1f00612529e756a3b22ca045cdb4e4a9bc659d5e4cb98acfd9da6e6fa347325faae52317d74dc346c
 MISC metadata.xml 901 BLAKE2B 66a5e4bbf4c77c0f5d281d16ef0ce673b39a90c00c3d39aa31dc95bb83a0d012d32bc3a3da4abd327c2ffb055695cf578c9564cf7e70e99514fc589f7d71af73 SHA512 8c9b7e4e33b544f17d7a8ab75f136bc3e9ecb0c213dd525a5e58a4c46aae3cfce16a0b3fffb21838a3848b699061b54fc34ad971d8795a92e4e6973e94dc3a54
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-23.08.5-r1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-23.08.5-r1.ebuild
index 3dffc4568cd0..12ea6a0dcc1b 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-23.08.5-r1.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-23.08.5-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
 IUSE="+bittorrent dropbox samba +screencast +webengine"
 
 RDEPEND="
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index fae42c0613ef..3640040291b0 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,6 +1,6 @@
 DIST konqueror-23.08.5.tar.xz 10092644 BLAKE2B 5e3cc994e459e27288909e803864928886e4392ff1e430042182e13f428e3226a5b510cca2f3f5dfbb9311895d885dd1f3cb888a2f4ef61e5feaa9e22f9f5311 SHA512 8f0ebd03b24de9723800edd9a9c6dd6de5fe272e7a0702c1e07de4aa24fdbd7dae47de8afec07fced9c1d4fcd52a66fa0bad674f68a94499c7cc4bbb79e422ee
 DIST konqueror-24.05.0.tar.xz 9712836 BLAKE2B 41333247af863432a2b98357bd984188bfcd9b3fbd90ccfd5bb1401a6742ccdacbfa299c11d7441888a7eb930fb3026ccba8dd1f90819fc93f4864f9b4f82c01 SHA512 d88392fd49c6fe732ea440316d9907627c2a6ac6e495a90e1387cc4dc8ec8764b97018b127645f4ac87b8732a3b55373985b2822d15907e586e9fb332764d7b3
-EBUILD konqueror-23.08.5-r1.ebuild 2534 BLAKE2B 633a7f92b252eec3433290f9d4ae4f0e9047672e752459e6431238369cd5fe7328a3f2a6f846a16e5961c9ae6170764274fcd7ea74a7678566348c489d8f37e8 SHA512 6dce7f272e2a7ed4615d4123fa543c856f90aa4eff1a020f19487ecf118de86cfe62766230df2a602025ab0208f1669a6446e749fd0e92f62b709eb478a1159a
+EBUILD konqueror-23.08.5-r1.ebuild 2533 BLAKE2B 6682ec5c600e349a404ee6d1322ffb5cfad6551896cb7a196b6fc3507a855d430a23606d48e38276ecfb98dc2a142add38c2d393e9d0d49b580359d927f1f458 SHA512 7b1d22751b787da995c811224d9e1bd04b7dbcfb7d58deca9181c4418e61baf73de9678ea21c007d0c3aed4d5d8bf4a633c906fbae1a299bf0e7a233e91da3c7
 EBUILD konqueror-23.08.5.ebuild 2440 BLAKE2B c6dac4542867fef7cb15b29366cf1acedbbb7b3bd9f5070b203e922c8ab0ab39004070d5d6e28dcfda34c7d5c1c28bd9631e6800c674d7204517936c3c965ded SHA512 d5dfa518248b6eafd059035b6966b5585a870b471f5adcb617e8c11526a468c6891e8b98fd117f9a0863684a00326efe20f40476307955646ef8fee499751d5e
 EBUILD konqueror-24.05.0.ebuild 2463 BLAKE2B 4dccc350fafbf4947063b063f8c60a091d82fcaf07a49673ef9425d1f87030efee62d2e4d9ab21e771d509caa7e764d1aba26892b4274dcb811a8fde3b6bc7fb SHA512 5c0fcfb7f5da93e63b8619c5948e2003e42f65ce955e8ad9bf3d3189954cbb19fbc5c7d2d21f5f7bf1a3a10f76bf9dbb0218ee33ba9678ce5ef30a4d363cd7ca
 MISC metadata.xml 450 BLAKE2B d539f48a8ef139115c8f671bcdd6793cecf7ea997c94e5de8c4108a6f7312d5e57dba2484cb864dd8b4026664bcb836a2088cd4163683f9628c566f692575068 SHA512 7daa66e0c44efd582423d5771ec09f8712524fb188adc0582a7a5b4e125a33fa623744842fb3ff83bc21ad45e7f7b622df5e5cb6d14421bfcefa04aa0f5c6cfa
diff --git a/kde-apps/konqueror/konqueror-23.08.5-r1.ebuild b/kde-apps/konqueror/konqueror-23.08.5-r1.ebuild
index a7fa776a3885..9ae3dea341de 100644
--- a/kde-apps/konqueror/konqueror-23.08.5-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-23.08.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 IUSE="activities speech"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 92c947b82b7b..81f97dc4a3d0 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 0aef5977b2bd..763ecf95574f 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -2,10 +2,12 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099c
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
 AUX plasma-workspace-5.24.80-split-libkworkspace.patch 1175 BLAKE2B 74dabcc26da223fb46bd97c2d07b5913ad51ab85a20062835dbb80b2a555129029996f99129ea9d99af76399722a404cf9baabbea48de4ab4392f068539f3c9f SHA512 95a63a106242449cdf605f943e794e07834b5d1e8fff2ad4e6a025fd68cc20fc6725ec0f0389898c4fe8c87587c7a51381b343cf116b2ff812236f0fe95ed314
+AUX plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch 2591 BLAKE2B c901b06d037750accab60f8edbd139578da1ed6514da8d49192aa05682c4b2a795663723f870519dbf15aada6367415e75030d0ec8754af54cb17a4d7823a11f SHA512 70b2e76a4b88586b3efb78f7833bcd72a71d2210023e5451d5c9f911c5ba5e8ec8be39c63d1765dd93842f5c0916427d1629d88205fba6d342a8a4aabfe31544
 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006
 DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443
-DIST plasma-workspace-6.0.90_p20240601-58ced80a.tar.gz 26020494 BLAKE2B f58ea1856d8697f5d9cd4bbd7b8d0d39a1138f1a921d206ba321bf735af797b2a1115970b8143d563c6e1ef2d75ff14612e8126d99de91272d2a55c7880e61c2 SHA512 4e7fa32ee6d182c34988b3ba23f7bd9a478804617f5cfac95fbb2c9c775e7c36d4f8f7a5913ac2cd1ad6de2b28255effef282faf853e946e759188ea66ac2903
-EBUILD plasma-workspace-5.27.11.1.ebuild 6967 BLAKE2B b5d9a3c8601222e0e9a7dfd1ca1f97e20fe81fc445b9942fd47471d7c895864279d66938ff7ac494569204dc9d11cb58308a8b8e302970180cddbbb10081daa0 SHA512 40c25e977d4ca76bdc5d2e1f5e66e158ebc068384487afd739fef8eec057feacb3a29d557d4ac9c79eba19f88c1a043d05a13fb86e57802f2a390ac2d61c84d4
+DIST plasma-workspace-6.0.90-7a700862.tar.gz 26019401 BLAKE2B b55350c62efc640e50f2d573b342d2db8a35651b0b4ae532aa87877e686d45e24042d93c936abe63e6abd14a54d66ddf67c58ac7534b58e4cb40064ac98e67aa SHA512 9896e161469f20ab06559b36cc0b53c1f73dd06dd3d0be0b1c7f3ff0ce239ca485f8bbcbffa73236b9027648b67f949602a3e0514bc5b449e07ebc01ea9d6738
+EBUILD plasma-workspace-5.27.11.1-r1.ebuild 7052 BLAKE2B e856954d76b596d2ef3071c4794589f4c31ae699a55867cf4ab62009d014988c28dd4f9fd17dc55d4f129ecec33612d1e2e456088c6d8a567bb0afd4a068d84d SHA512 e2a0f453dd9c58ae0bcb234f51a8523f9965dac759d803a4f4df8bf390ebe65b7cb3fb7ec76458a711067e0b5710da9ad86218e47664815e9e5892087410a01f
+EBUILD plasma-workspace-5.27.11.1.ebuild 6966 BLAKE2B 2e528c31a6fa9875fa81f29c72800efd708e8fee24e3a2e237101c752df38c0cd6c133c16a7ab3c50ea831b7ed545a4be7c9249a519785d7cf1f507311f531f5 SHA512 6d6cfa97d0363e80a72e6e16d0f357a484b8b83b6cfdbad9b03af37958a23c2e67227d48f87e270d7fae3ba6a2f70dac6e6649ee080a19cc3842f16c3dd4f416
 EBUILD plasma-workspace-5.27.11.ebuild 6964 BLAKE2B b0f634c84abf8dbe7067ba95ea4a5af67b729e4b980da844ff4f22740268f06a617a0621d3ec9e2f5a47069daec2f1f0b6b68eb160f8388a806645d59417be5b SHA512 cb4f7894270f1162ba15e5a96ea9e5e2393c436d86898f5de7f6c01255a4998efeb9f7b7ebe6095efcee42030c9da5fa75714cb5099abe477542832144e2f090
-EBUILD plasma-workspace-6.0.90-r1.ebuild 7041 BLAKE2B fd77ea37ff2f0cda61ce9aa81ac34bb8083af5b090871501c074e9b1c44e3d77cded9dc1932026a400313572683bb4eb5989d018ff1544bb70a25a5627dabe24 SHA512 9fcec6d80744eb1054c00054c2a0dd7c6d6239848b66e242c4c6c530583061663f3f0e5eda5f0a0d57c0304cfff126a6d4e9798aba18b08d035bc5f28ad68a72
+EBUILD plasma-workspace-6.0.90-r2.ebuild 7031 BLAKE2B 97e148ce89b63318cda7c6429d600f2876df2e01973616b4eacb1e9c27e9c534de81d9912fb6a82008f4293d57de6ba48641ffc1eddf6aef0f5d753cb741daea SHA512 92633d8ac1c53eab5ee8ecb05210979e72e54a5776d23d4139b76db2786d2c84eff3a505e6c15eaa12d28afe75184a274b6766a87592bfaa64ba0649f44dfc6e
 MISC metadata.xml 959 BLAKE2B 6513ae79e0cf24efd0bd33a16708950d36393770b51ea752c4c8c6e7ec63c7675dcf5e96dcfbb07d527ba910462b7c23afe35c55b4643ec69d1175660b245478 SHA512 8af28473216b00d4273be4bbb5d93adf8a4db79c46d9e97bd8b2822fa3920e8fc789042669bc93e6e9a6fa1c864a49fc23887be8456ea122a6d8b09e384dffbd
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch
new file mode 100644
index 000000000000..ed1b67bbd85f
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch
@@ -0,0 +1,66 @@
+From 1181acfe30557d6646511df8d98d82589878a570 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Tue, 4 Jun 2024 12:18:11 +0000
+Subject: [PATCH] Fix writing ICEAuthority file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 9398f6cf8933055b31506ba155aef2fc2b3561d7 "Remove iceauth
+dependency" introduced two bugs:
+
+1) "fp" is never closed, so the generated auth data stays buffered in
+   memory for some indeterminate time and the file stays empty on disk.
+   This completely breaks authentication and thus also session restore.
+
+2) Checking the return value of IceWriteAuthFileEntry() is inverted (the
+   function returns non-zero on success), so warnings are printed iff
+   everything goes well.
+
+BUG: 487912
+
+
+(cherry picked from commit 0dcf34458d99b07a3d9054ae0c86c656e0dfa7aa)
+
+Co-authored-by: Tomáš Trnka <tomastrnka@gmx.com>
+---
+ ksmserver/server.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
+index f88de40dba4..bba6b13ffae 100644
+--- a/ksmserver/server.cpp
++++ b/ksmserver/server.cpp
+@@ -333,7 +333,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
+             file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
+             file_entry->auth_data = strdup((*authDataEntries)[i].auth_data);
+             file_entry->auth_data_length = MAGIC_COOKIE_LEN;
+-            if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
++            if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
+                 qWarning("Failed to write ice auth file entry");
+             }
+             IceFreeAuthFileEntry(file_entry);
+@@ -357,7 +357,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
+             file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
+             file_entry->auth_data = strdup((*authDataEntries)[i + 1].auth_data);
+             file_entry->auth_data_length = MAGIC_COOKIE_LEN;
+-            if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
++            if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
+                 qWarning("Failed to write xsmp ice auth file entry");
+             }
+             IceFreeAuthFileEntry(file_entry);
+@@ -366,6 +366,11 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
+         IceSetPaAuthData(2, &(*authDataEntries)[i]);
+     }
+ 
++    if (fclose(fp) != 0) {
++        qWarning() << "Could not close ICEAuthority file";
++        return 0;
++    }
++
+     return (1);
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild
new file mode 100644
index 000000000000..2f283485e222
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry +wallpaper-metadata"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+# slot op: various private QtWaylandClient headers
+COMMON_DEPEND="
+	dev-libs/icu:=
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5[qml]
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=kde-plasma/libplasma-${KFMIN}:5
+	>=kde-plasma/plasma-activities-${KFMIN}:5
+	>=kde-plasma/plasma-activities-stats-${KFMIN}:5
+	>=media-libs/phonon-4.11.0[qt5(+)]
+	sci-libs/libqalculate:=
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	appstream? ( <dev-libs/appstream-1[qt5] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	fontconfig? (
+		>=dev-qt/qtprintsupport-${QTMIN}:5
+		media-libs/fontconfig
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	policykit? (
+		sys-auth/polkit-qt[qt5(+)]
+		virtual/libcrypt:=
+	)
+	screencast? (
+		>=dev-qt/qtgui-${QTMIN}:5=[egl]
+		>=kde-plasma/kpipewire-${PVCUT}:5
+		media-libs/libglvnd
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( kde-frameworks/kuserfeedback:5 )
+	wallpaper-metadata? ( kde-apps/libkexiv2:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.6.0
+	>=dev-libs/wayland-protocols-1.31
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/breeze-5.22.90:5
+	!<kde-plasma/plasma-desktop-5.27.0:5
+	app-text/iso-codes
+	>=dev-qt/qdbus-${QTMIN}:*
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	|| (
+		kde-apps/kio-extras-kf5:5
+		kde-apps/kio-extras:5
+	)
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/kactivitymanagerd-${PVCUT}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	>=dev-util/wayland-scanner-1.19.0
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	virtual/pkgconfig
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	"${FILESDIR}/${P}-fix-writing-iceauthority-file.patch" # bug 933435, KDE-bug 487912
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		ecm_punt_bogus_dep KPipeWire
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	if ! use fontconfig; then
+		ecm_punt_bogus_dep XCB IMAGE
+		sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		-DGLIBC_LOCALE_GEN=$(usex policykit)
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+		$(cmake_use_find_package wallpaper-metadata KF5KExiv2)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild
index 9c7c9a8d052f..837fa343fdba 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop telemetry +wallpaper-metadata"
 
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r2.ebuild
index ae655f845e87..3a173e96dfb5 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r2.ebuild
@@ -11,8 +11,8 @@ QTMIN=6.7.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="KDE Plasma workspace"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}_p20240601-58ced80a.tar.gz"
-S="${WORKDIR}/${PN}-58ced80a7b48d85b7a7743195479dc35ad1889c6"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}-7a700862.tar.gz"
+S="${WORKDIR}/${PN}-7a700862f820e6aff958ed7129b62fb2b771ac45"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7bbb75e9e618..9ec08533ab88 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index b5791857d0ec..865ff3ce4bc9 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,13 +1,6 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
-AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f99250c9c755c5650d38a4d427125b60245dbfb79cf4d94ad135f043ddde956d3241c091f901d7243b99d26c70c88af44414a7b674 SHA512 49004cea850f2e51a4266a574e7453e21afe1a7032e7a925717c7b0df3bbe187c5c0b79dddabbd002ce662fe4055171cc72ddff6985f611cc4b8c3280dda1fc9
-AUX exempi-2.6.3-clang16-binary_function.patch 1083 BLAKE2B 8b2ff17c17d2b695e56d200fe2f372e5e8fc731d2b28d70d7105ff56c282577e1167f4de27fc883c42bf205af9794c407cf2050216aff6b04a9a6fbdc3039091 SHA512 2fd6fed8206138246b721ff081861f589dd1b62ca595290b868292306e88fb34a76d9ec8e3366b47bd69b53db8e7f21e0c2a8f164aff5ab02a6154d8a49074dc
-DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
 DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4
-DIST exempi-2.6.4.tar.xz 2843304 BLAKE2B 35ae01db243825eea05fe946a958be78ee75c3e6bc3cd02bf5596bd0c9543ccecb285c93e2533c7ceba1e42b25266834bddfd6eda4fef351b384298cc638cfb2 SHA512 86e41e24e34150f398dffe3219f1530fbf14606feeee9953395bfedb335316ec90ac88e2843f2c037a564909fc3cc82a5cce53edb18219663a1b454cda6bef72
 DIST exempi-2.6.5.tar.xz 2843132 BLAKE2B bc8c347af4c9c7bf085311ce055bd1c7cd5c2b845c723dd74bbcdf104be018885a82180333dbdda3cf9a64a4125dfe0fa0904fbd05663c3a6c32e6a60a8ca2d3 SHA512 71a0830c7a547bd7304e38f307a17a5ca70d6d22bb94db93f7e6c0903d1a1a1e211487cd530ec81fb058d0b45224018d23aab9a9394b6cfa025c50f0d77b5002
-EBUILD exempi-2.6.2.ebuild 1367 BLAKE2B 8738f7f492a553b0f830914f22f05c00c1ebd3c478fdd7118ce8f1a689ce23c24e5c02f1ed34c3d8f6e6a6fd67fb8c0da5332e75e1fd86150074bacf86509451 SHA512 e8472f8f50666d5efbf666a2c3745f5167cb16dbfa00e7c73a3c6744c4cd17079afb5b81f8e8b1dadf119f9a41a4cbfd62fcbc913d484e489e7a60322882b208
-EBUILD exempi-2.6.3-r1.ebuild 1376 BLAKE2B dd331b2e1b6f3366def0392e106173958c3ede11af169f228dff4c2c7e2bac2c4b21cf6eb3e84f5d86769a15c8fe1dbbd4df60b92b40a3e3fe276447a526bce0 SHA512 6c11e732158df93e9b7771c61d2ccf471d98c1a8885bc243141f6da68c8bb3de9aa2da7b5987950bf31ef1808aeed977b901c51a6c7b871eebd47ee59bc61fb3
-EBUILD exempi-2.6.3.ebuild 1311 BLAKE2B c42857488f654fcc01378e0796752d9b2291b3d80be06161f30c639c128ec5cac55b5801be9ada1afbd5da75cd4a937d497d2777207b61a61f5278cbea96c49a SHA512 ee7967090af3b175de3d0eb5429cd7b35b576fba48c95b45d170a1874d0a2b5e9f72ab0f2841e70ae28216d0abf5acb79b4e3a8611686ac53b9287cea813a151
-EBUILD exempi-2.6.4.ebuild 1376 BLAKE2B dd331b2e1b6f3366def0392e106173958c3ede11af169f228dff4c2c7e2bac2c4b21cf6eb3e84f5d86769a15c8fe1dbbd4df60b92b40a3e3fe276447a526bce0 SHA512 6c11e732158df93e9b7771c61d2ccf471d98c1a8885bc243141f6da68c8bb3de9aa2da7b5987950bf31ef1808aeed977b901c51a6c7b871eebd47ee59bc61fb3
-EBUILD exempi-2.6.5.ebuild 1403 BLAKE2B 580460466a847bc21ba981768079304e1ce17183f7d59c9d91295b7353de994fa3e946e90563967d442aefbae4971b1e5a3c3565f89ce8c0990e5c9f784b77f2 SHA512 9d1d24c54f2d356c4333f2644e6bcc1cad42b632991b5e1d11c7b0e539a45df791bf92a8f447488eca66f6d9250cbb338d38c5ca46a998a28ec5931c26e0a072
+EBUILD exempi-2.6.3.ebuild 1290 BLAKE2B 5562b5a25b721c3de9eb78a17a21ab1680fc38fcd786ba097c78455391c57d8ad0a89dc9a5b76b3d051172c4f06b5bb69c209c3720c4bf84acbfb5fb3421d358 SHA512 272c500ef6e5061e6b0999a607748e2ef62257ccfefa816e171250fd5f4fe6a2b9b3017535b4aa85910daef1e262c291fa120c388be7a5385d15d9e4cdd34fb6
+EBUILD exempi-2.6.5.ebuild 1379 BLAKE2B 5ab399afb39d03f59f1f97a5470321c119699d28cc9ecc1e0bd6f2974c1f868ec62346715b2b0a920d005fd1b663042d85937bb920b741a9c0ed3c7eaccf1bf9 SHA512 6b4e9d7fb2d3b5e4ccec8128102612136af3104689d9201c556801f05f3e051fdac4411187ec018fae6db0a8c37cd6a0dda5062d5b11aa3af94837595c26ad83
 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.6.2.ebuild b/media-libs/exempi/exempi-2.6.2.ebuild
deleted file mode 100644
index 7cd19f245d41..000000000000
--- a/media-libs/exempi/exempi-2.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-# TODO: switch to xz for 2.6.3
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="2/8"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	sys-libs/zlib
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	"${FILESDIR}"/${PN}-2.6.2-arm-static-build.patch
-)
-
-src_prepare() {
-	default
-
-	config_rpath_update .
-	eautoreconf
-}
-
-src_configure() {
-	# - --enable-static as --disable-static breaks build
-	# - Valgrind detection is "disabled" due to bug #295875
-	econf \
-		--enable-static \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm samples/{,source,testfiles}/Makefile* || die
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	# --disable-static breaks tests
-	rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/exempi/exempi-2.6.3-r1.ebuild b/media-libs/exempi/exempi-2.6.3-r1.ebuild
deleted file mode 100644
index 3b477d996d29..000000000000
--- a/media-libs/exempi/exempi-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	sys-libs/zlib
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	"${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for autoconf 2.71
-	config_rpath_update .
-	eautoreconf
-}
-
-src_configure() {
-	# - --enable-static as --disable-static breaks build
-	# - Valgrind detection is "disabled" due to bug #295875
-	econf \
-		--enable-static \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm samples/{,source,testfiles}/Makefile* || die
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	# --disable-static breaks tests
-	rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/exempi/exempi-2.6.3.ebuild b/media-libs/exempi/exempi-2.6.3.ebuild
index 7409cc411371..3dc108953c8a 100644
--- a/media-libs/exempi/exempi-2.6.3.ebuild
+++ b/media-libs/exempi/exempi-2.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="2/8"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/exempi/exempi-2.6.4.ebuild b/media-libs/exempi/exempi-2.6.4.ebuild
deleted file mode 100644
index 3b477d996d29..000000000000
--- a/media-libs/exempi/exempi-2.6.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	sys-libs/zlib
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	"${FILESDIR}"/${PN}-2.6.3-clang16-binary_function.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for autoconf 2.71
-	config_rpath_update .
-	eautoreconf
-}
-
-src_configure() {
-	# - --enable-static as --disable-static breaks build
-	# - Valgrind detection is "disabled" due to bug #295875
-	econf \
-		--enable-static \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm samples/{,source,testfiles}/Makefile* || die
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	# --disable-static breaks tests
-	rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/exempi/exempi-2.6.5.ebuild b/media-libs/exempi/exempi-2.6.5.ebuild
index d11c41d688fd..6edceb5bc710 100644
--- a/media-libs/exempi/exempi-2.6.5.ebuild
+++ b/media-libs/exempi/exempi-2.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="2/8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch b/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch
deleted file mode 100644
index 7abd23a5a405..000000000000
--- a/media-libs/exempi/files/exempi-2.6.2-arm-static-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/28
-
-From 269b68aaaaaa9af0caf50678e820181c0694ebf7 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 17 Mar 2022 17:27:28 +0100
-Subject: [PATCH] XMPFiles/source/XMPFiles_Impl.cpp: fix arm build with gcc 10
-
-Fix the following build failure with exempi on arm with gcc 10 raised
-since version 2.6.0 and
-https://gitlab.freedesktop.org/libopenraw/exempi/-/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f
-https://github.com/adobe/XMP-Toolkit-SDK/commit/0872e35a30457d2ecf746a1bebdb7d94636d0e2f:
-
-/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../XMPFiles/source/.libs/libXMPFiles.a(XMPFiles_Impl.o):(.rodata+0x5c): multiple definition of `typeinfo name for TXMPMeta<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >'; XMPFilesCoverage.o:(.rodata+0x0): first defined here
-
-More information can be found on a similar issue here:
-https://github.com/OpenKinect/libfreenect2/issues/157
-
-Fixes:
- - http://autobuild.buildroot.org/results/c440719de02a154c6bdae11bda06ea30c131c71d
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---- a/XMPFiles/source/XMPFiles_Impl.cpp
-+++ b/XMPFiles/source/XMPFiles_Impl.cpp
-@@ -47,7 +47,9 @@ using namespace std;
- /// This file ...
- ///
- // =================================================================================================
--#include "public/include/XMP.incl_cpp"
-+#if ! XMP_StaticBuild
-+	#include "public/include/XMP.incl_cpp"
-+#endif
- 
- #if XMP_WinBuild
- 	#pragma warning ( disable : 4290 )	// C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-
diff --git a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch b/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch
deleted file mode 100644
index bbe535ed1380..000000000000
--- a/media-libs/exempi/files/exempi-2.6.3-clang16-binary_function.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Bug: https://bugs.gentoo.org/910494
---- a/XMPFiles/source/PluginHandler/XMPAtoms.h
-+++ b/XMPFiles/source/PluginHandler/XMPAtoms.h
-@@ -83,8 +83,12 @@ enum
- 
- #define XMPAtomNull emptyStr_K
- 
--struct StringCompare : std::binary_function<const std::string &, const std::string &, bool>
-+struct StringCompare
- {
-+	public:
-+		using first_argument_type = const std::string &;
-+		using second_argument_type = const std::string &;
-+		using result_type = bool;
- 	bool operator() (const std::string & a, const std::string & b) const
- 	{
- 		return ( a.compare(b) < 0 );
---- a/XMPFilesPlugins/api/source/PluginRegistry.h
-+++ b/XMPFilesPlugins/api/source/PluginRegistry.h
-@@ -68,8 +68,12 @@ public:
- 	
- private:
- 
--	struct StringCompare : std::binary_function< const std::string &, const std::string &, bool >
-+	struct StringCompare
- 	{
-+		public:
-+			using first_argument_type = const std::string &;
-+			using second_argument_type = const std::string &;
-+			using result_type = bool;
- 		bool operator()( const std::string & a, const std::string & b ) const
- 		{
- 			return ( a.compare(b) < 0 );
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 3abcd0cb0657..1bb586c2be36 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -3,7 +3,9 @@ AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
 DIST intel-gmmlib-22.3.18.tar.gz 846277 BLAKE2B 79485dfe33537053b9986f2f97771c551757da0f9ba721f82f5ff057bf230aa7ad79818d6915fb26cd354cb49d4da27c770c5adb61e530bdd39b51469fc4f9af SHA512 6dab0522a4d15bd5147cb72899a48170f441d5160dc11224809477380b3762ade845e7498a54df7de6673c0ad44bd037db754713697794e26106837f69eb0636
 DIST intel-gmmlib-22.3.19.tar.gz 846342 BLAKE2B ce3c25740d9c3f556db31f880b47fba8358dd7d7d53d80bc9923bec8c67fdeee3ae4efa5465390c229bfdc2f6c64fa0a7963516f83d12061d34bf51102cb3a64 SHA512 804e4995983884832dbb6d08a4e3c8ca8d60e7ef2c5a0de12d0facfac1fdce619ad229ad1a6b62fdf0ba74a968caf3bb884e283af8cf38babacff350fc9728b9
+DIST intel-gmmlib-22.3.20.tar.gz 846257 BLAKE2B 04e17f6735cd2081d672c29de986331fb5ddc7d89d142bcc470ee48567762676d562620d0d1f9e2ab061ba96b299bc4b0f6416c17542a8d7f9288cdfb1d0a42f SHA512 d5a6da43f4bdcb2a138c249e197b2e441d0999e89867aa66dfa68cbfc6982e631a7df29fd213a72a57b31cb29366f654343cb6b77a46f22e54bfa5432310e053
 EBUILD gmmlib-22.3.18.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb
 EBUILD gmmlib-22.3.19.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
+EBUILD gmmlib-22.3.20.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 EBUILD gmmlib-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/gmmlib-22.3.20.ebuild b/media-libs/gmmlib/gmmlib-22.3.20.ebuild
new file mode 100644
index 000000000000..2a09f24b8f3d
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.3.20.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+	S="${WORKDIR}/${PN}-intel-${P}"
+fi
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+
+LICENSE="MIT"
+SLOT="0/12.3"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 20adcc5184ee..205fd1f119cd 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -6,8 +6,11 @@ DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f69
 DIST libjxl-0.9.2.tar.gz 1873156 BLAKE2B 558d82dfaa2e5e4fdb07542b2daf4b80f661dec46986d412bdc2b1af0ac4b501f9e533eefd73e923b94a54f82695c4aed5cc531abc9e818ab4faf0aab0267b94 SHA512 97bc0ccd249fe0fa6d0f52c470a0d0bd181e3f00cd9820dda5ca437dff260e6c9e2c95dceec4bd9354c3adc4fc6724228cb027c537af6df7d3f90ab8ee61653f
 DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
 DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384
+EBUILD libjxl-0.10.2-r1.ebuild 2945 BLAKE2B 00773bbe7fe462c425558fc9456f5871ab70a9083a52746e5fd8f0a0bf939654d4528213a85aa0cff31ee9722891b2306e14b962c58953ed65ceaa4585c778e2 SHA512 1b3470cb66f1bad55f76c4bb1b24f01a85973be5199e9cddba758e40714dce21b90a28eaeb5693c9906784448492e049ab337ddb6f07e5cb8651d57b9b52fe86
 EBUILD libjxl-0.10.2.ebuild 2722 BLAKE2B 628d35e59657616b49b5ab54308c3d8600bc18c135cf9c464055ba739239cc67e079693251f5da9c0f0f509f4d88bcd95b47c1472549fb8ed0bc6964424336aa SHA512 9b78395438c0116b286b8f56996cfce92845186f23d644621008de619fe9c87c6554a9749b5b121a2e226ae68b087c05dcb1a0ffc663131cf5ee151696bc222d
 EBUILD libjxl-0.8.2-r1.ebuild 2339 BLAKE2B 5e919bdd10fe20de0b45122a7ed2f037ef3e54c4c17a385bdc930288c8b9ccbabf0de82bedfe8510999ea8085d37981764243662fccd872f29ba19ac14d9c407 SHA512 f9227486972af086b08140bd81bd02cb3f303792f168fb05ef9dc5c743c6ad576da3f2a5616b31aeefdaa77d1c7fef6a04da0fdd36648ad7361aaaee2ce7f603
+EBUILD libjxl-0.8.2-r2.ebuild 2571 BLAKE2B 3d66e80efb11dd03ab12446eba565a26b136cd75644c8d5dd976fb2bc47bb0129e9afdd091b2200b9e62076ec0586b72cdcb4eb3c919aebfde91b02b6acc78a9 SHA512 f1ba0c1652f21bcba6bf8825d925cc97e2c9340711afeade8d7aa76ca2588bb81f7949e84139fe44aebb150e560a11f301e580a1f5564073f789d91d35c261ff
+EBUILD libjxl-0.9.2-r1.ebuild 3007 BLAKE2B 6ded330ffaf6eb2daf3a402c91b4abd16769ff3e41b86d08f7717d27b76806a4e95a27a5f5a5b824b6068038616d863145e75458d1716ab0bcf9720acb38c6ea SHA512 1fcf2d77d03f317f07569d2124771abda3827043738e98c105961ae9ed1d9099aafa7972d7c57d154465fd7ae9f400390c3764287f7758663cf4f860cf25910a
 EBUILD libjxl-0.9.2.ebuild 2784 BLAKE2B bb08ef63e10bcc07381fac168baa3b596f93e91c3d648b89f2a7ec0296b1bb4713fa91459faab76a08f89fe77cb23051131f19b3dcf1d6be3843b41ad6f8f271 SHA512 aeeca7ebde32c21a18e07d0b8e3c54fbdaa13b53d1c9eb642f53d34a56fd7b206d519c8f617d78fc691ffcd69745282577c589df3bef8af0692e9ef3346c2c06
-EBUILD libjxl-9999.ebuild 2417 BLAKE2B 65ce5cf9c5b1f2834b4fe15af97040309f50059fb06ee3ae7a7123a0c84069a9a2a03b5c9c215333b78b5dd73e79e2c01ff0ee52c1cf1ea6053b359e53948c4a SHA512 8265b56e188587d2d6eb0114de4c08979168fa57125e27acb50febdf907e8d1c3956d01b1e58c732369725665418e0e2ae3152538f5c78b35b02d0644a9e33d3
-MISC metadata.xml 864 BLAKE2B 04139ce686fbc36068182d03fc23f0a0d49262f8c6b21a690705411330c3b5ec4f969d0ed27fc712fc184736bb20e9bfa3a6fe2fe6d5db98527334151dc0a8d6 SHA512 73e89d636908712608a41f8c4b7f29fc9d551030cebcd83e8db722869aaff0bc96c1ad6c05c5dbe3a2b2b29b8c639c95d02a8d4ed7094a9200af7f008c9b20de
+EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339
+MISC metadata.xml 1029 BLAKE2B 4c5ef3d7aca316b497d964b1afcee9f71b165545691182c3818ef4f9a8bc7f10fdbed36a8bd58b0051b1f9851018a11efa3e9f7b57c5ec935435e16bd26b6036 SHA512 a3129f77efc640e78a2f1fa481fb6363249be74e74aabccb51970ec101808db95a326deeecfa557b669cfb2bf26622fc7dbcbe7624a0315d770e697bc3734296
diff --git a/media-libs/libjxl/libjxl-0.10.2-r1.ebuild b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..3430ddbc8d00
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.10.2-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib gnome2-utils
+
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc"
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl/"
+SRC_URI="
+	https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	test? (
+		https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
+			-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+gdk-pixbuf gif jpeg openexr +png test"
+REQUIRED_USE="test? ( png )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	gdk-pixbuf? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+	)
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DJPEGXL_ENABLE_PLUGINS=ON
+			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
+			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DJPEGXL_ENABLE_PLUGINS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libjxl/libjxl-0.8.2-r2.ebuild b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..ff3f34b606fb
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.8.2-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759"
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
+		-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gif jpeg openexr +png test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch"
+	"${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_ENABLE_PLUGINS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DBUILD_TESTING=$(usex test ON OFF)
+		)
+		use test &&
+			mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" )
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DBUILD_TESTING=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/libjxl/libjxl-0.9.2-r1.ebuild b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..00adab4f5232
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.9.2-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib gnome2-utils
+
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc"
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl/"
+SRC_URI="
+	https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	test? (
+		https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
+			-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz
+	)
+"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+gdk-pixbuf gif jpeg openexr +png test"
+REQUIRED_USE="test? ( png )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
+	gdk-pixbuf? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+	)
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	>=x11-misc/shared-mime-info-2.2
+"
+DEPEND+="
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DJPEGXL_ENABLE_BENCHMARK=OFF
+		-DJPEGXL_ENABLE_COVERAGE=OFF
+		-DJPEGXL_ENABLE_FUZZERS=OFF
+		-DJPEGXL_ENABLE_SJPEG=OFF
+		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
+		-DJPEGXL_ENABLE_SKCMS=OFF
+		-DJPEGXL_ENABLE_VIEWERS=OFF
+		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+		-DJPEGXL_FORCE_SYSTEM_HWY=ON
+		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+		-DJPEGXL_ENABLE_DOXYGEN=OFF
+		-DJPEGXL_ENABLE_MANPAGES=OFF
+		-DJPEGXL_ENABLE_JNI=OFF
+		-DJPEGXL_ENABLE_JPEGLI=OFF
+		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
+		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=ON
+			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DJPEGXL_ENABLE_PLUGINS=ON
+			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
+			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
+			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DJPEGXL_ENABLE_TOOLS=OFF
+			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DJPEGXL_ENABLE_PLUGINS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index aef3acb16445..5841fd207bc5 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -10,28 +10,28 @@ HOMEPAGE="https://github.com/libjxl/libjxl/"
 
 EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
 EGIT_SUBMODULES=(
-	third_party/libjpeg-turbo
 	third_party/skcms
 	third_party/testdata
 )
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+gdk-pixbuf openexr test"
+IUSE="+gdk-pixbuf gif jpeg openexr +png test"
+REQUIRED_USE="test? ( png )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	app-arch/brotli:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
-	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	gdk-pixbuf? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 	)
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
 	${DEPEND}
@@ -49,6 +49,10 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_SJPEG=OFF
 		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
 
+		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+
 		-DJPEGXL_ENABLE_SKCMS=OFF
 		-DJPEGXL_ENABLE_VIEWERS=OFF
 		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 1f058f4c648f..faffa19f3221 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -19,7 +19,11 @@
     Contains command line utilities: cjxl, djxl, jxlinfo.
   </longdescription>
   <use>
-    <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
+    <flag name="jpeg">
+      Enable full support for JPEG images.  When disabled, only
+      lossless conversion between JPEG and JPEG-XL is supported.
+    </flag>
+    <flag name="gdk-pixbuf">Build a gdk-pixbuf loader.</flag>
   </use>
   <upstream>
     <remote-id type="github">libjxl/libjxl</remote-id>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 03e5be4a8049..f70266110f03 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,15 +2,17 @@ AUX 24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch 1088 BLAKE
 DIST mesa-24.0.7.tar.xz 20144724 BLAKE2B d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce SHA512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c
 DIST mesa-24.0.8.tar.xz 20170168 BLAKE2B 1919e99e6ccbd51c8e74e55985ea9a3f47bf49c7e4260a195a609ce175eeded9fc5a56970ae35d21bc650e4bb802df484d2088b29ef3861d13942bd495891a9a SHA512 1e1be9b50c2a404a96960db87d2ba4cd1c602445f9ab8acfb6a8a023410063620c2ef891fe516afec3d830756e0b0f4309ef50c6caeefa44e164b414c4708b10
 DIST mesa-24.1.0.tar.xz 28994008 BLAKE2B 1558d20d426162bfe8cccf96107ddbf1373c8322f87f48daec73e23b283e00f95d6efd073cad9b92065928af4b9b4a339ff2d204412070eca903f77ca366e619 SHA512 4b7ed1940fc812ef4efb55978d3ffe3d0e2ae53d5b57a3baca10a52db2ba5852c5ee7e75c3739bd8d384c80bf1cba970a384250050f01f03bba98f255e12cec5
+DIST mesa-24.1.1.tar.xz 29019256 BLAKE2B 152ce5f4847a321689bf4aa88529963278f7dd24097c4c3de2b3a9164d06cd23d7cccd96bd31fea88311ded576c834a73e2d669e6d290404283f33f92b9bf262 SHA512 a23fc2fe479f21027095a7791042148586b23da848474209ca4fecfe5c4d499e66fff0ebfa06d07ed9f16b5d6a2ef755b362cb6079141aff5fdc47cc571e3b1d
 DIST paste-1.0.14.tar.gz 18429 BLAKE2B 88f533fd336bbbe24872b100777703832ff46b52970b94981fea202726de35ac0d3466f96370fa89c966b33e0f13c75cbf7f5f88bba290dc490a63c9e08a0b16 SHA512 0ec40c228afe645cb027a99c8bd8f7c65158aab48655018a45736727906b05f7354df114405f2eae88c4eba73dec62e8228f8be9834afa0f22b5f31c18006d34
 DIST proc-macro2-1.0.70.tar.gz 46747 BLAKE2B 808e3a30c89fd979663899124853d386cc53862621f4d872bba87fe91baccddbc6612bd658b4c18b44f8420fcb10700b2906cde9c9512a616ab800ebbfb0867d SHA512 cd5c41ef6a410e310e90828a33fee42c1e2bf30dfc2b0a0cf429fcc60fa1262393c977b2cab5f8a50a35fd1394fd6cc7e7a482581f88dcde20d9ad030c7414a5
 DIST quote-1.0.33.tar.gz 32169 BLAKE2B 2438915aebe30b79929ddc6ed8bad5282537b081c763a3d6b2b9483b63e7b5e99b9bba6f1f7deb725031b23384410b60c7cc4aef0b00bb1d94541cde54408ee3 SHA512 3c000577d0e9f82bc379570a4fa63283d73cfc6dee0475475ba201994491dece0110cdefc26fcf9a3b9d0bf50a3649ca5b68c8a0f6f2e620946b624ff8b8f38b
 DIST syn-2.0.39.tar.gz 286899 BLAKE2B 8bf5e89cb961195b48896294dc876d4e5e81fe7ac1df5330b972e6fdcfa2cf89fd1467f315081f84c1f447d402850e0ab4c7dc2bd20271c5e2bc9a2e3008f70b SHA512 2ee6bb196bef427a9b9aada38fb3a3a11e893c4e9e8808063f544f5c05cda58d554dfea24488dd60b4c299457852b52bf17e5de8595333ff4f2358441964c672
 DIST unicode-ident-1.0.12.tar.gz 50118 BLAKE2B 04e2651e14251d68f4e7e70e1e7a6d5eded21aa4f684c6162a91608189f6dcabaca4aa22204c40e08c82d76773c679ff965f21836264885a3b4cb62d7aa762db SHA512 0d0228bfd8eb6a94d8ae4a003511dd5ad52a58b08d98a8f0a8c5e3dc8b3e6b987ea5009255dc1e9c411f91aec16edc4aaff26ed7a9c48430272f970cd2a9510d
-EBUILD mesa-24.0.7.ebuild 11623 BLAKE2B c4a62576ed60ec76eb4c8e8ec9088caf83e2e122dd858c0dce64aca4d00b099b02d6106da02420889e9852843451a65aea8d66542dcf933cf46d33ac5cc3a2ea SHA512 5b41a2eee65e406369d358a16a2356bb4a6d56cccc57aec2aec3046dbc5e51946cd3d26686715f0c4fec7752294a5fa1d380e7aecf3500939ab36ce3257d9623
-EBUILD mesa-24.0.8-r1.ebuild 11797 BLAKE2B b71065c8f66ae5e8f838029022f958d077429cad7238183082856009096c58796949faee327cae6d4b4bd797ff4485a100d980193b0667f66e6f7208cd9625cd SHA512 df8e99dfb89387e2ddac792f8c57fc1ef1498207617b8a88268a1fb2dc2ff6e2b7113d0e9fa68783d4e5d56eb549fd0e69a1fd9e3f976e5fb5994d9fee97cc29
-EBUILD mesa-24.0.8.ebuild 11630 BLAKE2B 4c0b8bee298f59954db6759e92464530c0fd7684425ebbbd4985e0d7f87e004f1c0990ec5468266ee9773833fc00f6287ef162d9abaca1ebeb553fe0d26bc19f SHA512 0854e76a64cc3bb2bcd873805a1c92a46bb82cbba2a107cfd43af676da0eab5b755646155164182dedd8a3dc26a6b73a11e8c366ba8067e142b49ac6d48ec4f4
-EBUILD mesa-24.1.0-r1.ebuild 13686 BLAKE2B d3ee390ca6773f5a99a683b703c524df54922743849e3690655c9cd0938e1678c0909aa368dacd2fcdeb4a82f2bf1be145402ea2c0678793c6a52163307930d1 SHA512 a0f7d546432438340d3f7d74ffd3d168addcdf81ba7c68315e9960d6922fd11fcf75ea1190ef8341035429b54158481c8b16df5085625d3cf6cdf13a6712ab14
-EBUILD mesa-24.1.0.ebuild 13477 BLAKE2B 8ba955abf455044183db4601302c7473228c47b79318b837bfdf51aec8671f901744cc9bef54782bccee230d72a2a4c4e94c53279e8991292a9875fba98af444 SHA512 ecfd3177d7edd5d1ae5c56f7d19c7ceb2e42aa0d88df67a90db14609c7959f54c37244dab369c8c35d1e5e72e846957229f92250591fbd3e6c033005018506ee
-EBUILD mesa-9999.ebuild 13686 BLAKE2B d3ee390ca6773f5a99a683b703c524df54922743849e3690655c9cd0938e1678c0909aa368dacd2fcdeb4a82f2bf1be145402ea2c0678793c6a52163307930d1 SHA512 a0f7d546432438340d3f7d74ffd3d168addcdf81ba7c68315e9960d6922fd11fcf75ea1190ef8341035429b54158481c8b16df5085625d3cf6cdf13a6712ab14
+EBUILD mesa-24.0.7.ebuild 11737 BLAKE2B c63e9edb6075b0af71fbcbc60eb6917468cad89ab245b8b0ef66dde87b85851966b98fd1b9730ce8e7f0e0423de7a44ee08807f2aa3842d44d4e2119b786d910 SHA512 dc68bed1f727ad15d1ab0a211b2fd377e554d2a11b3a7739f3ae7b2c2789a1981c46323464aeac5321bb65f5aa77d7639e0723f5f1374f8c8d4f6c1b92d04e60
+EBUILD mesa-24.0.8-r1.ebuild 11911 BLAKE2B ccbb733ee83f0f7869eaf08cfd48041adc3a49a27dd16169e7cf358f75fafb7088d3318313c279979df2e46d704f919cc4cb74ebe73cabdd88eeeba30023cea8 SHA512 fdcf5d16e88691846e38eb688889abdb559dba5e2c4545d5e4957ad66c1fd5836f37300940f74968cadb3f988a56642960c65dda268558b561901ebd66e39b6d
+EBUILD mesa-24.0.8.ebuild 11744 BLAKE2B fd8bd36715e2445ea0293040a7ee58aa0750506a775caaed4784c1ada06af600c50327631a6354403c056409cc677a5f07542f9b7c8674645e5a7e3a532efc58 SHA512 aca57c57340534506fc49ac0313d97017e53891d35bd4460908164056cdf441e7be3fbbfdbb5e9a216dde36b14d4728aa2b591593910ec5ad12d5f4f8269bcc5
+EBUILD mesa-24.1.0-r1.ebuild 14471 BLAKE2B f3bd8b5deb02aceacc0769de3e027fe56ad44cd7b8e0d88760b676d71ceae2c95e8773a284df54338204fb204d198f6ec648b0eabf30516d017ece9b385ecd33 SHA512 8a9dcd0566799621d95c9b1063096cc67a65c9e896ab4e3bb6d59711c4c39b633cfc692bc4f2702e474bd9633a3e446451b462bba164f235cc9d7b64a27065ca
+EBUILD mesa-24.1.0.ebuild 13591 BLAKE2B 25e06dfe37d5cad418b2caaadc7f3f22cb1842bd65d712d8e65bb348d26e51ed454755ae8dab6f6aeb803d0bb3df31113766eb0e60abb7493f339efee7cb4746 SHA512 b3d46efea43238b22eff219ef54af8a803e86b52e75e9cf9ccadc3e63fed3aa203721fa5aeeb2e7bcfdd4860baf66f41a0b1e672f5423c7f4e4b04620822bd9e
+EBUILD mesa-24.1.1.ebuild 14310 BLAKE2B 21c697eb3bcd4dddeec9877fcee16f819ca89f9eacbfbe6c7ca4868da32925a103f3051a87219d8e93440c669a435be388ed4206aead86e46119117fcd2e155f SHA512 1f12d36112aa3ddbf8e26e00899f662f40301c7bf60e86cec53f74e1f0c199c6d33f1f095691d0d20ef9de52411a84dcd90f7f8e45056950eea5f8730306f0c2
+EBUILD mesa-9999.ebuild 14310 BLAKE2B 21c697eb3bcd4dddeec9877fcee16f819ca89f9eacbfbe6c7ca4868da32925a103f3051a87219d8e93440c669a435be388ed4206aead86e46119117fcd2e155f SHA512 1f12d36112aa3ddbf8e26e00899f662f40301c7bf60e86cec53f74e1f0c199c6d33f1f095691d0d20ef9de52411a84dcd90f7f8e45056950eea5f8730306f0c2
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.0.7.ebuild b/media-libs/mesa/mesa-24.0.7.ebuild
index 6728b6089ac8..079bc478b34e 100644
--- a/media-libs/mesa/mesa-24.0.7.ebuild
+++ b/media-libs/mesa/mesa-24.0.7.ebuild
@@ -137,7 +137,10 @@ BDEPEND="
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
 	vulkan? (
 		dev-util/glslang
 		llvm? (
@@ -212,7 +215,8 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
 	if use llvm && use vulkan && use video_cards_intel && use amd64; then
 		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
 	fi
diff --git a/media-libs/mesa/mesa-24.0.8-r1.ebuild b/media-libs/mesa/mesa-24.0.8-r1.ebuild
index b676b84c8534..41c743d15fe6 100644
--- a/media-libs/mesa/mesa-24.0.8-r1.ebuild
+++ b/media-libs/mesa/mesa-24.0.8-r1.ebuild
@@ -137,7 +137,10 @@ BDEPEND="
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
 	vulkan? (
 		dev-util/glslang
 		llvm? (
@@ -212,7 +215,8 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
 	if use llvm && use vulkan && use video_cards_intel && use amd64; then
 		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
 	fi
diff --git a/media-libs/mesa/mesa-24.0.8.ebuild b/media-libs/mesa/mesa-24.0.8.ebuild
index 53d40957a9fc..53ea99b9ba47 100644
--- a/media-libs/mesa/mesa-24.0.8.ebuild
+++ b/media-libs/mesa/mesa-24.0.8.ebuild
@@ -137,7 +137,10 @@ BDEPEND="
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
 	vulkan? (
 		dev-util/glslang
 		llvm? (
@@ -212,7 +215,8 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
 	if use llvm && use vulkan && use video_cards_intel && use amd64; then
 		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
 	fi
diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild
index 9979d5a20b5d..3e505dc7f31e 100644
--- a/media-libs/mesa/mesa-24.1.0-r1.ebuild
+++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild
@@ -46,7 +46,7 @@ LICENSE="MIT SGI-B-2.0"
 SLOT="0"
 
 RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -55,17 +55,20 @@ IUSE="${IUSE_VIDEO_CARDS}
 	cpu_flags_x86_sse2 d3d9 debug +llvm
 	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
 	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa zink +zstd"
+	vulkan-overlay wayland +X xa +zstd"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	d3d9? (
 		|| (
+			video_cards_freedreno
 			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
 			video_cards_r300
 			video_cards_r600
 			video_cards_radeonsi
-			video_cards_nouveau
 			video_cards_vmware
+			video_cards_zink
 		)
 	)
 	llvm? ( ${LLVM_REQUIRED_USE} )
@@ -73,10 +76,10 @@ REQUIRED_USE="
 	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
 	video_cards_nvk? ( vulkan video_cards_nouveau )
 	vdpau? ( X )
 	xa? ( X )
-	zink? ( opengl vulkan )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
@@ -112,6 +115,7 @@ RDEPEND="
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
 	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
@@ -124,7 +128,6 @@ RDEPEND="
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
 	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 for card in ${RADEON_CARDS}; do
@@ -157,7 +160,10 @@ BDEPEND="
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
 	video_cards_intel? (
 		~dev-util/intel_clc-${PV}
 		dev-libs/libclc[spirv(-)]
@@ -192,37 +198,44 @@ pkg_pretend() {
 		if ! use video_cards_d3d12 &&
 		   ! use video_cards_freedreno &&
 		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
 		   ! use video_cards_radeonsi &&
 		   ! use video_cards_v3d &&
-		   ! use video_cards_nvk; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, v3d, or nvk"
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
 		fi
 	fi
 
+	# VA
 	if use vaapi; then
 		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
 		   ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
 		fi
 	fi
 
 	if use vdpau; then
 		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
+		   ! use video_cards_nouveau &&
 		   ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
 		fi
 	fi
 
 	if use xa; then
 		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
 		   ! use video_cards_nouveau &&
 		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
 		fi
 	fi
 
@@ -236,7 +249,8 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
 	if use llvm && use vulkan && use video_cards_intel && use amd64; then
 		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
 	fi
@@ -298,21 +312,25 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	emesonargs+=(-Dplatforms=${platforms#,})
 
-	if use video_cards_intel ||
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
 	   use video_cards_r300 ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
+	   use video_cards_vmware || # swrast
+	   use video_cards_zink; then
 		emesonargs+=($(meson_use d3d9 gallium-nine))
 	else
 		emesonargs+=(-Dgallium-nine=false)
 	fi
 
 	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
+	   use video_cards_virgl; then
 		emesonargs+=($(meson_feature vaapi gallium-va))
 		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
 	else
@@ -324,16 +342,17 @@ multilib_src_configure() {
 	fi
 
 	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
+	   use video_cards_nouveau ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
+	   use video_cards_virgl; then
 		emesonargs+=($(meson_feature vdpau gallium-vdpau))
 	else
 		emesonargs+=(-Dgallium-vdpau=disabled)
 	fi
 
 	if use video_cards_freedreno ||
+	   use video_cards_intel ||
 	   use video_cards_nouveau ||
 	   use video_cards_vmware; then
 		emesonargs+=($(meson_feature xa gallium-xa))
@@ -351,10 +370,10 @@ multilib_src_configure() {
 	fi
 
 	gallium_enable -- swrast
+	gallium_enable video_cards_d3d12 d3d12
 	gallium_enable video_cards_freedreno freedreno
 	gallium_enable video_cards_intel crocus i915 iris
 	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
 	gallium_enable video_cards_nouveau nouveau
 	gallium_enable video_cards_panfrost panfrost
 	gallium_enable video_cards_v3d v3d
@@ -362,13 +381,13 @@ multilib_src_configure() {
 	gallium_enable video_cards_virgl virgl
 	gallium_enable video_cards_vivante etnaviv
 	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
+	gallium_enable video_cards_zink zink
 
 	gallium_enable video_cards_r300 r300
 	gallium_enable video_cards_r600 r600
 	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
+	if ! use video_cards_r300 &&
+	   ! use video_cards_r600; then
 		gallium_enable video_cards_radeon r300 r600
 	fi
 
@@ -382,12 +401,15 @@ multilib_src_configure() {
 	fi
 
 	if use vulkan; then
-		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_d3d12 microsoft-experimental
 		vulkan_enable video_cards_freedreno freedreno
 		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
 		vulkan_enable video_cards_radeonsi amd
 		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
 		if use video_cards_nvk; then
 			vulkan_enable video_cards_nvk nouveau
 			if ! multilib_is_native_abi; then
diff --git a/media-libs/mesa/mesa-24.1.0.ebuild b/media-libs/mesa/mesa-24.1.0.ebuild
index f9c4e1acfcbb..74f5ca28a2f6 100644
--- a/media-libs/mesa/mesa-24.1.0.ebuild
+++ b/media-libs/mesa/mesa-24.1.0.ebuild
@@ -157,7 +157,10 @@ BDEPEND="
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
 	video_cards_intel? (
 		~dev-util/intel_clc-${PV}
 		dev-libs/libclc[spirv(-)]
@@ -236,7 +239,8 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
 	if use llvm && use vulkan && use video_cards_intel && use amd64; then
 		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
 	fi
diff --git a/media-libs/mesa/mesa-24.1.1.ebuild b/media-libs/mesa/mesa-24.1.1.ebuild
new file mode 100644
index 000000000000..c184d9ab1e76
--- /dev/null
+++ b/media-libs/mesa/mesa-24.1.1.ebuild
@@ -0,0 +1,493 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
+
+MY_P="${P/_/-}"
+
+SYN_PV=2.0.39
+PROC_MACRO2_PV=1.0.70
+QUOTE_PV=1.0.33
+UNICODE_IDENT_PV=1.0.12
+PASTE_PV=1.0.14
+
+NAK_URI="
+	https://github.com/dtolnay/syn/archive/refs/tags/${SYN_PV}.tar.gz -> syn-${SYN_PV}.tar.gz
+	https://github.com/dtolnay/proc-macro2/archive/refs/tags/${PROC_MACRO2_PV}.tar.gz -> proc-macro2-${PROC_MACRO2_PV}.tar.gz
+	https://github.com/dtolnay/quote/archive/refs/tags/${QUOTE_PV}.tar.gz -> quote-${QUOTE_PV}.tar.gz
+	https://github.com/dtolnay/unicode-ident/archive/refs/tags/${UNICODE_IDENT_PV}.tar.gz -> unicode-ident-${UNICODE_IDENT_PV}.tar.gz
+	https://github.com/dtolnay/paste/archive/refs/tags/${PASTE_PV}.tar.gz -> paste-${PASTE_PV}.tar.gz
+"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	SRC_URI="${NAK_URI}"
+	inherit git-r3
+else
+	SRC_URI="
+		https://archive.mesa3d.org/${MY_P}.tar.xz
+		${NAK_URI}
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug +llvm
+	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa +zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_freedreno
+			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_vmware
+			video_cards_zink
+		)
+	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		$(llvm_gen_dep "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			)
+		")
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/libclc[spirv(-)]
+		>=dev-util/spirv-tools-1.3.231.0
+		virtual/libelf:0=
+	)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
+	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( >=dev-util/directx-headers-1.613.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.34 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+	)
+	>=dev-build/meson-1.4.1
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
+	video_cards_intel? (
+		~dev-util/intel_clc-${PV}
+		dev-libs/libclc[spirv(-)]
+		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+	)
+	vulkan? (
+		dev-util/glslang
+		video_cards_nvk? (
+			>=dev-util/bindgen-0.68.1
+			>=dev-util/cbindgen-0.26.0
+			>=virtual/rust-1.74.1
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libglapi.so.0.0.0
+	usr/lib/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+src_unpack() {
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
+	unpack ${A}
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
+		fi
+	fi
+
+	# VA
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+
+	if use video_cards_nvk; then
+		# NVK Subproject Handling
+		pushd "${S}" >/dev/null || die
+		for subpkg in proc-macro2-${PROC_MACRO2_PV} syn-${SYN_PV} quote-${QUOTE_PV} unicode-ident-${UNICODE_IDENT_PV} paste-${PASTE_PV}; do
+			# copy subprojects folder
+			cp -r ../${subpkg} subprojects || die
+			# copy meson.build
+			cp subprojects/packagefiles/${subpkg%-*}/meson.build subprojects/${subpkg} || die
+			# ovewrite subpkg version when needed
+			sed -i -e "s/directory = \S\+/directory = ${subpkg}/" subprojects/${subpkg%-*}.wrap || die
+		done
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_vmware || # swrast
+	   use video_cards_zink; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable video_cards_zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 &&
+	   ! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	if use llvm && use opencl; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+		emesonargs+=(
+			$(meson_native_true gallium-rusticl)
+			-Drust_std=2021
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
+		if use video_cards_nvk; then
+			vulkan_enable video_cards_nvk nouveau
+			if ! multilib_is_native_abi; then
+				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
+				emesonargs+=(
+					--native-file "${T}"/rust_fix.ini
+				)
+			fi
+		fi
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	if use opengl && use X; then
+		emesonargs+=(-Dglx=dri)
+	else
+		emesonargs+=(-Dglx=disabled)
+	fi
+
+	if [[ "${ABI}" == amd64 ]]; then
+		emesonargs+=($(meson_feature video_cards_intel intel-rt))
+	fi
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Dexpat=enabled
+		$(meson_use opengl)
+		$(meson_feature opengl gbm)
+		$(meson_feature opengl gles1)
+		$(meson_feature opengl gles2)
+		$(meson_feature opengl glvnd)
+		$(meson_feature opengl egl)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dintel-clc=$(usex video_cards_intel system auto)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+
+	if ! multilib_is_native_abi && use video_cards_nvk; then
+		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
+	fi
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 9979d5a20b5d..c184d9ab1e76 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -46,7 +46,7 @@ LICENSE="MIT SGI-B-2.0"
 SLOT="0"
 
 RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl vivante vmware zink"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -55,17 +55,20 @@ IUSE="${IUSE_VIDEO_CARDS}
 	cpu_flags_x86_sse2 d3d9 debug +llvm
 	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
 	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa zink +zstd"
+	vulkan-overlay wayland +X xa +zstd"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	d3d9? (
 		|| (
+			video_cards_freedreno
 			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
 			video_cards_r300
 			video_cards_r600
 			video_cards_radeonsi
-			video_cards_nouveau
 			video_cards_vmware
+			video_cards_zink
 		)
 	)
 	llvm? ( ${LLVM_REQUIRED_USE} )
@@ -73,10 +76,10 @@ REQUIRED_USE="
 	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
 	video_cards_nvk? ( vulkan video_cards_nouveau )
 	vdpau? ( X )
 	xa? ( X )
-	zink? ( opengl vulkan )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
@@ -112,6 +115,7 @@ RDEPEND="
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
 	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
@@ -124,7 +128,6 @@ RDEPEND="
 		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
 	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 for card in ${RADEON_CARDS}; do
@@ -145,19 +148,20 @@ DEPEND="${RDEPEND}
 		x11-base/xorg-proto
 	)
 "
-# meson-1.4.0 contains a regression, so it fails to compile nouveau/NVK
-# see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10855
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
 		>=virtual/rust-1.62.0
 		>=dev-util/bindgen-0.58.0
-		>=dev-build/meson-1.3.1
 	)
+	>=dev-build/meson-1.4.1
 	app-alternatives/yacc
 	app-alternatives/lex
 	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+	")
 	video_cards_intel? (
 		~dev-util/intel_clc-${PV}
 		dev-libs/libclc[spirv(-)]
@@ -169,7 +173,6 @@ BDEPEND="
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
 			>=virtual/rust-1.74.1
-			<dev-build/meson-1.4.0
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -192,37 +195,44 @@ pkg_pretend() {
 		if ! use video_cards_d3d12 &&
 		   ! use video_cards_freedreno &&
 		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
 		   ! use video_cards_radeonsi &&
 		   ! use video_cards_v3d &&
-		   ! use video_cards_nvk; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, v3d, or nvk"
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
 		fi
 	fi
 
+	# VA
 	if use vaapi; then
 		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
 		   ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
 		fi
 	fi
 
 	if use vdpau; then
 		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
+		   ! use video_cards_nouveau &&
 		   ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
 		fi
 	fi
 
 	if use xa; then
 		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
 		   ! use video_cards_nouveau &&
 		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
 		fi
 	fi
 
@@ -236,7 +246,8 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1
 	if use llvm && use vulkan && use video_cards_intel && use amd64; then
 		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
 	fi
@@ -298,21 +309,25 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	emesonargs+=(-Dplatforms=${platforms#,})
 
-	if use video_cards_intel ||
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
 	   use video_cards_r300 ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
+	   use video_cards_vmware || # swrast
+	   use video_cards_zink; then
 		emesonargs+=($(meson_use d3d9 gallium-nine))
 	else
 		emesonargs+=(-Dgallium-nine=false)
 	fi
 
 	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
+	   use video_cards_virgl; then
 		emesonargs+=($(meson_feature vaapi gallium-va))
 		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
 	else
@@ -324,16 +339,17 @@ multilib_src_configure() {
 	fi
 
 	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
+	   use video_cards_nouveau ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
+	   use video_cards_virgl; then
 		emesonargs+=($(meson_feature vdpau gallium-vdpau))
 	else
 		emesonargs+=(-Dgallium-vdpau=disabled)
 	fi
 
 	if use video_cards_freedreno ||
+	   use video_cards_intel ||
 	   use video_cards_nouveau ||
 	   use video_cards_vmware; then
 		emesonargs+=($(meson_feature xa gallium-xa))
@@ -351,10 +367,10 @@ multilib_src_configure() {
 	fi
 
 	gallium_enable -- swrast
+	gallium_enable video_cards_d3d12 d3d12
 	gallium_enable video_cards_freedreno freedreno
 	gallium_enable video_cards_intel crocus i915 iris
 	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
 	gallium_enable video_cards_nouveau nouveau
 	gallium_enable video_cards_panfrost panfrost
 	gallium_enable video_cards_v3d v3d
@@ -362,13 +378,13 @@ multilib_src_configure() {
 	gallium_enable video_cards_virgl virgl
 	gallium_enable video_cards_vivante etnaviv
 	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
+	gallium_enable video_cards_zink zink
 
 	gallium_enable video_cards_r300 r300
 	gallium_enable video_cards_r600 r600
 	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
+	if ! use video_cards_r300 &&
+	   ! use video_cards_r600; then
 		gallium_enable video_cards_radeon r300 r600
 	fi
 
@@ -382,12 +398,15 @@ multilib_src_configure() {
 	fi
 
 	if use vulkan; then
-		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_d3d12 microsoft-experimental
 		vulkan_enable video_cards_freedreno freedreno
 		vulkan_enable video_cards_intel intel intel_hasvk
-		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
 		vulkan_enable video_cards_radeonsi amd
 		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
 		if use video_cards_nvk; then
 			vulkan_enable video_cards_nvk nouveau
 			if ! multilib_is_native_abi; then
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 1ab2190ead23..a17af42a7e45 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,3 +1,5 @@
+AUX openimageio-2.5.12.0-tests-optional.patch 1310 BLAKE2B 563d3ede3ea10439e130d96647918387455ae8fb1fbb75220a064ce98322f8d87f113c04b6e215db6d6e95bf1e96f9c922f144a46af1674726f5b87918a4ae3a SHA512 95b6921b4dadc6535d978178141b62916121e27540f8e578d93347bfab59506f49ded7584b03b8dac04af44e14a74701437fa0f6faacca9d12657352fc0d3f06
+AUX openimageio-2.5.12.0_heif_test.patch 839 BLAKE2B e7309fde786053afc3c373bfd5d6affa8d86d7524ff44b52a61b3c4cf3bb18cd2a987699e788eb7d6a910a1bd8b813deb2497475799593a6c780442d6cc31963 SHA512 f32a5b46bc4fb678322b0f9d930e1bdaae370087084ffce4dcf61de6a3d56059a384924fd718ed5cfbaff0ab76c6a1f8bdaf8c4e3961b9defaadb04e1d402b90
 AUX openimageio-2.5.8.0-fits.patch 672 BLAKE2B 3bc6252c246698ef29dd74fdf1e1dde59658c717ed078cd5b9e251dc59f57395bc761325664d07ccae90df32e3600ab9c68732d3610ba9c99fbc236eb28840d6 SHA512 bdcca17073be2d8d2fdfb770f117f429fa4c8db26e7366d1ab9e211837fe07622054cd71ff9206fa7c449974faba865c6412d7a5cbd3042ca1a0b8e8a944efc5
 AUX openimageio-2.5.8.0-fix-tests.patch 10084 BLAKE2B d6cc1e35cb31df4d42a4a4b14283c81fb4b9157be480688102f912052a51ad5d56d22573a3b9c4c9fc80465c12b3c085b07cf8745ac86b1c83985af30942f4c8 SHA512 39e55ad64fc644420a2305abb616f6ca409fc345bc363557c176c2e88b32fd96d52fbacaf2c002d159341bf6401d19407c50781af2b39c638e738047d86d3903
 AUX openimageio-2.5.8.0-fix-unit_simd.patch 1028 BLAKE2B 2d9c9a61f44a8e1cf11429d9f32ffd047368ee9d42c5ab25bfafc3bdd3d856afb49aef8c46c850f9739de8db634dcadccdf83cc86fc9d7c078d5b96b7f300a6b SHA512 a96074ee5db257f0317677f8e67e1b634504fa0a608dddd089f1683fe6f77ca586bd6ebf54c35017eaf51c9025fb7c48697a340c74fd4c29976287009a805729
@@ -7,18 +9,10 @@ DIST file002.fits 11520 BLAKE2B e1983941ca932f9db088f2d1856ca3b1fd268cf8d30e1885
 DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c041a1e1ef7ad9846a711fafb71ba71b191a7dc44cd94ae7172640210a5c48e2910d34efea4c20989e1 SHA512 dc143b27f8850e2a55ad95a9a7a76a348f0b9b0af5a223d1ae11157eb358acf74e482957faaa0cdbaf260b9cbe14b10e6b504068c7b312f059119c022279611f
 DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8
 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a
-DIST openimageio-2.4.12.0.tar.gz 32157951 BLAKE2B dd7dd7b641266a7c575eafbc258ffc4b298236043960ae6ef878f46cd3ec3342f3be5b9a14459724578abc6390318666e43e8835ef6b2f25bc05a52002c7096f SHA512 5a0b9e6b634326be051dac46d2145149e9ff3e33d60d05728420d156431d6aa85186706b5f5b66ab820f4cd97f68d049a76e2da13f99e457135360f56fb5a257
-DIST openimageio-2.4.13.0.tar.gz 32162857 BLAKE2B 43d6c16fb9dfba2e01ea6a7b68e8c72ec0c11be0d42d96e476a79b7972bcf61f2ac377009493e8fa9367001cc788a1453f8c0f1cf061a204f9da4b9f713d5554 SHA512 9e887c7039995ce7c41556e09a7eed940863260a522ecf7d9bec300189026ed507da560620dfa4a619deeb679be7adf42fe3a7020ff3094df777c7934c771227
-DIST openimageio-2.4.14.0.tar.gz 47890469 BLAKE2B 53865ab493a586a1e4fdc6f81a90f7ae3847556a09a9c19ade48cbe5d8e3f807d864a2409a468613b1a55c128d5f5e119f1f2a70fc44b1a5293c99c3431cc69f SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f
-DIST openimageio-2.4.15.0.tar.gz 47894262 BLAKE2B 82afc48b3d9affb987d94c57d91fe93b27c78350d02fc7605ce3995e5f37724495bbc0d2f85fa8efb86113ef48d0aec15cfdb9bad8547315542ed125e5f71349 SHA512 dc1f805d6dc85170784d2b2860bfd488fdebb92cb12254d5c0d4df9483e55f298f6fbf74aca0c52162583300327de99bd92f73c2a2b7f5611f61bbfef5ca22a5
-DIST openimageio-2.4.16.0.tar.gz 47894563 BLAKE2B 02788bb7ccc9bbcb84a44df0c86252545f89cf8dcd1b84443f185f43e60c9eb701e9c5e781c946dec797ec888c5ebdd5efb3f1d95b684c71cbb7271bf6f0da9e SHA512 f9835d6b5e938bdba462a64eb9cc3b89f27ea36b6b59f7143a9c0b2794f095ca68fbd26bdd7322b2b260e9ded5cc6a91f86ad11f292ad8163a1dfe55b9a3446c
-DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5
-DIST openimageio-2.5.4.0.tar.gz 48107518 BLAKE2B 38ba0f01976cfbe0f81c04fe8e64ff9c5ab530204d45a7b566882a7ec31c378c61a9b6bc62d6453c51e7ed33cd514a758b5d8224a646e568c9abd6274ebc6b0c SHA512 db9576bbc0b77da19db957710e86d8979e9987e91ff6246b513197fa98545904a7d34873cc2ba3ee60deed0a00a757dafb8dfa604f1e52097a1848aef43427cd
-DIST openimageio-2.5.5.0.tar.gz 52025462 BLAKE2B d8d88d5e89815525fe7e75983b8d373058901614dcea9743a3851e242aa5f076b81ef3cc18764063e456ed9b79758d146c5d862be3a45d3671c59c7195acfa51 SHA512 d8ac989a6c7007089e3a29723889c9b9644d23ca9da1606da9f8c6bd7c0b301cf6a03f57c8eaaaca2a2fb2f3e79291f9dfa46ed31240a15d4650b83bf93ce96d
+DIST openimageio-2.5.12.0.tar.gz 52535046 BLAKE2B d60e823b8834c68098e771929475b7321363aad044b244a5c2a284e1c67a1a3145d22ed259eccbc4f6fbfcd6d2768414e4f22bdfa17f6516205d7749dcc6c6c8 SHA512 c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4
 DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
-DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
-DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6
+DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59
 DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521
 DIST tst0001.fits 43200 BLAKE2B 7d9d82fde64c3b21f8f86be6feaf9187d48c2c504c9afc0e652015512fb3d9e04c0f78596cdc9d7cc54815175549bfdf01d2d80f894cd36f4e6284aaf065dcc8 SHA512 b401accd51b56a493e2ec52fe4441e05cbefa3d03fe0e1c6834327094ab9f8e0c69a0f2cff26007ed7c7f8686a78a3a7e043d945f3a93c1b68e03668b8cbdc5c
 DIST tst0003.fits 152640 BLAKE2B 74c38c9f6cd65a46eff865589bd319111187d123c90bedc80f934caf6625f20120ecb30e8f5210c7d5d6609964e63fc2c2fc59f60bf609a07f2440421f44356e SHA512 4cd9c9a96fd3a5b8daae7d6b34af4c68c965abc4cc825aaaf9f3587a43328f468595ff1cd210e9fbca365bd52bf31a70abf39b2b3966d3087dd3af40ba0781a4
@@ -27,13 +21,6 @@ DIST tst0006.fits 112320 BLAKE2B 1e3df92d994c1d0cfbf18956b124cc85510ae2dbbdbc528
 DIST tst0007.fits 8640 BLAKE2B cf6eaff174e88bbd27f642964e6b3e5502cb08742d465a7cabb7aeaf284838f44660b5fa98c17df3c28f5986ecf657d8ec011579e3d9d62e63ce2171c157fd91 SHA512 ee8359132031678fa5e37f3b44642f41a7f64b251c3e788fbb756ad761327c1e1243df2b718cfe246449198d4e642b36fd43c61308ac434121ad4eadb3b2aaa3
 DIST tst0008.fits 8640 BLAKE2B 7b4213cef2106cf0e298fce1ba3b28e74ba6ed26a2441650af297384b46c22910af8a36c2693c1c0e5aed6196561a8e4b4c75cde54541ea7a1a9d684a41f2f40 SHA512 c2dc77eb54cfc48bc97228a06e25cc5b4b2a8f32f417d5a34bb6794b020b277e144b1d5c71f09a44c94e05797c99f318de3f8705eabd22b44ac1b47fe601f918
 DIST tst0013.fits 72000 BLAKE2B 6ca11cd033782adc8f359217e30752b47623c317aa155dc1bae43a0a019f7d5f9d4ba9c7349e99ee14f2d6498d5d166597606721b251b1b2dc039fbe400d00a3 SHA512 c816642e89e3bfdce38a4f755e84a12af35c9da48916abb66bcabf2f899201dfba3c988f929395092921a53a6d94922d84d325334e9bd8d348cdb305878ccb6a
-EBUILD openimageio-2.4.12.0.ebuild 6052 BLAKE2B 42a713dfedb558a15becb7704412b3b4c2fa2b311894860becf1b74503f23719b82dbeb2434524a6fa6b45ee270d667b5b3d03640dc84a6fcdc263509c45cd98 SHA512 34e56ed35732fa46fc24e27b9b10014788edfe42cf6c41990a455bf093ffb18f7367aad878fe7e4e9ca2990e993814ad8e77c88c9d0fe93916313a9e93d4a1b2
-EBUILD openimageio-2.4.13.0.ebuild 6336 BLAKE2B c8694836ba140ba60de04b3468a0884a69a515bb34c0c1a4ce0c2bf8eb055601a8b73ee5ad3559b8368e5bb19e23e74bcba526bc4110450182552e1dbe1803f7 SHA512 14e02cfaede8883ff1aafc23760de610dfd407528a32f126615a9f36154a57a4f0318e4cdb735b0dd762f12bae443406e2841718d7b577b4a297c6707f658349
-EBUILD openimageio-2.4.14.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b715aaa551bb80bb92c6a74883e63a91a55561734c98eb79566815df7fcd8a73287d9b79ba2d0f9e13a893637d7dbbf387 SHA512 70847532d5fc11c8d88067c1b0c82269d35509aa7d36eefec129276b8bc9772626c69ce6d1a65246ba1ccfd972c7bc7694227cc87f0551dd3ad7d8f49f829795
-EBUILD openimageio-2.4.15.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b715aaa551bb80bb92c6a74883e63a91a55561734c98eb79566815df7fcd8a73287d9b79ba2d0f9e13a893637d7dbbf387 SHA512 70847532d5fc11c8d88067c1b0c82269d35509aa7d36eefec129276b8bc9772626c69ce6d1a65246ba1ccfd972c7bc7694227cc87f0551dd3ad7d8f49f829795
-EBUILD openimageio-2.4.16.0.ebuild 6279 BLAKE2B 82ad95094099201dbeedfd58a198e9b715aaa551bb80bb92c6a74883e63a91a55561734c98eb79566815df7fcd8a73287d9b79ba2d0f9e13a893637d7dbbf387 SHA512 70847532d5fc11c8d88067c1b0c82269d35509aa7d36eefec129276b8bc9772626c69ce6d1a65246ba1ccfd972c7bc7694227cc87f0551dd3ad7d8f49f829795
-EBUILD openimageio-2.4.6.0-r1.ebuild 5655 BLAKE2B 1347ac2ce140d8e0bbbb090735d503b301ec77ce5e889f84a924a0420a193c03f16016f9b86230a90b051a18234d4af75a00da14fc1da3caa58d7120d134066a SHA512 e980fc817a226973f7f362d9b22c0ba2d3390ab1b5a672b3bd06c6de446dc7a8c2015ee6d1d720fdcfeae6191b233d1fb48dc31ddd9ed3fac427bfbae9e44505
-EBUILD openimageio-2.5.4.0.ebuild 6241 BLAKE2B 247558a823639e6b7a1b75320c6997404a1c68f6edde9796fec05344edfcc485e11dff9d0d27fcd948283df7ecf0d453d7df2adaf26658ba6ebea11e89f4c901 SHA512 7ff883324ec33247e25e53e457fbb4601978bc5409b37dfbf7b3aa2c20eb7065b8b81665f732e4b03c384e7ce79617b3c2e63bbd249eed5f67b0d8d7baea4692
-EBUILD openimageio-2.5.5.0.ebuild 6308 BLAKE2B 51fe9d0fd9456ece2dc7eca8c98ca45a84ddb50eb509dbe70e8942360a10dcd15669c9c4413f86a42662fc25955d60de47665eff223736cc889af643d3fd4629 SHA512 471a0bdee8f84182a6404b9fa1f57ebd5335c3e7933e3f28c79ea69c8697fd9f2e65adecae3355c5c99d74d2f34f6c88d431fc558afce0c62b95029e37270e69
+EBUILD openimageio-2.5.12.0.ebuild 8123 BLAKE2B 8c7123b99c4d42023d676c6b642aedd56797d72b6a556f083692f8ed11c42d5089e8588b92788bafe39e28ac2c6af15e1340c7b5a14d9d234f36970d8c7b5da2 SHA512 83b59b19b80419964ac16a1288996dda79f67a5e13adc3a06e411a3a60953c69f598719ad5c9b0721dfdb1f3ee5d11480ceef2465f04cb09090b404a38d7e027
 EBUILD openimageio-2.5.9.0.ebuild 7112 BLAKE2B b7f47974a996bc81e5439f4a7ab84496c06dffe01ee96a33a85415f6b4341d2281b853123b7a4b116d83715ddf21481dd592ca4689426ae84f332e95d3ebac41 SHA512 c0119d58d7a34f0511c3fd7e4a941acd98b271719460b12c6ccbefa9f49ea10b18003f005553a6cc86e6425b57399452cd1b6e52c113c37bb0c63d22ae583885
-MISC metadata.xml 1025 BLAKE2B 0fb315d25d5627709d9fe41c2e1d87320a42d9db3093ddfff742ccc32a37efb965536bf9fe64c5ce5be00bf3960cdd08d676bd2a47efe6d4739aa22e29efbc48 SHA512 68797e28b75e8334924ae96b1872e8ab61b59de9f5220e54656a41f6b4401a385fc1de4028285c2bb292b35e8a059c856ef67eedb3957f1cb9eda6ac7720ac21
+MISC metadata.xml 981 BLAKE2B 3497976625638ed812c74f4cceef74a752ab81f035674352d5b30f533c8b3f819a7cb44395d7e8456c78d92103ebe9c89bbf71aa292a2c72255674676e379318 SHA512 a349edcb5a9fcf5c7abe77d37260126b4866ba9bff06e7bc11279d91ac193ffe8df13dfcb373306fea417a28d0a6b8b2028c660adaf83d9a6f1a698cd48dd4e5
diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch b/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch
new file mode 100644
index 000000000000..5b284baa281b
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.12.0-tests-optional.patch
@@ -0,0 +1,31 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Make fits test images download optional
+Make j2k test images download optional
+
+diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
+index b671def..ff84b7d 100644
+--- a/src/cmake/testing.cmake
++++ b/src/cmake/testing.cmake
+@@ -271,9 +271,11 @@ macro (oiio_add_all_tests)
+                     IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+     oiio_add_tests (jpeg2000
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR oiio-images URL "Recent checkout of oiio-images")
+     oiio_add_tests (jpeg2000-j2kp4files
+                     FOUNDVAR OPENJPEG_FOUND
++                    ENABLEVAR ENABLE_OPENJPEG
+                     IMAGEDIR j2kp4files_v1_5
+                     URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
+     set (all_openexr_tests
+@@ -410,6 +410,10 @@ function (oiio_setup_test_data)
+     oiio_get_test_data (openexr-images
+                         REPO https://github.com/AcademySoftwareFoundation/openexr-images.git
+                         BRANCH main)
++    if(ENABLE_FITS)
+     oiio_get_test_data (fits-images)
++    endif()
++    if(ENABLE_OPENJPEG)
+     oiio_get_test_data (j2kp4files_v1_5)
++    endif()
+ endfunction ()
diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch b/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch
new file mode 100644
index 000000000000..b7543e1e9562
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.12.0_heif_test.patch
@@ -0,0 +1,18 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: 2024-06-03
+Subject: [PATCH] create a ref output for libheif1.15
+
+--- a/testsuite/heif/ref/out-libheif1.15-orient.txt	2024-06-01 21:59:05.000000000 +0200
++++ b/testsuite/heif/ref/out-libheif1.15-orient.txt	2024-06-02 17:36:18.069440905 +0200
+@@ -39,6 +39,11 @@
+     Exif:SubsecTimeOriginal: "006"
+     Exif:WhiteBalance: 0 (auto)
+     oiio:ColorSpace: "sRGB"
++Reading ref/Chimera-AV1-8bit-162.avif
++ref/Chimera-AV1-8bit-162.avif :  480 x  270, 3 channel, uint8 heif
++    SHA-1: F8FDAF1BD56A21E3AF99CF8EE7FA45434D2826C7
++    channel list: R, G, B
++    oiio:ColorSpace: "sRGB"
+ Reading ../oiio-images/heif/greyhounds-looking-for-a-table.heic
+ ../oiio-images/heif/greyhounds-looking-for-a-table.heic : 3024 x 4032, 3 channel, uint8 heif
+     SHA-1: 8211F56BBABDC7615CCAF67CBF49741D1A292D2E
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 626c08235ddd..ebe3fe1f3f72 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag>
 		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
-		<flag name="qt5">Build iv with Qt5</flag>
 		<flag name="qt6">Build iv with Qt6</flag>
 		<flag name="tools">Build the command-line tools</flag>
 	</use>
diff --git a/media-libs/openimageio/openimageio-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild
deleted file mode 100644
index af89cc4292f7..000000000000
--- a/media-libs/openimageio/openimageio-2.4.12.0.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{9..11} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-	https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-	https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-)"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( tools ) qt6? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		media-libs/libglvnd
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		media-libs/libglvnd
-		dev-qt/qtbase:6[gui,widgets,opengl]
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_pretend() {
-	use qt5 && use qt6 && einfo "The \"qt5\" USE flag has no effect when the \"qt6\" USE flag is also enabled."
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TOOLS=$(usex tools)
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	if use qt5 || use qt6; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild
deleted file mode 100644
index 3ee64256656e..000000000000
--- a/media-libs/openimageio/openimageio-2.4.13.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{10..11} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-	https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-	https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-)"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( tools ) qt6? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		media-libs/libglvnd
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	qt6? (
-		media-libs/libglvnd
-		dev-qt/qtbase:6[gui,widgets,opengl]
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_pretend() {
-	use qt5 && use qt6 && einfo "The \"qt5\" USE flag has no effect when the \"qt6\" USE flag is also enabled."
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DOIIO_BUILD_TOOLS=$(usex tools)
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	if use qt5 || use qt6; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.4.14.0.ebuild b/media-libs/openimageio/openimageio-2.4.14.0.ebuild
deleted file mode 100644
index 723468d6f284..000000000000
--- a/media-libs/openimageio/openimageio-2.4.14.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		"-DVERBOSE=ON"
-		"-DOIIO_BUILD_TOOLS=$(usex tools)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DOIIO_BUILD_TESTS=$(usex test)"
-		"-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF"
-		"-DINSTALL_FONTS=OFF"
-		"-DBUILD_DOCS=$(usex doc)"
-		"-DINSTALL_DOCS=$(usex doc)"
-		"-DSTOP_ON_WARNING=OFF"
-		"-DUSE_CCACHE=OFF"
-		"-DUSE_DCMTK=$(usex dicom)"
-		"-DUSE_EXTERNAL_PUGIXML=ON"
-		"-DUSE_JPEGTURBO=ON"
-		"-DUSE_NUKE=OFF" # not in Gentoo
-		"-DUSE_FFMPEG=$(usex ffmpeg)"
-		"-DUSE_GIF=$(usex gif)"
-		"-DUSE_OPENJPEG=$(usex jpeg2k)"
-		"-DUSE_OPENCV=$(usex opencv)"
-		"-DUSE_OPENVDB=$(usex openvdb)"
-		"-DUSE_PTEX=$(usex ptex)"
-		"-DUSE_PYTHON=$(usex python)"
-		"-DUSE_LIBRAW=$(usex raw)"
-		"-DUSE_FREETYPE=$(usex truetype)"
-		"-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")"
-	)
-
-	if use gui; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto "${FONTDIR}"
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.4.15.0.ebuild b/media-libs/openimageio/openimageio-2.4.15.0.ebuild
deleted file mode 100644
index 723468d6f284..000000000000
--- a/media-libs/openimageio/openimageio-2.4.15.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		"-DVERBOSE=ON"
-		"-DOIIO_BUILD_TOOLS=$(usex tools)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DOIIO_BUILD_TESTS=$(usex test)"
-		"-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF"
-		"-DINSTALL_FONTS=OFF"
-		"-DBUILD_DOCS=$(usex doc)"
-		"-DINSTALL_DOCS=$(usex doc)"
-		"-DSTOP_ON_WARNING=OFF"
-		"-DUSE_CCACHE=OFF"
-		"-DUSE_DCMTK=$(usex dicom)"
-		"-DUSE_EXTERNAL_PUGIXML=ON"
-		"-DUSE_JPEGTURBO=ON"
-		"-DUSE_NUKE=OFF" # not in Gentoo
-		"-DUSE_FFMPEG=$(usex ffmpeg)"
-		"-DUSE_GIF=$(usex gif)"
-		"-DUSE_OPENJPEG=$(usex jpeg2k)"
-		"-DUSE_OPENCV=$(usex opencv)"
-		"-DUSE_OPENVDB=$(usex openvdb)"
-		"-DUSE_PTEX=$(usex ptex)"
-		"-DUSE_PYTHON=$(usex python)"
-		"-DUSE_LIBRAW=$(usex raw)"
-		"-DUSE_FREETYPE=$(usex truetype)"
-		"-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")"
-	)
-
-	if use gui; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto "${FONTDIR}"
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.4.16.0.ebuild b/media-libs/openimageio/openimageio-2.4.16.0.ebuild
deleted file mode 100644
index 723468d6f284..000000000000
--- a/media-libs/openimageio/openimageio-2.4.16.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		"-DVERBOSE=ON"
-		"-DOIIO_BUILD_TOOLS=$(usex tools)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DOIIO_BUILD_TESTS=$(usex test)"
-		"-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF"
-		"-DINSTALL_FONTS=OFF"
-		"-DBUILD_DOCS=$(usex doc)"
-		"-DINSTALL_DOCS=$(usex doc)"
-		"-DSTOP_ON_WARNING=OFF"
-		"-DUSE_CCACHE=OFF"
-		"-DUSE_DCMTK=$(usex dicom)"
-		"-DUSE_EXTERNAL_PUGIXML=ON"
-		"-DUSE_JPEGTURBO=ON"
-		"-DUSE_NUKE=OFF" # not in Gentoo
-		"-DUSE_FFMPEG=$(usex ffmpeg)"
-		"-DUSE_GIF=$(usex gif)"
-		"-DUSE_OPENJPEG=$(usex jpeg2k)"
-		"-DUSE_OPENCV=$(usex opencv)"
-		"-DUSE_OPENVDB=$(usex openvdb)"
-		"-DUSE_PTEX=$(usex ptex)"
-		"-DUSE_PYTHON=$(usex python)"
-		"-DUSE_LIBRAW=$(usex raw)"
-		"-DUSE_FREETYPE=$(usex truetype)"
-		"-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")"
-	)
-
-	if use gui; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto "${FONTDIR}"
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
deleted file mode 100644
index b0ad2973ca0f..000000000000
--- a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{9..11} )
-
-TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.5.12.0.ebuild b/media-libs/openimageio/openimageio-2.5.12.0.ebuild
new file mode 100644
index 000000000000..c778a756041e
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.5.12.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+TEST_OIIO_IMAGE_COMMIT="7d821f02c848022b2ee703d6bee48ca2acbfae70"
+TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
+inherit cmake flag-o-matic python-single-r1 virtualx
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="
+	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		 -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+		jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
+
+		fits? (
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
+			https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
+			https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
+		)
+	)
+"
+S="${WORKDIR}/OpenImageIO-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	jpeg2k? ( app-arch/unzip )
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.13.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	fits? ( sci-libs/cfitsio:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	gui? (
+		media-libs/libglvnd
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,widgets,opengl]
+		)
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	CHANGES.md
+	CREDITS.md
+	README.md
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch"
+	"${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
+	"${FILESDIR}/${PN}-2.5.12.0-tests-optional.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use dicom; then
+		rm "src/dicom.imageio" -r || die
+	fi
+
+	if ! use gif; then
+		rm src/gif.imageio -r || die
+	fi
+
+	if ! use jpeg2k; then
+		rm src/jpeg2000.imageio -r || die
+	fi
+
+	if ! use raw; then
+		rm src/raw.imageio -r || die
+	fi
+
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
+		mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
+
+		if use fits; then
+			mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die
+			for a in ${A}; do
+				if [[ "${a}" == file*.fits ]]; then
+					cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die
+				fi
+				if [[ "${a}" == tst*.fits ]]; then
+					cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die
+				fi
+			done
+		fi
+
+		if use jpeg2k; then
+			mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
+		fi
+
+		cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die
+		eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch"
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd[*]} ]] && mysimd=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local mycmakeargs=(
+		-DVERBOSE="yes"
+		-DINTERNALIZE_FMT="no"
+		# -DALWAYS_PREFER_CONFIG="yes"
+		# -DGLIBCXX_USE_CXX11_ABI="yes"
+		# -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16
+		-DSTOP_ON_WARNING="OFF"
+
+		-DCMAKE_CXX_STANDARD="17"
+		-DDOWNSTREAM_CXX_STANDARD="17"
+
+		-DCMAKE_UNITY_BUILD_MODE="BATCH"
+		-DUNITY_SMALL_BATCH_SIZE="$(nproc)"
+
+		-DBUILD_DOCS="$(usex doc)"
+		# -DBUILD_OIIOUTIL_ONLY="no"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DINSTALL_FONTS="OFF"
+		-DINSTALL_DOCS="$(usex doc)"
+
+		-DENABLE_DCMTK="$(usex dicom)"
+		-DENABLE_FFmpeg="$(usex ffmpeg)"
+		-DENABLE_FITS="$(usex fits)"
+		-DENABLE_FREETYPE="$(usex truetype)"
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LibRaw="$(usex raw)"
+		-DENABLE_Nuke="no" # not in Gentoo
+		-DENABLE_OpenCV="$(usex opencv)"
+		-DENABLE_OpenJPEG="$(usex jpeg2k)"
+		-DENABLE_OpenVDB="$(usex openvdb)"
+		-DENABLE_TBB="$(usex openvdb)"
+		-DENABLE_Ptex="$(usex ptex)"
+
+		-DENABLE_GIF="$(usex gif)"
+		-DENABLE_LIBRAW="$(usex raw)"
+		-DENABLE_PTEX="$(usex ptex)"
+		-DENABLE_OPENJPEG="$(usex jpeg2k)"
+
+		-DOIIO_BUILD_TOOLS="$(usex tools)"
+		-DOIIO_BUILD_TESTS="$(usex test)"
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA="no"
+
+		-DUSE_CCACHE="no"
+		-DUSE_EXTERNAL_PUGIXML="yes"
+		# -DUSE_LIBCPLUSPLUS="yes"
+		-DUSE_R3DSDK="no" # not in Gentoo
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
+)
+
+	if use gui; then
+		mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" )
+		if ! use qt6; then
+			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
+		fi
+	else
+		mycmakeargs+=(
+			-DUSE_QT="no"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	DESTDIR="${T}" cmake_build install
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+	)
+
+	sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
+		-i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
+
+	local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
+	CI=true
+	CMAKE_PREFIX_PATH="${T}/usr"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
+
+	if use python; then
+		PYTHONPATH="${T}$(python_get_sitedir)"
+	fi
+
+	virtx cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr "${T:?}"/usr || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove Windows loader file
+	if use python; then
+		rm "${D}$(python_get_sitedir)/__init__.py" || die
+	fi
+}
diff --git a/media-libs/openimageio/openimageio-2.5.4.0.ebuild b/media-libs/openimageio/openimageio-2.5.4.0.ebuild
deleted file mode 100644
index cc11c16d6f6c..000000000000
--- a/media-libs/openimageio/openimageio-2.5.4.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		"-DVERBOSE=ON"
-		"-DOIIO_BUILD_TOOLS=$(usex tools)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DOIIO_BUILD_TESTS=$(usex test)"
-		"-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF"
-		"-DINSTALL_FONTS=OFF"
-		"-DBUILD_DOCS=$(usex doc)"
-		"-DINSTALL_DOCS=$(usex doc)"
-		"-DSTOP_ON_WARNING=OFF"
-		"-DUSE_CCACHE=OFF"
-		"-DUSE_DCMTK=$(usex dicom)"
-		"-DUSE_EXTERNAL_PUGIXML=ON"
-		"-DUSE_NUKE=OFF" # not in Gentoo
-		"-DUSE_FFMPEG=$(usex ffmpeg)"
-		"-DUSE_GIF=$(usex gif)"
-		"-DUSE_OPENJPEG=$(usex jpeg2k)"
-		"-DUSE_OPENCV=$(usex opencv)"
-		"-DUSE_OPENVDB=$(usex openvdb)"
-		"-DUSE_PTEX=$(usex ptex)"
-		"-DUSE_PYTHON=$(usex python)"
-		"-DUSE_LIBRAW=$(usex raw)"
-		"-DUSE_FREETYPE=$(usex truetype)"
-		"-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")"
-	)
-
-	if use gui; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto "${FONTDIR}"
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.5.5.0.ebuild b/media-libs/openimageio/openimageio-2.5.5.0.ebuild
deleted file mode 100644
index 28e7f281307b..000000000000
--- a/media-libs/openimageio/openimageio-2.5.5.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
-TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
-inherit cmake flag-o-matic font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="
-	https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)
-"
-S="${WORKDIR}/OpenImageIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-
-IUSE="dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )"
-
-# Not quite working yet
-RESTRICT="!test? ( test )" # test"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.13.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	gui? (
-		media-libs/libglvnd
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	CHANGES.md
-	CREDITS.md
-	README.md
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use dicom || rm -r "${S}/src/dicom.imageio/" || die
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd[*]} ]] && mysimd=("0")
-
-	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
-	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
-	use arm64 && append-flags -flax-vector-conversions
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD="17"
-		-DDOWNSTREAM_CXX_STANDARD="17"
-		"-DVERBOSE=ON"
-		"-DOIIO_BUILD_TOOLS=$(usex tools)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DOIIO_BUILD_TESTS=$(usex test)"
-		"-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF"
-		"-DINSTALL_FONTS=OFF"
-		"-DBUILD_DOCS=$(usex doc)"
-		"-DINSTALL_DOCS=$(usex doc)"
-		"-DSTOP_ON_WARNING=OFF"
-		"-DUSE_CCACHE=OFF"
-		"-DUSE_DCMTK=$(usex dicom)"
-		"-DUSE_EXTERNAL_PUGIXML=ON"
-		"-DUSE_NUKE=OFF" # not in Gentoo
-		"-DUSE_FFMPEG=$(usex ffmpeg)"
-		"-DUSE_GIF=$(usex gif)"
-		"-DUSE_OPENJPEG=$(usex jpeg2k)"
-		"-DUSE_OPENCV=$(usex opencv)"
-		"-DUSE_OPENVDB=$(usex openvdb)"
-		"-DUSE_PTEX=$(usex ptex)"
-		"-DUSE_PYTHON=$(usex python)"
-		"-DUSE_LIBRAW=$(usex raw)"
-		"-DUSE_FREETYPE=$(usex truetype)"
-		"-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")"
-	)
-
-	if use gui; then
-		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
-		fi
-	else
-		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			"-DPYTHON_VERSION=${EPYTHON#python}"
-			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# TODO: investigate failures
-	local myctestargs=(
-		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto "${FONTDIR}"
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ec09372920df..a7348e120159 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index 5a1bb4396549..8daaa9683ca3 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -2,5 +2,5 @@ AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e
 DIST cava-0.10.1.tar.gz 129520 BLAKE2B 181a511feb8b9a6806316264c27e963fe7827802d8e333c39d59a0e3f67dd57bea967b05aeb869455992b905afd9c6e3f568debb84155068cbef03621047da6b SHA512 8a71628bae6621ef925f5fed94659b07d9220e142c17514bed79e1105a9160494bf3978267c9de3ab6cd2126ece50419fb4245ccf190f3a299fc0cfb111be354
 DIST cava-0.10.2.tar.gz 130036 BLAKE2B 155a0152571a6b1b847340fe438389f58b963af047d4136595a8b2933a4ac5b1fff87600110765c7c1500072ebd8b730d971918b8701598526052d137465ac81 SHA512 c28ef5a89668b8f90a3b4cbf71b208dd067268d5ed9eca35ff3881bfab0fd7bf72efe2164f29af47ca7972637d8f1d6a86ff2b2e0c9c9221a1856d8dfa960065
 EBUILD cava-0.10.1.ebuild 2264 BLAKE2B bffc698aadcfe96c2f4c170f3cc8dabbb31a78c854598d64dc2bca802cc5485cce48e395cda33eb689f2f08874ef8240c55a7fd1dd9553cef578513940c02167 SHA512 0aa8b4795200daefd052dfe145e1052609b3880eeec09254ebd9e234610097672ecc893f17d6c672645654da216f02ed966cdd51ba0da15f9edd1945e3fbd44e
-EBUILD cava-0.10.2.ebuild 2264 BLAKE2B bffc698aadcfe96c2f4c170f3cc8dabbb31a78c854598d64dc2bca802cc5485cce48e395cda33eb689f2f08874ef8240c55a7fd1dd9553cef578513940c02167 SHA512 0aa8b4795200daefd052dfe145e1052609b3880eeec09254ebd9e234610097672ecc893f17d6c672645654da216f02ed966cdd51ba0da15f9edd1945e3fbd44e
+EBUILD cava-0.10.2.ebuild 2370 BLAKE2B 341396683022860812ccaaaf4b9bfa9f5a678594063883cbc067107a6008a6ae9e31dcf91af3eda82a29b58834d4673a31249672690385a522b0366322aab447 SHA512 0d480e38323b9f775f4839370ad13bf7e09aef75e474b16d6155a7042734100debcea56785e53aac042efda3e106cf6635e32c9e3c505be4d8caf5f3d6cfe4d9
 MISC metadata.xml 521 BLAKE2B 9b5fc566431d23ee6c56ed429d3337a6fbccddde718487bf9e1cac36e5fc70173e20a070669a8c85179443af12bc032eecfa4b9829d96422170ff4cdd92518ee SHA512 57cdabe9b70f97abb5bd5e64b3b0f25ec113ce80f8b1eaa45682f814b20fa120fe0efc38552aed23c3cb4d918ba9f0d67030d18b4a307fbf0f81a8b962e35c87
diff --git a/media-sound/cava/cava-0.10.2.ebuild b/media-sound/cava/cava-0.10.2.ebuild
index 7251e5fe1301..cd7b175c4340 100644
--- a/media-sound/cava/cava-0.10.2.ebuild
+++ b/media-sound/cava/cava-0.10.2.ebuild
@@ -38,11 +38,11 @@ BDEPEND="
 	sdl? ( dev-build/autoconf-archive )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
-)
-
 src_prepare() {
+	# TODO: depend on >=4.2.2 and drop the patch when it is stable
+	has_version '<dev-libs/iniparser-4.2.2:4' &&
+		eapply "${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
+
 	default
 
 	echo ${PV} > version || die
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 176f0209241c..ac7b5ad75650 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -7,5 +7,5 @@ AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
 EBUILD lash-0.5.4-r5.ebuild 2594 BLAKE2B 06889426765f7151104efe1fde41104f9acc2eb5df774f698a4933bc40ddc4df294f799a07d7630acaf0591124b6abfaffe19b0e92117b54578dd9e198c4fa19 SHA512 6ab198aba02562bd83a1ba255400540b423038765fca417d0d6b300714d80cc51ed735b8161b279a40cd4e9920a0bf9fc34f8fa69785266a50020864a79a2690
-EBUILD lash-0.5.4-r6.ebuild 2656 BLAKE2B 3f5f0706ff35fbf8a6bc25dd91a1ed913aa70a4c3eb4d066fe44ea00fd67e212e09649e4585947564c50bd1023877f9038d0b7dce369079f89072a849baa7973 SHA512 54026c311cdd29c504548953ae8506a45e0561d09d8aac10478c32493b03999efa456fc95820eb83308d36b13fc7fcc7102946aaf40f6243c5a873dd4a466ecb
+EBUILD lash-0.5.4-r6.ebuild 2651 BLAKE2B e234ff9fb3f864038c7fda84f06ba17811f5a146a7a1cfb51e40a20b1e18b9e550a0175b3cc60329d66e65b1da4759f57881f5287fd7f443c31c1549c5fc74d2 SHA512 c6291b8e6614d60d9343aaf07f30b496bd8a68be692d52f6a31aa1d0757ea2e6b1671cf2d1d04acd0c097c78ce35f3d777789128eadd0d7fa74912058ea97d75
 MISC metadata.xml 348 BLAKE2B a5547f7cc6e5cae590b4d49c378f44c3591dd94d0b42a5ba666a2bc72875a1b54db17f8b4b7ad489d1b816d5fd45d82d62ae66916902d5c58007a465337c97c7 SHA512 49464d68db43ca854eeb3774a086d041e688ad0613b5cb4099d90498efb868003aba35afddbb92d2583982d9d8be28340cc26bcd33330a47948b44734e411639
diff --git a/media-sound/lash/lash-0.5.4-r6.ebuild b/media-sound/lash/lash-0.5.4-r6.ebuild
index 1ee913743360..c3e8d0f324cf 100644
--- a/media-sound/lash/lash-0.5.4-r6.ebuild
+++ b/media-sound/lash/lash-0.5.4-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit autotools multilib-minimal python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 5cba4f8f2957..7df04a6d1a8c 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,4 @@
 AUX pavucontrol-5.0-make-libcanberra-optional.patch 3727 BLAKE2B 27e38b16e1eaf64c7b1c3b0f3a6efc85bd4b290fef8b4c4c64a0e6e24de6565090e8a1f5d0ec1dc6ef1b65ff3c3c0836186ee53f27c844ca68515e98ea239e0c SHA512 3b866adf8495b8ffdbe48329ab4d54663ea3294e031f6d870d3c278b26b1d0314245ed4bca88e905e79cb503506f5762c3332fb5c9cc66ebe8205feb89e21369
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
-EBUILD pavucontrol-5.0-r2.ebuild 836 BLAKE2B 3a4c18ccd682c477c931dca5e3c5f61700aedf49820933ab17059290824649572f565cd7523493b4e1aa090a62407f65d57891e82a4388981814cc708c0c1395 SHA512 10caf61a4adf2efd673f92a2d75328f884d8e96700e0fc104b384bc8f6a61415d53d67317c1960ad585f4170577062b1c45ec66174a55a3713a1e6e07666483d
 EBUILD pavucontrol-5.0-r3.ebuild 1013 BLAKE2B e74befc69b34d827a34cfa883a9b5e1cf472a92716b8a1d2989483aa985e3f9398aa7d7e73f0ab8ba8ee020e47032d8f2836f2b6d2aca53861aed2dcb951fca3 SHA512 e530adefe6ab8a7ca64c9fe3d8cf8d6b5b5a4b0f1b2bfd60bc972a2ebe2413010fa0cb78f08b6f272700b27c4aaa763a0b456f13b6d9301b72f527b8987e9e60
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
deleted file mode 100644
index c6228d9e9b8d..000000000000
--- a/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
-HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/json-glib
-	>=dev-cpp/gtkmm-3.22:3.0[X]
-	>=dev-libs/libsigc++-2.2:2
-	>=media-libs/libcanberra-0.16[gtk3]
-	>=media-libs/libpulse-15.0[glib]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-lynx
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 5e18b1263d97..bf5be42949ef 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,4 @@
 AUX spotify-wrapper 922 BLAKE2B c3ac2049a1302ec6ac0c1dc4c1514199c49a87474ef77c392e0ce5c2dba65788255e5b04dc3b8142fd8f315ebfd2491a7ec259d6347357e059fd0e2f7f777caf SHA512 f658cd4338c3072638d39d79eb6b1a5d959cfd4398dbb08d5cd108ab246c43e337ad11cf10a25c57cad12c8342526f8928c992e81d0c5c678fc5056f8832f42c
-DIST spotify-client_1.2.31.1205.g4d59ad7c_amd64.deb 135223836 BLAKE2B 50ce5c84c538a31a64725d1d4afdaa88a95e2b6d1412a10316aaa197f8c69b2442227e52f7b875bbeea2a81d59aa692d78c11964ff4d1bf7b225c873c2ac9a58 SHA512 76babfbe40ab7b7c82d83a3ae40ab3dbc85e73b4a412aeaa8aa758c01c7cf69bd78df4ee222c4c5add84668f552212bed15049a8f8cd1025dc04a87f84c79f88
-EBUILD spotify-1.2.31.ebuild 3688 BLAKE2B 565c045c9a117970d2f3ca05c35fc63d2a2cf11081547a17a519d9f6faa5f258c01c80849a93ade12d0bf0518081b8bb0ce5526e89aa8d9f310defba23f50460 SHA512 1826839c8ec47d4aab537b1c3485ea3faafb7c375e0f1130df7f14113fb47f1eec98f3508a37a42fb73409da25339282a9c55c0a8efdc7fa3e3b1653a042e843
+DIST spotify-client_1.2.37.701.ge66eb7bc_amd64.deb 137805232 BLAKE2B bfcbc16d5c7698cf4061d886cec0fd3477c2d0592d4809a36b9b7156296baff7c0aacdfed30eff10a582841f550e0001048cb57a1a2817439957c2f994035372 SHA512 8a97c4e23b8e040878c6002d46c249583d57926813799888c63884aa5e4877f5fff9fdc3c9f835d6b1b432274d291380f03c8465f049184dc80aa68a652ef87e
+EBUILD spotify-1.2.37.ebuild 3687 BLAKE2B d7deb808f9accf2c5885629a2ada9d2428394de98b24fd0a1a7eedfa7f167cc3f905a776342b7296059a482d4a6ca9ee85d1612660cc10619e678929dda0a7c8 SHA512 5c4a5e36062b682675b17b8bf1a8c88c2244f3bada4734f7c389d01bfc36c84f00607f72a4bd99a5b554d26aa1c03134910c76edf0b47af527d0de08fad09e7f
 MISC metadata.xml 521 BLAKE2B 6859f340482640ec95ed103b2ca4b1e6c316509d8b87402068e1164a4efeaac9cf8ac5360ea038eb09c3682dd8e8e10a9cc872a3820c1a8341fcccaab34e0a18 SHA512 7527cfdf2d421e1bd7c156b930f980a464fad60f2ba2fafa5b79e4f04baad97a6ce3176987e8a32c8b5bcae20acf2b416812b26de1f7bc76205e0d8bee4e98e8
diff --git a/media-sound/spotify/spotify-1.2.31.ebuild b/media-sound/spotify/spotify-1.2.37.ebuild
index a01c85bd7944..ba699635b91a 100644
--- a/media-sound/spotify/spotify-1.2.31.ebuild
+++ b/media-sound/spotify/spotify-1.2.37.ebuild
@@ -8,7 +8,7 @@ inherit desktop pax-utils unpacker xdg
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/download/linux/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="1205.g4d59ad7c"
+BUILD_ID_AMD64="701.ge66eb7bc"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 
 LICENSE="Spotify"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 758960cb4d35..ba620b57ce13 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index a842007bfed1..cc1b3dc21440 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,4 +1,5 @@
+AUX subtitlecomposer-0.8.0-icu-75.patch 1042 BLAKE2B 3e8709a641e82998be9ea01f48b31f694677722f69445e77e28ee5dbd55bd68c4b2102f30d83189407051e1f338a68fb2783bdc46c855c130f36700456e8b5b7 SHA512 7b73cee530a03a70de0875a0a9ddc6a6f2dc9a03b9432472a3d343ab2eea68d59b38990e043c1054debe781c08697756099829bb92fa6ed41dcd865888377387
 DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b
 DIST subtitlecomposer-0.8.0.tar.xz 730800 BLAKE2B f4d89b11f7d0669ee4594739df06f1bac91c1defacc9c27f25bff9709140c0b56a8927b2f4f79544bd35475db558c7fa2e35bff912704dd9d4e5a745a44a373a SHA512 463824631b025c760423244434000c6e7f7d44097fb7a9178ada505daa6329de0649219f563431e98d8e780fce2b1f0a39cbd77a998ece3d131166045ae40dee
-EBUILD subtitlecomposer-0.8.0.ebuild 1515 BLAKE2B 41e5a74c86edabbffc47d01396bf162361da7c5c51ed9207a43ef9117067fc2ee9351039d12416b2e85744a5f17b6b3c4add8d13a11c033d7897af9087167864 SHA512 664ec8268c3a30deba383d62be3136981cf3b749a341309a50d74b8e4f020ba40f9c09e97447eb47bbc93539789b5d77a7fdd09f9f89108f98a9d6e3f6ed9ada
+EBUILD subtitlecomposer-0.8.0.ebuild 1561 BLAKE2B a84e1298caf067b195e168ee1972f261ecc4d5047fd7a144ce98a2f891cb0354b6346eeb9c3fb68175566eb9e338634f3f49ecf214a8dd61bde942420e2c44c9 SHA512 d71838aea55ed516292445041f0886b7ee9c1725960836c7b49995a571dcd2f6ebe30ac5d9c65e48a97eddd7622b2bf3eb3ece07c0b2cd7f8ae07dcc4ec628e7
 MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch
new file mode 100644
index 000000000000..89cef9917dec
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch
@@ -0,0 +1,36 @@
+From fe3cfc6455981cb6c7beae95713d22c431f3439e Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Wed, 22 May 2024 21:35:41 +0200
+Subject: [PATCH] Increased required std to C++17 #100
+
+C++17 is supported since gcc7 and ICU 75 headers require it.
+---
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e60e910a..fade001b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,17 +7,16 @@ if(QT_MAJOR_VERSION EQUAL 6)
+ 	set(QT_MIN_VERSION "6.0.0")
+ 	set(KF_MAJOR_VERSION "6")
+ 	set(KF_MIN_VERSION "5.240.0")
+-	set(CMAKE_CXX_STANDARD 17)
+ else()
+ 	set(QT_EXTRA_COMPONENTS)
+ 	set(QT_MAJOR_VERSION 5)
+ 	set(QT_MIN_VERSION "5.9.0")
+ 	set(KF_MAJOR_VERSION "5")
+ 	set(KF_MIN_VERSION "5.44.0")
+-	set(CMAKE_CXX_STANDARD 11)
+ endif()
+ 
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_STANDARD 17)
+ 
+ find_package(ECM REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+-- 
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
index 68d991328aa7..662986e1833f 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -51,6 +51,7 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}/${PATCHSET}/${PN}-0.7.1-tests-optional.patch" # TODO: upstream
+	"${FILESDIR}/${P}-icu-75.patch" # git master
 )
 
 src_configure() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1c2ca93d596a..f16ae7604dae 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ac06df55d509..fb94b98bd71a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Jun 2024 22:40:37 +0000
+Wed, 05 Jun 2024 22:40:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a01e6da7c8df..4fa3cdd667e5 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 574731 BLAKE2B 89caa0807b8cb3bb8f1cc5679dbe23ca4398827dd3b841269212eea4c56cfd057c2066dfc5853236e4134ffbd1bf10272359df656c88cc2dda1c7d6317ab1970 SHA512 68081b023a298180abb3d5c6ce33bd36fece32d1d6fe7d38f87edd236b3e70d2dc5c11f8a42561ff66103806af4278e08e0282649c4d9fe95a44f29ea0bc82b8
-TIMESTAMP 2024-06-04T22:40:40Z
+TIMESTAMP 2024-06-05T22:40:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZfl+hfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZg6W1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA/vA//UNabxFO1To4fOjlbjVTiYz5uaWN3oGCBsH3zPMYSLZknnbduXQDzhV+h
-SyPc2GzmR4Q+zKkBKvj7jXBxC/dq5Qefw1IIQXdlRZboeYDevF04xFu+uuIUZSAd
-MR2+s9jwPrpIQTPSEP+HMl80kjZ1Gk+2KwPlgHw+UQIaswcRPl2jiDz7RqZJqi2F
-eB7KE0cfsh45vd23Dipb9pMlvnpJkzYc6kknKrYT7cz5dzKkJNW7TJxgKP6mMVOW
-W4wyZtVXOmHyrDu7iXH6IApG2M+j4nwfkfCpf6RQ95dtCk8sgojoswbYlCpF/uEA
-yN+0+zN0kGjKwWPec6nCJzjqLgw0oXWU5he10VSIUCPaVVw9A0a2NTluOA13HD7G
-SG9GtVlBJK2gGZWdg/t7BWpwJk4EhcIzHdomb/JAz/S01lBjcK/CcNhD/TFiovqA
-Zq1KVN5HB145K3/ptcqbWXJI0O38NCzgFfz/v43hFDAvl0BSlgx+bDMLb4uizxkH
-v0/5SArb+n6C/Oe+UfpS/oD4Cah3ke/xTMkfFZrtbaeHu4nPUX3TixAt0Lzp6tgB
-VI1Tcxpq2PYNZFPZMFJWz0La2uQPjDE+WRDIfOmgHRqGCkYg4tLb9OW93Hd9QwXM
-NhzvfqWRFT5xkamGLAwscR04RHVwB40IhATeLm32AlGdBluF3WY=
-=pXUD
+klCQRg//UZfFnpu8H4p4BzMtDO8x+UfjtXzWjOmOSWY5I3ZEBfibjgbztgkbbLN8
+/wFM19nuE68SxWdi2RPtRgXWyzRs2huqiwtQIm/NxNVmX1yRkjGqAmqhmfcfL+zl
+UxHbgcCfvoCuKP+P+u+WBLIBJFfDCZyMKIaLTY0F3BJxMhs1Hw2UI2uqZZyGtmtw
+qRnI6no1b9hvhJzf2yeSR++QreoiiOI1X6mMARacAdRMZ+m8nyLQVkBiNIuCb7ce
+7w8xM7H7vjygEboHggbkxwu6TuIbQw4lmuBLovBs2gRDrE436sTTRJwupdBuJP1D
+aqXfETwx2L6SLTHj+sc92PJQnapwMxCq+ussJVS+sPgU9MToovcqc/KGh9EAC3M/
+oNhVDVeC742BvuQ96PQyqZuX6PKS08skYHdOkZzn9+Kf92xuOqr0izb2wMFLaOuj
+ye6Gx5g2WoKeyXmJ6wWrt7Oas9EMYcVTn8jR+BZRCAH3n7GmIfA8zJwlxsz3F6EA
+mZWuL0nXHfq0cmxeLIrGWmC6C6v0Rty1m0NiHudp7I6aYQJYH2+h4GKhoLQEsmyZ
+5zymjGfyuQr/Qcx8EjPxuQzBHMJxZIfm4glydWceIYRc3P4HbmUGC22olhvqhprB
+sdYRH1zuZx9wc2Fu+sCcAvzS59+mOmFxMWjtycm/Yvoc78bUCOo=
+=2CX2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ac06df55d509..fb94b98bd71a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Jun 2024 22:40:37 +0000
+Wed, 05 Jun 2024 22:40:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0d66169e8d37..c41d9c13f613 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 67b055e06ba1..c5c3510be7be 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/flite-2.2-r2 b/metadata/md5-cache/app-accessibility/flite-2.2-r2
index b6bf00b232ff..7e807d6e0eef 100644
--- a/metadata/md5-cache/app-accessibility/flite-2.2-r2
+++ b/metadata/md5-cache/app-accessibility/flite-2.2-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.festvox.org/flite/ https://github.com/festvox/flite
 INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=alsa oss pulseaudio test voices abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) )
 REQUIRED_USE=test? ( alsa )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/festvox/flite/archive/v2.2.tar.gz -> flite-2.2.tar.gz voices? ( http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_ben_rm.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_ad.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_dp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_guj_kt.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_hin_ab.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_kan_plv.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_mar_aup.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_mar_slp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_pan_amp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tam_sdr.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_kpn.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_sk.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_indic_tel_ss.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_aew.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ahw.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_aup.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_awb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_axb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_bdl.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_clb.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_eey.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_fem.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_gka.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_jmk.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ksp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_ljm.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_lnh.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_rms.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_rxr.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_slp.flitevox http://www.festvox.org/flite/packed/flite-2.2/voices/cmu_us_slt.flitevox )
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4f57891f3dae7074dcd3ad7d380ccb30
+_md5_=9d16d2964d789e3a1ef9fad22c6b4a20
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index edb8cceaebb3..baa7e8787f03 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.33.1 b/metadata/md5-cache/app-admin/awscli-1.33.1
new file mode 100644
index 000000000000..11ba291b9256
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.33.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/botocore-1.34.119[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.119[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !app-admin/awscli-bin python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.33.1.tar.gz -> aws-cli-1.33.1.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0b93d65db2a37b8a80a66b542751297c
diff --git a/metadata/md5-cache/app-admin/emacs-updater-1.17 b/metadata/md5-cache/app-admin/emacs-updater-1.17
deleted file mode 100644
index dd921343006d..000000000000
--- a/metadata/md5-cache/app-admin/emacs-updater-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=|| ( sys-apps/util-linux app-misc/getopt )
-DESCRIPTION=Rebuild Emacs packages
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) >=app-editors/emacs-23.1:* >=app-portage/portage-utils-0.80
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-updater-1.17.tar.xz
-_md5_=8eb57c17499e24c11b4c0f26086ab504
diff --git a/metadata/md5-cache/app-admin/emacs-updater-1.18 b/metadata/md5-cache/app-admin/emacs-updater-1.18
index 10b40a97696d..d55c8ce678ab 100644
--- a/metadata/md5-cache/app-admin/emacs-updater-1.18
+++ b/metadata/md5-cache/app-admin/emacs-updater-1.18
@@ -3,9 +3,9 @@ DEPEND=|| ( sys-apps/util-linux app-misc/getopt )
 DESCRIPTION=Rebuild Emacs packages
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) >=app-editors/emacs-23.1:* >=app-portage/portage-utils-0.80
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-updater-1.18.tar.xz
-_md5_=fc690d96a7a96d465c9026f506d4f8fd
+_md5_=a5677b03cfd964730cc3894514fc7576
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index aac9d81e65ce..99fe353cf4dc 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/gaffitter-1.0.0 b/metadata/md5-cache/app-cdr/gaffitter-1.0.0
new file mode 100644
index 000000000000..41e672ff2f12
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/gaffitter-1.0.0
@@ -0,0 +1,13 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Genetic Algorithm File Fitter
+EAPI=8
+HOMEPAGE=https://gaffitter.sourceforge.net/
+INHERIT=cmake
+IUSE=scripts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/gaffitter/gaffitter-1.0.0.tar.gz scripts? ( https://downloads.sourceforge.net/gaffitter/scripts/0.1.0/scripts-0.1.0.tar.bz2 )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b0d5c655f0a5378c6199da0cac31307b
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 4e1345a1f6e6..0f6987755dc7 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/tpm2-tss-4.0.2-r1 b/metadata/md5-cache/app-crypt/tpm2-tss-4.0.2-r1
index 0e4f6fa44de0..f418547cf92c 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-4.0.2-r1
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-4.0.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
 INHERIT=autotools flag-o-matic linux-info multilib-minimal tmpfiles udev
 IUSE=doc +fapi +openssl mbedtls +policy static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=acct-group/tss acct-user/tss sys-apps/util-linux:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fapi? ( dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.80.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(-)?] ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[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/tmpfiles
 REQUIRED_USE=^^ ( mbedtls openssl ) fapi? ( openssl !mbedtls ) policy? ( openssl !mbedtls )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/4.0.2/tpm2-tss-4.0.2.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=2775c1a6914e3467fe27ac786e4cc7a9
+_md5_=14b808d29181976bb53b0032beea58b6
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 509e7dccd80e..259fe00acb09 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/cider-1.14.0 b/metadata/md5-cache/app-emacs/cider-1.14.0
index 982bfeb20288..fe6e12279eb0 100644
--- a/metadata/md5-cache/app-emacs/cider-1.14.0
+++ b/metadata/md5-cache/app-emacs/cider-1.14.0
@@ -1,15 +1,15 @@
-BDEPEND=app-emacs/clojure-mode app-emacs/parseedn app-emacs/queue app-emacs/sesman app-emacs/spinner test? ( app-emacs/buttercup ) >=app-editors/emacs-26:*
+BDEPEND=app-emacs/clojure-mode app-emacs/parseedn app-emacs/queue app-emacs/sesman app-emacs/spinner test? ( app-emacs/buttercup ) test? ( app-emacs/buttercup ) >=app-editors/emacs-26:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Clojure Interactive Development Environment for GNU Emacs
 EAPI=8
 HOMEPAGE=https://cider.mx/ https://github.com/clojure-emacs/cider/
 INHERIT=elisp optfeature
-IUSE=test
+IUSE=test test
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=app-emacs/clojure-mode app-emacs/parseedn app-emacs/queue app-emacs/sesman app-emacs/spinner >=app-editors/emacs-26:*
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/cider/archive/v1.14.0.tar.gz -> cider-1.14.0.tar.gz
 _eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	abb2dda42f680fce87602c8273f832c7	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54
-_md5_=78014ea66fc197d8709583b96e8c822d
+_md5_=74ac096fc322d97389e17aa53effd27a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f36a36a58b68..8130d95e4cea 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/cloud-init-23.4 b/metadata/md5-cache/app-emulation/cloud-init-23.4
index 961e1c199e48..6249c4418da5 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-23.4
+++ b/metadata/md5-cache/app-emulation/cloud-init-23.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/cloud-init
 INHERIT=distutils-r1 udev
 IUSE=selinux test test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/oauthlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/configobj-5.0.2[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(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/netifaces[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger selinux? ( sec-policy/selinux-cloudinit ) 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/23.4/+download/cloud-init-23.4.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b3246b4d600f8e211abc31d500213d51
+_md5_=51c17ec608e3a4c28c14d5c69dd437f5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.14-r2 b/metadata/md5-cache/app-emulation/virtualbox-7.0.14-r2
deleted file mode 100644
index 3d15b2778d9b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.14-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-build/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.14 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.14 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.14/VirtualBox-7.0.14.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.14.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=657bd99e0c6c43d9c3234d083288ce7f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.18 b/metadata/md5-cache/app-emulation/virtualbox-7.0.18
deleted file mode 100644
index ed4e05751036..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.18
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-build/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.18 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.18 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.18/VirtualBox-7.0.18.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.18.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cb50e9b2cc9bb65c7f2f1341ca7edf3f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.14 b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.14
deleted file mode 100644
index 2817a6e5e64a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.14
+++ /dev/null
@@ -1,9 +0,0 @@
-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.14/VBoxGuestAdditions_7.0.14.iso
-_md5_=fc44a87cdda6df179d1c392308aada00
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.14-r1 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.14-r1
deleted file mode 100644
index cd6e0713dc37..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.14-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-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.14* =app-emulation/virtualbox-kvm-7.0.14* )
-RESTRICT=bindist mirror strip
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.14/Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.14.tar.gz
-_md5_=b126336bf0f5e6adbd7d06ea188e5067
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r1 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r1
deleted file mode 100644
index e564c5a01a08..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-build/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-compress 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.14/VirtualBox-7.0.14.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2
-_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6e5520c6126818817ead0565350ee6b9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r2 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r2
deleted file mode 100644
index a732c1ff7832..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-build/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-compress 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.14/VirtualBox-7.0.14.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2
-_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=9063ba76d90d659d7579730d4a7332d6
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r3 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r3
deleted file mode 100644
index 5d47018d2300..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.14-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-build/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 readme.gentoo-r1 systemd toolchain-funcs udev
-IUSE=+dbus gui dist-kernel modules-compress modules-sign +strip
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )
-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.14/VirtualBox-7.0.14.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2
-_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5d1cbf756143349ea19344901d94fd6a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.14_pre20240502 b/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.14_pre20240502
deleted file mode 100644
index 76094778c80a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-kvm-7.0.14_pre20240502
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-build/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 unpack
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers 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/ https://github.com/cyberus-technology/virtualbox-kvm
-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
-LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
-RDEPEND=!app-emulation/virtualbox python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) acct-group/vboxusers 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
-SRC_URI=https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.14.tar.bz2 https://github.com/cyberus-technology/virtualbox-kvm/archive/dev-20240502.tar.gz -> virtualbox-kvm-7.0.14_pre20240502.tar.gz https://download.virtualbox.org/virtualbox/7.0.14/VirtualBox-7.0.14.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.14.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41a359f2e1ce75f0f48ff5ed0c65c973
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.14-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.14-r1
deleted file mode 100644
index 99ddaba8da6a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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-compress 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.14.tar.xz
-_eclasses_=dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=69f11c347e39a8b897051a3da65c2da2
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 70328572020a..1f72e7a4a04d 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.5 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.5
new file mode 100644
index 000000000000..3473f352c836
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.5
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( app-i18n/ibus[python(+),python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
+DESCRIPTION=Korean Hangul engine for IBus
+EAPI=8
+HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome2-utils python-single-r1 xdg virtualx
+IUSE=nls python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-i18n/ibus[python(+),python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) python_single_target_python3_12? ( app-i18n/ibus[python(+),python_targets_python3_12(-)] dev-python/pygobject:3[python_targets_python3_12(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.5/ibus-hangul-1.5.5.tar.xz
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1dd946bd2174cf9f6a30099ac22347eb
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 504ebc0ce493..695312f82e7a 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-24.2.4.1 b/metadata/md5-cache/app-office/libreoffice-24.2.4.2
index 7d76b245328d..b63575198d01 100644
--- a/metadata/md5-cache/app-office/libreoffice-24.2.4.1
+++ b/metadata/md5-cache/app-office/libreoffice-24.2.4.2
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[threads(+),xml(+
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) base? ( java ) bluetooth? ( dbus ) kde? ( || ( qt5 qt6 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-24.2.3.2-icu-74.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-24.2.4.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-24.2.4.1.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-24.2.4.1.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-help-24.2.4.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.1/src/libreoffice-24.2.4.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.1/src/libreoffice-help-24.2.4.1.tar.xz https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz https://dev-www.libreoffice.org/src//zxcvbn-c-2.5.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//Java-WebSocket-1.5.4.tar.gz https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-24.2.3.2-icu-74.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-24.2.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-24.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-24.2.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/24.2.//libreoffice-help-24.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.2/src/libreoffice-24.2.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/24.2.4.2/src/libreoffice-help-24.2.4.2.tar.xz https://dev-www.libreoffice.org/src//dragonbox-1.1.3.tar.gz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//frozen-1.1.1.tar.gz https://dev-www.libreoffice.org/src//skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz https://dev-www.libreoffice.org/src//zxcvbn-c-2.5.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//Java-WebSocket-1.5.4.tar.gz https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=894acce9997e5dcef9a76864a8a8960b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0ab4cacbf8be..b2394cb2d806 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/mdbook-0.4.40 b/metadata/md5-cache/app-text/mdbook-0.4.40
index a6f9c1af947b..6a42e72a82fb 100644
--- a/metadata/md5-cache/app-text/mdbook-0.4.40
+++ b/metadata/md5-cache/app-text/mdbook-0.4.40
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://rust-lang.github.io/mdBook/
 INHERIT=cargo toolchain-funcs
 IUSE=doc debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MPL-2.0 CC-BY-4.0 OFL-1.1 Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016
 SLOT=0
 SRC_URI=https://github.com/rust-lang/mdBook/archive/refs/tags/v0.4.40.tar.gz -> mdbook-0.4.40.tar.gz 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/aho-corasick/1.1.3/download -> aho-corasick-1.1.3.crate https://crates.io/api/v1/crates/ammonia/4.0.0/download -> ammonia-4.0.0.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anstream/0.6.14/download -> anstream-0.6.14.crate https://crates.io/api/v1/crates/anstyle-parse/0.2.4/download -> anstyle-parse-0.2.4.crate https://crates.io/api/v1/crates/anstyle-query/1.0.3/download -> anstyle-query-1.0.3.crate https://crates.io/api/v1/crates/anstyle-wincon/3.0.3/download -> anstyle-wincon-3.0.3.crate https://crates.io/api/v1/crates/anstyle/1.0.7/download -> anstyle-1.0.7.crate https://crates.io/api/v1/crates/anyhow/1.0.83/download -> anyhow-1.0.83.crate https://crates.io/api/v1/crates/assert_cmd/2.0.14/download -> assert_cmd-2.0.14.crate https://crates.io/api/v1/crates/autocfg/1.3.0/download -> autocfg-1.3.0.crate https://crates.io/api/v1/crates/backtrace/0.3.71/download -> backtrace-0.3.71.crate https://crates.io/api/v1/crates/base64/0.21.7/download -> base64-0.21.7.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.5.0/download -> bitflags-2.5.0.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/block-buffer/0.10.4/download -> block-buffer-0.10.4.crate https://crates.io/api/v1/crates/bstr/1.9.1/download -> bstr-1.9.1.crate https://crates.io/api/v1/crates/bumpalo/3.16.0/download -> bumpalo-3.16.0.crate https://crates.io/api/v1/crates/byteorder/1.5.0/download -> byteorder-1.5.0.crate https://crates.io/api/v1/crates/bytes/1.6.0/download -> bytes-1.6.0.crate https://crates.io/api/v1/crates/cc/1.0.97/download -> cc-1.0.97.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.38/download -> chrono-0.4.38.crate https://crates.io/api/v1/crates/clap/4.5.4/download -> clap-4.5.4.crate https://crates.io/api/v1/crates/clap_builder/4.5.2/download -> clap_builder-4.5.2.crate https://crates.io/api/v1/crates/clap_complete/4.5.2/download -> clap_complete-4.5.2.crate https://crates.io/api/v1/crates/clap_lex/0.7.0/download -> clap_lex-0.7.0.crate https://crates.io/api/v1/crates/colorchoice/1.0.1/download -> colorchoice-1.0.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.6/download -> core-foundation-sys-0.8.6.crate https://crates.io/api/v1/crates/cpufeatures/0.2.12/download -> cpufeatures-0.2.12.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.12/download -> crossbeam-channel-0.5.12.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.5/download -> crossbeam-deque-0.8.5.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.18/download -> crossbeam-epoch-0.9.18.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.19/download -> crossbeam-utils-0.8.19.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/data-encoding/2.6.0/download -> data-encoding-2.6.0.crate https://crates.io/api/v1/crates/dbus/0.9.7/download -> dbus-0.9.7.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.7/download -> digest-0.10.7.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/elasticlunr-rs/3.0.2/download -> elasticlunr-rs-3.0.2.crate https://crates.io/api/v1/crates/env_filter/0.1.0/download -> env_filter-0.1.0.crate https://crates.io/api/v1/crates/env_logger/0.11.3/download -> env_logger-0.11.3.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.9/download -> errno-0.3.9.crate https://crates.io/api/v1/crates/fastrand/2.1.0/download -> fastrand-2.1.0.crate https://crates.io/api/v1/crates/filetime/0.2.23/download -> filetime-0.2.23.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/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/futures-channel/0.3.30/download -> futures-channel-0.3.30.crate https://crates.io/api/v1/crates/futures-core/0.3.30/download -> futures-core-0.3.30.crate https://crates.io/api/v1/crates/futures-macro/0.3.30/download -> futures-macro-0.3.30.crate https://crates.io/api/v1/crates/futures-sink/0.3.30/download -> futures-sink-0.3.30.crate https://crates.io/api/v1/crates/futures-task/0.3.30/download -> futures-task-0.3.30.crate https://crates.io/api/v1/crates/futures-util/0.3.30/download -> futures-util-0.3.30.crate https://crates.io/api/v1/crates/generic-array/0.14.7/download -> generic-array-0.14.7.crate https://crates.io/api/v1/crates/getrandom/0.2.15/download -> getrandom-0.2.15.crate https://crates.io/api/v1/crates/gimli/0.28.1/download -> gimli-0.28.1.crate https://crates.io/api/v1/crates/globset/0.4.14/download -> globset-0.4.14.crate https://crates.io/api/v1/crates/h2/0.3.26/download -> h2-0.3.26.crate https://crates.io/api/v1/crates/handlebars/5.1.2/download -> handlebars-5.1.2.crate https://crates.io/api/v1/crates/hashbrown/0.14.5/download -> hashbrown-0.14.5.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.0.crate https://crates.io/api/v1/crates/headers/0.3.9/download -> headers-0.3.9.crate https://crates.io/api/v1/crates/hermit-abi/0.3.9/download -> hermit-abi-0.3.9.crate https://crates.io/api/v1/crates/html5ever/0.26.0/download -> html5ever-0.26.0.crate https://crates.io/api/v1/crates/html5ever/0.27.0/download -> html5ever-0.27.0.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.3/download -> httpdate-1.0.3.crate https://crates.io/api/v1/crates/http-body/0.4.6/download -> http-body-0.4.6.crate https://crates.io/api/v1/crates/http/0.2.12/download -> http-0.2.12.crate https://crates.io/api/v1/crates/http/1.1.0/download -> http-1.1.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/hyper/0.14.28/download -> hyper-0.14.28.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.60/download -> iana-time-zone-0.1.60.crate https://crates.io/api/v1/crates/idna/0.5.0/download -> idna-0.5.0.crate https://crates.io/api/v1/crates/ignore/0.4.22/download -> ignore-0.4.22.crate https://crates.io/api/v1/crates/indexmap/2.2.6/download -> indexmap-2.2.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/is_terminal_polyfill/1.70.0/download -> is_terminal_polyfill-1.70.0.crate https://crates.io/api/v1/crates/itoa/1.0.11/download -> itoa-1.0.11.crate https://crates.io/api/v1/crates/js-sys/0.3.69/download -> js-sys-0.3.69.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.4/download -> kqueue-sys-1.0.4.crate https://crates.io/api/v1/crates/kqueue/1.0.8/download -> kqueue-1.0.8.crate https://crates.io/api/v1/crates/libc/0.2.154/download -> libc-0.2.154.crate https://crates.io/api/v1/crates/libdbus-sys/0.2.5/download -> libdbus-sys-0.2.5.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.13/download -> linux-raw-sys-0.4.13.crate https://crates.io/api/v1/crates/lock_api/0.4.12/download -> lock_api-0.4.12.crate https://crates.io/api/v1/crates/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/markup5ever/0.11.0/download -> markup5ever-0.11.0.crate https://crates.io/api/v1/crates/markup5ever/0.12.1/download -> markup5ever-0.12.1.crate https://crates.io/api/v1/crates/markup5ever_rcdom/0.2.0/download -> markup5ever_rcdom-0.2.0.crate https://crates.io/api/v1/crates/memchr/2.7.2/download -> memchr-2.7.2.crate https://crates.io/api/v1/crates/mime/0.3.17/download -> mime-0.3.17.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.7.2/download -> miniz_oxide-0.7.2.crate https://crates.io/api/v1/crates/mio/0.8.11/download -> mio-0.8.11.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.6/download -> new_debug_unreachable-1.0.6.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/normpath/1.2.0/download -> normpath-1.2.0.crate https://crates.io/api/v1/crates/notify-debouncer-mini/0.4.1/download -> notify-debouncer-mini-0.4.1.crate https://crates.io/api/v1/crates/notify/6.1.1/download -> notify-6.1.1.crate https://crates.io/api/v1/crates/num-traits/0.2.19/download -> num-traits-0.2.19.crate https://crates.io/api/v1/crates/num_cpus/1.16.0/download -> num_cpus-1.16.0.crate https://crates.io/api/v1/crates/object/0.32.2/download -> object-0.32.2.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/opener/0.7.0/download -> opener-0.7.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.2/download -> parking_lot-0.12.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.10/download -> parking_lot_core-0.9.10.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/pest/2.7.10/download -> pest-2.7.10.crate https://crates.io/api/v1/crates/pest_derive/2.7.10/download -> pest_derive-2.7.10.crate https://crates.io/api/v1/crates/pest_generator/2.7.10/download -> pest_generator-2.7.10.crate https://crates.io/api/v1/crates/pest_meta/2.7.10/download -> pest_meta-2.7.10.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf/0.11.2/download -> phf-0.11.2.crate https://crates.io/api/v1/crates/phf_codegen/0.10.0/download -> phf_codegen-0.10.0.crate https://crates.io/api/v1/crates/phf_codegen/0.11.2/download -> phf_codegen-0.11.2.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_generator/0.11.2/download -> phf_generator-0.11.2.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.11.2/download -> phf_shared-0.11.2.crate https://crates.io/api/v1/crates/pin-project-internal/1.1.5/download -> pin-project-internal-1.1.5.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.14/download -> pin-project-lite-0.2.14.crate https://crates.io/api/v1/crates/pin-project/1.1.5/download -> pin-project-1.1.5.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.30/download -> pkg-config-0.3.30.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.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/predicates/3.1.0/download -> predicates-3.1.0.crate https://crates.io/api/v1/crates/pretty_assertions/1.4.0/download -> pretty_assertions-1.4.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.82/download -> proc-macro2-1.0.82.crate https://crates.io/api/v1/crates/pulldown-cmark-escape/0.10.1/download -> pulldown-cmark-escape-0.10.1.crate https://crates.io/api/v1/crates/pulldown-cmark/0.10.3/download -> pulldown-cmark-0.10.3.crate https://crates.io/api/v1/crates/quote/1.0.36/download -> quote-1.0.36.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.5.1/download -> redox_syscall-0.5.1.crate https://crates.io/api/v1/crates/regex-automata/0.4.6/download -> regex-automata-0.4.6.crate https://crates.io/api/v1/crates/regex-syntax/0.8.3/download -> regex-syntax-0.8.3.crate https://crates.io/api/v1/crates/regex/1.10.4/download -> regex-1.10.4.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.24/download -> rustc-demangle-0.1.24.crate https://crates.io/api/v1/crates/rustix/0.38.34/download -> rustix-0.38.34.crate https://crates.io/api/v1/crates/ryu/1.0.18/download -> ryu-1.0.18.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/select/0.6.0/download -> select-0.6.0.crate https://crates.io/api/v1/crates/semver/1.0.23/download -> semver-1.0.23.crate https://crates.io/api/v1/crates/serde/1.0.201/download -> serde-1.0.201.crate https://crates.io/api/v1/crates/serde_derive/1.0.201/download -> serde_derive-1.0.201.crate https://crates.io/api/v1/crates/serde_json/1.0.117/download -> serde_json-1.0.117.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha1/0.10.6/download -> sha1-0.10.6.crate https://crates.io/api/v1/crates/sha2/0.10.8/download -> sha2-0.10.8.crate https://crates.io/api/v1/crates/shlex/1.3.0/download -> shlex-1.3.0.crate https://crates.io/api/v1/crates/siphasher/0.3.11/download -> siphasher-0.3.11.crate https://crates.io/api/v1/crates/slab/0.4.9/download -> slab-0.4.9.crate https://crates.io/api/v1/crates/smallvec/1.13.2/download -> smallvec-1.13.2.crate https://crates.io/api/v1/crates/socket2/0.5.7/download -> socket2-0.5.7.crate https://crates.io/api/v1/crates/string_cache/0.8.7/download -> string_cache-0.8.7.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.2/download -> string_cache_codegen-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.11.1/download -> strsim-0.11.1.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.63/download -> syn-2.0.63.crate https://crates.io/api/v1/crates/tempfile/3.10.1/download -> tempfile-3.10.1.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/terminal_size/0.3.0/download -> terminal_size-0.3.0.crate https://crates.io/api/v1/crates/termtree/0.4.1/download -> termtree-0.4.1.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.60/download -> thiserror-impl-1.0.60.crate https://crates.io/api/v1/crates/thiserror/1.0.60/download -> thiserror-1.0.60.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/tokio-macros/2.2.0/download -> tokio-macros-2.2.0.crate https://crates.io/api/v1/crates/tokio-tungstenite/0.21.0/download -> tokio-tungstenite-0.21.0.crate https://crates.io/api/v1/crates/tokio-util/0.7.11/download -> tokio-util-0.7.11.crate https://crates.io/api/v1/crates/tokio/1.37.0/download -> tokio-1.37.0.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/topological-sort/0.2.2/download -> topological-sort-0.2.2.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing-core/0.1.32/download -> tracing-core-0.1.32.crate https://crates.io/api/v1/crates/tracing/0.1.40/download -> tracing-0.1.40.crate https://crates.io/api/v1/crates/try-lock/0.2.5/download -> try-lock-0.2.5.crate https://crates.io/api/v1/crates/tungstenite/0.21.0/download -> tungstenite-0.21.0.crate https://crates.io/api/v1/crates/typenum/1.17.0/download -> typenum-1.17.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.6/download -> ucd-trie-0.1.6.crate https://crates.io/api/v1/crates/unicase/2.7.0/download -> unicase-2.7.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.15/download -> unicode-bidi-0.3.15.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.23/download -> unicode-normalization-0.1.23.crate https://crates.io/api/v1/crates/url/2.5.0/download -> url-2.5.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.1/download -> utf8parse-0.2.1.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.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.5.0/download -> walkdir-2.5.0.crate https://crates.io/api/v1/crates/want/0.3.1/download -> want-0.3.1.crate https://crates.io/api/v1/crates/warp/0.3.7/download -> warp-0.3.7.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.92/download -> wasm-bindgen-backend-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.92/download -> wasm-bindgen-macro-support-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.92/download -> wasm-bindgen-macro-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.92/download -> wasm-bindgen-shared-0.2.92.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.92/download -> wasm-bindgen-0.2.92.crate https://crates.io/api/v1/crates/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.8/download -> winapi-util-0.1.8.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-core/0.52.0/download -> windows-core-0.52.0.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.52.0/download -> windows-sys-0.52.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows-targets/0.52.5/download -> windows-targets-0.52.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.5/download -> windows_aarch64_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.5/download -> windows_aarch64_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnullvm/0.52.5/download -> windows_i686_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.52.5/download -> windows_i686_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.52.5/download -> windows_i686_msvc-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.5/download -> windows_x86_64_gnullvm-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.5/download -> windows_x86_64_gnu-0.52.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.5/download -> windows_x86_64_msvc-0.52.5.crate https://crates.io/api/v1/crates/xml5ever/0.17.0/download -> xml5ever-0.17.0.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate
 _eclasses_=cargo	172dcb548e750dda201deb8263a17124	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7c4e0ec3df6bbca9597ba157c0bfa648
+_md5_=5b16d265d81844b40138fa027ab15a6a
diff --git a/metadata/md5-cache/app-text/poppler-24.06.0 b/metadata/md5-cache/app-text/poppler-24.06.0
new file mode 100644
index 000000000000..7e1cafa5f3cc
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-24.06.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/glib-utils-2.64 virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.72:= ) ) curl? ( net-misc/curl ) gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 ) qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) boost? ( >=dev-libs/boost-1.74 ) test? ( qt5? ( >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 ) qt6? ( dev-qt/qtbase:6[widgets] ) )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=8
+HOMEPAGE=https://poppler.freedesktop.org/
+INHERIT=cmake flag-o-matic toolchain-funcs xdg-utils verify-sig
+IUSE=boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.72:= ) ) curl? ( net-misc/curl ) gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 ) qt6? ( dev-qt/qtbase:6[gui,xml] ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
+RESTRICT=!test? ( test )
+SLOT=0/137
+SRC_URI=https://poppler.freedesktop.org/poppler-24.06.0.tar.xz test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/ff3133cdb6cb496ee1d2c3231bfa35006a5e8410/test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 -> poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 ) verify-sig? ( https://poppler.freedesktop.org/poppler-24.06.0.tar.xz.sig )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8db4cb346fb424b68bb27e05c8fcc0be
diff --git a/metadata/md5-cache/app-text/texlive-core-2023-r6 b/metadata/md5-cache/app-text/texlive-core-2023-r7
index 10a6afb91d01..696ecb14d583 100644
--- a/metadata/md5-cache/app-text/texlive-core-2023-r6
+++ b/metadata/md5-cache/app-text/texlive-core-2023-r7
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/epspdf !app-text/pdfjam sys-libs/zlib >=media-libs/harfbuzz-1.4.5:=[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] media-gfx/graphite2:= media-gfx/potrace:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib:= app-text/libpaper:= dev-libs/gmp:= dev-libs/mpfr:= >=dev-libs/ptexenc-1.4.3 xetex? ( >=app-text/teckit-2.5.10 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.3.5:= virtual/perl-Getopt-Long dev-perl/File-HomeDir dev-perl/Log-Dispatch dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny tk? ( dev-lang/tk dev-perl/Tk ) !<dev-texlive/texlive-basic-2023 !<dev-texlive/texlive-mathscience-2023 !<dev-texlive/texlive-langother-2023 !<dev-texlive/texlive-music-2023
 SLOT=0
-SRC_URI=https://mirrors.ctan.org/systems/texlive/Source/texlive-20230311-source.tar.xz https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-3.tar.bz2 -> gentoo-tex-patches-3.tar.bz2 https://mirrors.ctan.org/systems/texlive/tlnet/archive/autosp.r58211.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/axodraw2.r58155.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/chktex.r64797.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/detex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvi2tty.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvidvi.r65952.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dviljk.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipdfmx.r69127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipos.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/gsftopk.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyphen-base.r68321.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lacheck.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/m-tx.r64182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/makeindex.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pmx.r65926.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texdoctk.r62186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts.r69754.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts-extra.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive.infra.r69740.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tpic2pdftex.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/upmendex.r66381.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/velthuis.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/vlna.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xindy.r65958.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xml2pmx.r57972.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/autosp.r58211.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/axodraw2.r58155.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/chktex.r64797.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/detex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvi2tty.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvidvi.r65952.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dviljk.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipdfmx.r69127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipos.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/gsftopk.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyphen-base.r68321.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lacheck.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/m-tx.r64182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/makeindex.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pmx.r65926.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texdoctk.r62186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts.r69754.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts-extra.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive.infra.r69740.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tpic2pdftex.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/upmendex.r66381.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/velthuis.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/vlna.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xindy.r65958.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xml2pmx.r57972.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/autosp.doc.r58211.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/axodraw2.doc.r58155.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/chktex.doc.r64797.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/detex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvi2tty.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvidvi.doc.r65952.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dviljk.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipdfmx.doc.r69127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipos.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/gsftopk.doc.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lacheck.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/m-tx.doc.r64182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/makeindex.doc.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pmx.doc.r65926.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texdoctk.doc.r62186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts.doc.r69754.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts-extra.doc.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive.infra.doc.r69740.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tpic2pdftex.doc.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/upmendex.doc.r66381.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/velthuis.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/vlna.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xindy.doc.r65958.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xml2pmx.doc.r57972.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/autosp.doc.r58211.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/axodraw2.doc.r58155.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/chktex.doc.r64797.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/detex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvi2tty.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvidvi.doc.r65952.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dviljk.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipdfmx.doc.r69127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipos.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/gsftopk.doc.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lacheck.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/m-tx.doc.r64182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/makeindex.doc.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pmx.doc.r65926.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texdoctk.doc.r62186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts.doc.r69754.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts-extra.doc.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive.infra.doc.r69740.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tpic2pdftex.doc.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/upmendex.doc.r66381.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/velthuis.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/vlna.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xindy.doc.r65958.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xml2pmx.doc.r57972.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/axodraw2.source.r58155.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/axodraw2.source.r58155.tar.xz )
+SRC_URI=https://mirrors.ctan.org/systems/texlive/Source/texlive-20230311-source.tar.xz https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-5.tar.bz2 -> gentoo-tex-patches-5.tar.bz2 https://mirrors.ctan.org/systems/texlive/tlnet/archive/autosp.r58211.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/axodraw2.r58155.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/chktex.r64797.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/detex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvi2tty.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvidvi.r65952.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dviljk.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipdfmx.r69127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipos.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/gsftopk.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyphen-base.r68321.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lacheck.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/m-tx.r64182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/makeindex.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pmx.r65926.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texdoctk.r62186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts.r69754.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts-extra.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive.infra.r69740.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tpic2pdftex.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/upmendex.r66381.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/velthuis.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/vlna.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xindy.r65958.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xml2pmx.r57972.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/autosp.r58211.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/axodraw2.r58155.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/chktex.r64797.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/detex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvi2tty.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvidvi.r65952.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dviljk.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipdfmx.r69127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipos.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/gsftopk.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyphen-base.r68321.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lacheck.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/m-tx.r64182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/makeindex.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pmx.r65926.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texdoctk.r62186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts.r69754.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts-extra.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive.infra.r69740.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tpic2pdftex.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/upmendex.r66381.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/velthuis.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/vlna.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xindy.r65958.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xml2pmx.r57972.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/autosp.doc.r58211.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/axodraw2.doc.r58155.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/chktex.doc.r64797.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/detex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvi2tty.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvidvi.doc.r65952.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dviljk.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipdfmx.doc.r69127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/dvipos.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/gsftopk.doc.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lacheck.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/m-tx.doc.r64182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/makeindex.doc.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pmx.doc.r65926.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texdoctk.doc.r62186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts.doc.r69754.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-scripts-extra.doc.r62517.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive.infra.doc.r69740.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tpic2pdftex.doc.r52851.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/upmendex.doc.r66381.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/velthuis.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/vlna.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xindy.doc.r65958.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/xml2pmx.doc.r57972.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/autosp.doc.r58211.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/axodraw2.doc.r58155.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/chktex.doc.r64797.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/detex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvi2tty.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvidvi.doc.r65952.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dviljk.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipdfmx.doc.r69127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/dvipos.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/gsftopk.doc.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lacheck.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/m-tx.doc.r64182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/makeindex.doc.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pmx.doc.r65926.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texdoctk.doc.r62186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts.doc.r69754.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-scripts-extra.doc.r62517.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive.infra.doc.r69740.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tpic2pdftex.doc.r52851.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/upmendex.doc.r66381.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/velthuis.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/vlna.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xindy.doc.r65958.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/xml2pmx.doc.r57972.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/axodraw2.source.r58155.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/axodraw2.source.r58155.tar.xz )
 _eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	texlive-common	8eb189ef6113c001970b6dfed9a50a42	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f44b9eb4b66dbcb8399c00020bbd86e2
+_md5_=8d95ec7045c5c9a59a6716e581c61153
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 1d2da5ea8193..768ce30ff72a 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.15.3 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.15.3
index 98384e3a7331..b4195fa998b7 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.15.3
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.15.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/yhirose/cpp-httplib/
 INHERIT=cmake-multilib python-any-r1 toolchain-funcs
 IUSE=brotli ssl test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( brotli ssl zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.15
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.15.3.tar.gz -> cpp-httplib-0.15.3.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bea49946060279060be0b24418c6e795
+_md5_=2a197e474d6ff9d9f8f57bb0a965011d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 63cbcc516ca8..a614c0521b58 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/blake3-1.5.1 b/metadata/md5-cache/dev-libs/blake3-1.5.1
index 1b7b009ca488..41d51e49dce4 100644
--- a/metadata/md5-cache/dev-libs/blake3-1.5.1
+++ b/metadata/md5-cache/dev-libs/blake3-1.5.1
@@ -4,9 +4,9 @@ DESCRIPTION=a fast cryptographic hash function
 EAPI=8
 HOMEPAGE=https://github.com/BLAKE3-team/BLAKE3
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( CC0-1.0 Apache-2.0 )
 SLOT=0/0
 SRC_URI=https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.5.1.tar.gz -> blake3-1.5.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d0a7534b738804571b61dd8c9244898
+_md5_=3d1e252d26261ba37ac46e6b8e120812
diff --git a/metadata/md5-cache/dev-libs/iniparser-4.2.2 b/metadata/md5-cache/dev-libs/iniparser-4.2.2
index bc96e0004f7f..147eb983013b 100644
--- a/metadata/md5-cache/dev-libs/iniparser-4.2.2
+++ b/metadata/md5-cache/dev-libs/iniparser-4.2.2
@@ -5,9 +5,8 @@ EAPI=7
 HOMEPAGE=https://gitlab.com/iniparser/iniparser
 INHERIT=cmake
 IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 SLOT=4
 SRC_URI=https://gitlab.com/iniparser/iniparser/-/archive/v4.2.2/iniparser-v4.2.2.tar.bz2 -> iniparser-4.2.2.tar.bz2
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5bbef65e8aca038662975646f2d073a4
+_md5_=1365988424ee90e9f8de1746b6707c76
diff --git a/metadata/md5-cache/dev-libs/liblzw-0.3 b/metadata/md5-cache/dev-libs/liblzw-0.3
index 270bfb15b67c..8fa9714fb0e3 100644
--- a/metadata/md5-cache/dev-libs/liblzw-0.3
+++ b/metadata/md5-cache/dev-libs/liblzw-0.3
@@ -3,8 +3,8 @@ DESCRIPTION=small C library for reading LZW compressed files (.Z)
 EAPI=7
 HOMEPAGE=https://github.com/vapier/liblzw
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ~m68k ~s390 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/vapier/liblzw/releases/download/v0.3/liblzw-0.3.tar.xz
-_md5_=672188e6c4f8e4d7f98a08453e18515e
+_md5_=f0ef4b0e45b1767998a91cc63e7fcfcc
diff --git a/metadata/md5-cache/dev-libs/mpdecimal-4.0.0 b/metadata/md5-cache/dev-libs/mpdecimal-4.0.0
index c5ebd738c95c..2c5cb9b5d4ac 100644
--- a/metadata/md5-cache/dev-libs/mpdecimal-4.0.0
+++ b/metadata/md5-cache/dev-libs/mpdecimal-4.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Correctly-rounded arbitrary precision decimal floating point arithme
 EAPI=8
 HOMEPAGE=https://www.bytereef.org/mpdecimal/
 IUSE=cxx test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.0.tar.gz test? ( https://speleotrove.com/decimal/dectest.zip )
-_md5_=c539158fc3cc214cd5cc6cbbfa081edb
+_md5_=de5ed2f39537b2f8954aa33b6db845f4
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.36 b/metadata/md5-cache/dev-libs/wayland-protocols-1.36
index 94a8adca82d2..3a45e5dbc2ca 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.36
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.36
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/
 INHERIT=meson
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.36/downloads/wayland-protocols-1.36.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9105ac3fc2726fc51e4a58d08bfe0b71
+_md5_=7ac3d5b11e9ab1b7ef821e56d2cd6f08
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index d5ae3db5a01c..574d54972ca4 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.15.0-r2 b/metadata/md5-cache/dev-ml/base_quickcheck-0.15.0-r3
index 45b5c7dda790..3ce3740ef8dc 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.15.0-r2
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.15.0-r3
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/fieldslib:= dev-ml/ppx_base:0/0.15 dev-ml/ppx_fields_conv:0/0.15 dev-ml/ppx_let:0/0.15 dev-ml/ppx_sexp_value:0/0.15 dev-ml/splittable_random:0/0.15 >=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/base:0/0.15 dev-ml/fieldslib:0/0.15.0 dev-ml/ppx_base:0/0.15 dev-ml/ppx_fields_conv:0/0.15 dev-ml/ppx_let:0/0.15 dev-ml/ppx_sexp_value:0/0.15 dev-ml/splittable_random:0/0.15 >=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Randomized testing framework, designed for compatibility with Base
 EAPI=8
 HOMEPAGE=https://github.com/janestreet/base_quickcheck
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=dev-ml/base:= dev-ml/fieldslib:= dev-ml/ppx_base:0/0.15 dev-ml/ppx_fields_conv:0/0.15 dev-ml/ppx_let:0/0.15 dev-ml/ppx_sexp_value:0/0.15 dev-ml/splittable_random:0/0.15 >=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/base:0/0.15 dev-ml/fieldslib:0/0.15.0 dev-ml/ppx_base:0/0.15 dev-ml/ppx_fields_conv:0/0.15 dev-ml/ppx_let:0/0.15 dev-ml/ppx_sexp_value:0/0.15 dev-ml/splittable_random:0/0.15 >=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.15.0.tar.gz -> base_quickcheck-0.15.0.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=000b8ffb6f4ec6cd69f55c4df7e228e6
+_md5_=e5d58ecfb71c1c73bb515571bec8fa2b
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2 b/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2
deleted file mode 100644
index ecd7316dc34c..000000000000
--- a/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppx_variants_conv-0.14.0:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Binary protocol generator
-EAPI=8
-HOMEPAGE=https://github.com/janestreet/bin_prot
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppx_variants_conv-0.14.0:= dev-ml/variantslib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.15
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.15.0.tar.gz -> bin_prot-0.15.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=b850c97aabf7dd70c7eaebebc78d6cdf
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r3 b/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r3
new file mode 100644
index 000000000000..3019265168c1
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.15.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/ocaml dev-ml/dune
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.28:= dev-ml/ppx_compare:0/0.15 dev-ml/ppx_custom_printf:0/0.15 dev-ml/ppx_fields_conv:0/0.15 dev-ml/ppx_optcomp:0/0.15 dev-ml/ppx_sexp_conv:0/0.15 dev-ml/ppx_variants_conv:0/0.15 dev-ml/variantslib:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Binary protocol generator
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/bin_prot
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:0/0.15 dev-ml/findlib:= >=dev-ml/ppxlib-0.28:= dev-ml/ppx_compare:0/0.15 dev-ml/ppx_custom_printf:0/0.15 dev-ml/ppx_fields_conv:0/0.15 dev-ml/ppx_optcomp:0/0.15 dev-ml/ppx_sexp_conv:0/0.15 dev-ml/ppx_variants_conv:0/0.15 dev-ml/variantslib:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.15.0.tar.gz -> bin_prot-0.15.0.tar.gz
+_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
+_md5_=eebdd08a9338dcef5bf6f42975c951ac
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.02.00-r1 b/metadata/md5-cache/dev-ml/camlp5-8.02.00-r1
index 77eaa1ea76bf..93ce2353d5d6 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.02.00-r1
+++ b/metadata/md5-cache/dev-ml/camlp5-8.02.00-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/astring:= dev-ml/bos:= dev-ml/camlp-streams:= dev-ml/fmt:= dev-ml
 SLOT=0/8.02.00
 SRC_URI=https://github.com/camlp5/camlp5/archive/refs/tags/8.02.00.tar.gz -> camlp5-8.02.00.tar.gz
 _eclasses_=findlib	49d5365fca4dea46f13825b9d763c89e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=08e3aa15c4a5e92002b820e23e667a44
+_md5_=9707f666d540b9b00f696b424e8e8679
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.15.1 b/metadata/md5-cache/dev-ml/cinaps-0.15.1-r1
index 77b024695de1..5fcfd4739d67 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.15.1
+++ b/metadata/md5-cache/dev-ml/cinaps-0.15.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-ml/ppx_jane ) dev-lang/ocaml dev-ml/dune
+BDEPEND=test? ( dev-ml/ppx_jane:0/0.14.0 ) dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
 DEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Trivial metaprogramming tool
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.15.1
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz -> cinaps-0.15.1.tar.gz
 _eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=54c25cfd7bf6352ef91ae2c80a163352
+_md5_=ff967a16b7a2a791fc47600f54133673
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3-r1 b/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3-r1
deleted file mode 100644
index 607546a8b34f..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/stdune-3.0.3:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/stdune-3.0.3:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.0.3
-SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=6c93d7f4280f8605f25f6e8721c62eea
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.2.0 b/metadata/md5-cache/dev-ml/dune-private-libs-3.2.0
deleted file mode 100644
index ab1e09ac6f5d..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.2.0:=[ocamlopt?] ~dev-ml/stdune-3.2.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.2.0:=[ocamlopt?] ~dev-ml/stdune-3.2.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.2.0
-SRC_URI=https://github.com/ocaml/dune/archive/3.2.0.tar.gz -> dune-3.2.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=c1ba00acf3199b7eab6ecc12607dfac0
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.6.1 b/metadata/md5-cache/dev-ml/dune-private-libs-3.6.1
deleted file mode 100644
index f58ffbb54d42..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.1:=[ocamlopt?] ~dev-ml/stdune-3.6.1:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.1:=[ocamlopt?] ~dev-ml/stdune-3.6.1:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.6.1
-SRC_URI=https://github.com/ocaml/dune/archive/3.6.1.tar.gz -> dune-3.6.1.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=dc8117d12539e36fc84f047ee0871db2
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.7.0 b/metadata/md5-cache/dev-ml/dune-private-libs-3.7.0
deleted file mode 100644
index 0652f5b3b021..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/stdune-3.7.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/stdune-3.7.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.7.0
-SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4c9498458190eaeeae95329707d2571d
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.8.0 b/metadata/md5-cache/dev-ml/dune-private-libs-3.8.0
deleted file mode 100644
index 9fded79848c9..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.8.0:=[ocamlopt?] ~dev-ml/stdune-3.8.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.8.0:=[ocamlopt?] ~dev-ml/stdune-3.8.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.8.0
-SRC_URI=https://github.com/ocaml/dune/archive/3.8.0.tar.gz -> dune-3.8.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4c9498458190eaeeae95329707d2571d
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.9.0 b/metadata/md5-cache/dev-ml/dune-private-libs-3.9.0
deleted file mode 100644
index 21d54e7e9d92..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.0:=[ocamlopt?] ~dev-ml/stdune-3.9.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.0:=[ocamlopt?] ~dev-ml/stdune-3.9.0:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.9.0
-SRC_URI=https://github.com/ocaml/dune/archive/3.9.0.tar.gz -> dune-3.9.0.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4c9498458190eaeeae95329707d2571d
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.9.1 b/metadata/md5-cache/dev-ml/dune-private-libs-3.9.1
deleted file mode 100644
index b11be7127e38..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.1:=[ocamlopt?] ~dev-ml/stdune-3.9.1:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Private libraries of Dune
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.9.1:=[ocamlopt?] ~dev-ml/stdune-3.9.1:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.9.1
-SRC_URI=https://github.com/ocaml/dune/archive/3.9.1.tar.gz -> dune-3.9.1.tar.gz
-_eclasses_=dune	339df00cc31668d437589817d093748d	edo	367e103a74bf77e6a8da7894d999fa3c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe
-_md5_=4c9498458190eaeeae95329707d2571d
diff --git a/metadata/md5-cache/dev-ml/logs-0.7.0-r1 b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
index 5ec99476453b..88b732c381e7 100644
--- a/metadata/md5-cache/dev-ml/logs-0.7.0-r1
+++ b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/opam-installer dev-ml/topkg test? ( dev-ml/mtime )
+BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/opam-installer dev-ml/topkg test? ( <=dev-ml/mtime-1.4.0 )
 DEFINED_PHASES=compile install prepare test
 DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= ) >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
 DESCRIPTION=Logging infrastructure for OCaml
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://erratique.ch/software/logs/releases/logs-0.7.0.tbz
 _eclasses_=findlib	49d5365fca4dea46f13825b9d763c89e
-_md5_=9d5da67822bab3d0eb73672dc11c4c2c
+_md5_=09f4445d9eefe015e711d98225d04d2d
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1
index e1c1a95cdda5..a8646f24d64b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.20.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.20.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.20.1.tar.gz -> ocaml-ctypes-0.20.1.tar.gz
 _eclasses_=findlib	49d5365fca4dea46f13825b9d763c89e
-_md5_=2d9092b80ebd29a048293a191ac542a8
+_md5_=5c1edd994434e967137dc9378183eb7f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ae59b67a029f..1ed5abcf0138 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/annotated-types-0.6.0 b/metadata/md5-cache/dev-python/annotated-types-0.6.0
deleted file mode 100644
index 4e0f07418618..000000000000
--- a/metadata/md5-cache/dev-python/annotated-types-0.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Reusable constraint types to use with typing.Annotated
-EAPI=8
-HOMEPAGE=https://github.com/annotated-types/annotated-types/ https://pypi.org/project/annotated-types/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/annotated-types/annotated_types-0.6.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=654857205c7a3906a85d84a675c69c83
diff --git a/metadata/md5-cache/dev-python/annotated-types-0.7.0 b/metadata/md5-cache/dev-python/annotated-types-0.7.0
index ade4a0469ba8..c97d8e6e5d7e 100644
--- a/metadata/md5-cache/dev-python/annotated-types-0.7.0
+++ b/metadata/md5-cache/dev-python/annotated-types-0.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/annotated-types/annotated-types/ https://pypi.org/project/annotated-types/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/annotated-types/annotated_types-0.7.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=efd391aa71d9f45869033db242892ccd
+_md5_=2b3e8c42588ef3970680bcb37133a9a2
diff --git a/metadata/md5-cache/dev-python/astroid-3.2.2 b/metadata/md5-cache/dev-python/astroid-3.2.2
index 33906dba5de3..3be9b8f91c49 100644
--- a/metadata/md5-cache/dev-python/astroid-3.2.2
+++ b/metadata/md5-cache/dev-python/astroid-3.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pylint-dev/astroid/ https://pypi.org/project/astroid/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_pypy3? ( >=dev-python/typing-extensions-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylint-dev/astroid/archive/v3.2.2.tar.gz -> astroid-3.2.2.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=840a64b0f3041d5bbb34ef52c8f158ca
+_md5_=07ada12684613b53de19bb2ab7c775b4
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-2.13.1 b/metadata/md5-cache/dev-python/aws-xray-sdk-2.13.1
index 91020977674b..58868cd53059 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-2.13.1
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-2.13.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-xray-sdk-python/ https://pypi.org/project/aws-xray-sdk/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.122[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wrapt[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-xray-sdk-python/archive/2.13.1.tar.gz -> aws-xray-sdk-python-2.13.1.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8dc925d9887499f68d7bfc802d250bff
+_md5_=c820bff82dc05cb66afb44a6ac231aba
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-2.13.0 b/metadata/md5-cache/dev-python/aws-xray-sdk-2.14.0
index b9da8fd0933c..3bcde01c7831 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-2.13.0
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-2.14.0
@@ -5,12 +5,12 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-xray-sdk-python/ https://pypi.org/project/aws-xray-sdk/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.122[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wrapt[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/aws/aws-xray-sdk-python/archive/2.13.0.tar.gz -> aws-xray-sdk-python-2.13.0.gh.tar.gz
+SRC_URI=https://github.com/aws/aws-xray-sdk-python/archive/2.14.0.tar.gz -> aws-xray-sdk-python-2.14.0.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fa9f33edeaa89bb07f6d6b8d98c75d5f
+_md5_=8dc925d9887499f68d7bfc802d250bff
diff --git a/metadata/md5-cache/dev-python/boto3-1.34.119 b/metadata/md5-cache/dev-python/boto3-1.34.119
new file mode 100644
index 000000000000..fed67cbfa6d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.34.119
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/botocore-1.34.119[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.34.119[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.34.119.tar.gz -> boto3-1.34.119.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8c57f4eda873e63141fd7028ea88e83b
diff --git a/metadata/md5-cache/dev-python/botocore-1.34.119 b/metadata/md5-cache/dev-python/botocore-1.34.119
new file mode 100644
index 000000000000..9f5f034d5545
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.34.119
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.34.119.tar.gz -> botocore-1.34.119.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f1ca9a8b0e1247ff42152fa304fc8999
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.3.8-r1 b/metadata/md5-cache/dev-python/bottleneck-1.3.8-r1
index f77fc8f45cbc..1c9a6fe186f0 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.8-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydata/bottleneck/ https://pypi.org/project/Bottleneck/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.9.1:=[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/B/Bottleneck/Bottleneck-1.3.8.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5ff4f0c3a75c577e3e980cb1f6bead75
+_md5_=fb637301b0bd2ffd14eec03e0fc57db5
diff --git a/metadata/md5-cache/dev-python/cryptography-42.0.8 b/metadata/md5-cache/dev-python/cryptography-42.0.8
new file mode 100644
index 000000000000..de91758030de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-42.0.8
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/setuptools-rust-1.7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=virtual/rust-1.56.0 test? ( dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[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(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) 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(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+)] )
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=8
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
+INHERIT=cargo distutils-r1 flag-o-matic multiprocessing pypi
+IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( >=dev-python/cffi-1.8:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) 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(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-42.0.8.tar.gz https://crates.io/api/v1/crates/asn1/0.15.5/download -> asn1-0.15.5.crate https://crates.io/api/v1/crates/asn1_derive/0.15.5/download -> asn1_derive-0.15.5.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.7/download -> base64-0.21.7.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.2/download -> bitflags-2.4.2.crate https://crates.io/api/v1/crates/cc/1.0.83/download -> cc-1.0.83.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/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.152/download -> libc-0.2.152.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/openssl-macros/0.1.1/download -> openssl-macros-0.1.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.102/download -> openssl-sys-0.9.102.crate https://crates.io/api/v1/crates/openssl/0.10.64/download -> openssl-0.10.64.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/pem/3.0.3/download -> pem-3.0.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.29/download -> pkg-config-0.3.29.crate https://crates.io/api/v1/crates/portable-atomic/1.6.0/download -> portable-atomic-1.6.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.78/download -> proc-macro2-1.0.78.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.3/download -> pyo3-build-config-0.20.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.3/download -> pyo3-ffi-0.20.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.3/download -> pyo3-macros-backend-0.20.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.3/download -> pyo3-macros-0.20.3.crate https://crates.io/api/v1/crates/pyo3/0.20.3/download -> pyo3-0.20.3.crate https://crates.io/api/v1/crates/quote/1.0.35/download -> quote-1.0.35.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/self_cell/1.0.3/download -> self_cell-1.0.3.crate https://crates.io/api/v1/crates/smallvec/1.13.1/download -> smallvec-1.13.1.crate https://crates.io/api/v1/crates/syn/2.0.48/download -> syn-2.0.48.crate https://crates.io/api/v1/crates/target-lexicon/0.12.13/download -> target-lexicon-0.12.13.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.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 test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-42.0.8.tar.gz )
+_eclasses_=cargo	172dcb548e750dda201deb8263a17124	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9ed12e4288272f0f656dc5a9284d8456
diff --git a/metadata/md5-cache/dev-python/cssutils-2.11.1 b/metadata/md5-cache/dev-python/cssutils-2.11.1
new file mode 100644
index 000000000000..b3f85ceb6888
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cssutils-2.11.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/cssselect[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jaraco-test-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/lxml[python_targets_python3_10(-)?] ) ) test? ( dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A CSS Cascading Style Sheets library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cssutils/ https://github.com/jaraco/cssutils/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cssutils/cssutils-2.11.1.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d306bb4fdab04a725c213362017d66ca
diff --git a/metadata/md5-cache/dev-python/cython-3.0.10 b/metadata/md5-cache/dev-python/cython-3.0.10
index c4ee0a8ee910..d06a0a8b019b 100644
--- a/metadata/md5-cache/dev-python/cython-3.0.10
+++ b/metadata/md5-cache/dev-python/cython-3.0.10
@@ -6,7 +6,7 @@ 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 python_targets_python3_13 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
+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(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/3.0.10.tar.gz -> cython-3.0.10.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c1b09d11e71c482e3626d01a2342a5c9
+_md5_=598a756ad9953c3f37f81d443365e166
diff --git a/metadata/md5-cache/dev-python/cython-3.0.8 b/metadata/md5-cache/dev-python/cython-3.0.8
deleted file mode 100644
index 9697b5ab7b8b..000000000000
--- a/metadata/md5-cache/dev-python/cython-3.0.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_targets_python3_10? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) doc? ( || ( ( dev-lang/python:3.12[threads(+)] >=dev-python/sphinx-7.2.6[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-7.2.6[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-7.2.6[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-7.2.6[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-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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.8.tar.gz -> cython-3.0.8.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=774ac7ed2067101dfac21269db516bda
diff --git a/metadata/md5-cache/dev-python/cython-3.0.9 b/metadata/md5-cache/dev-python/cython-3.0.9
deleted file mode 100644
index 34d71b94ed04..000000000000
--- a/metadata/md5-cache/dev-python/cython-3.0.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_targets_python3_10? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) doc? ( || ( ( dev-lang/python:3.12[threads(+)] >=dev-python/sphinx-7.2.6[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-7.2.6[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-7.2.6[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-7.2.6[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-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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.9.tar.gz -> cython-3.0.9.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3a0ce4265b35f38c526ebab271371307
diff --git a/metadata/md5-cache/dev-python/ensurepip-setuptools-70.0.0 b/metadata/md5-cache/dev-python/ensurepip-setuptools-70.0.0
index aed1f15d0a68..13db8fcd9539 100644
--- a/metadata/md5-cache/dev-python/ensurepip-setuptools-70.0.0
+++ b/metadata/md5-cache/dev-python/ensurepip-setuptools-70.0.0
@@ -3,10 +3,10 @@ DESCRIPTION=Shared setuptools wheel for ensurepip Python module
 EAPI=8
 HOMEPAGE=https://pypi.org/project/setuptools/
 INHERIT=pypi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=!<dev-python/ensurepip-wheels-100
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-70.0.0-py3-none-any.whl
 _eclasses_=pypi	2eecb475512bc76e5ea9192a681b9e6b
-_md5_=18ef0d79011aba0459e70e79f342939c
+_md5_=47aaf1a5000cf2596abc0f3bf84cc752
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.22.0 b/metadata/md5-cache/dev-python/fakeredis-2.22.0
deleted file mode 100644
index c0c3226208ca..000000000000
--- a/metadata/md5-cache/dev-python/fakeredis-2.22.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[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/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fake implementation of redis API for testing purposes
-EAPI=8
-HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-2.22.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=61f470dd4ccc888fa9ca6368d8145744
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.23.0 b/metadata/md5-cache/dev-python/fakeredis-2.23.0
deleted file mode 100644
index cab60d6e0ea4..000000000000
--- a/metadata/md5-cache/dev-python/fakeredis-2.23.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[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/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_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/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fake implementation of redis API for testing purposes
-EAPI=8
-HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-2.23.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a0c0b5ba9ca26c6155ffc125efb67aad
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.23.1 b/metadata/md5-cache/dev-python/fakeredis-2.23.1
deleted file mode 100644
index 80d0812f3f5b..000000000000
--- a/metadata/md5-cache/dev-python/fakeredis-2.23.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fake implementation of redis API for testing purposes
-EAPI=8
-HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-2.23.1.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c561f14ea9d89b0b5fa68117e7ca16c8
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.23.2 b/metadata/md5-cache/dev-python/fakeredis-2.23.2
index d0834623ecb9..678f6f3528fc 100644
--- a/metadata/md5-cache/dev-python/fakeredis-2.23.2
+++ b/metadata/md5-cache/dev-python/fakeredis-2.23.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/f/fakeredis/fakeredis-2.23.2.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c561f14ea9d89b0b5fa68117e7ca16c8
+_md5_=4cf75adf476b36ad1d00b69e2aa091eb
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.132.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.132.0
new file mode 100644
index 000000000000..69b72ea48b38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.132.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/uritemplate-5[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/g/google-api-python-client/google-api-python-client-2.132.0.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=ca81c2a51945c8639dc7420d6dd24fcb
diff --git a/metadata/md5-cache/dev-python/greenlet-2.0.2 b/metadata/md5-cache/dev-python/greenlet-2.0.2
deleted file mode 100644
index a693059e012c..000000000000
--- a/metadata/md5-cache/dev-python/greenlet-2.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/objgraph[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ) ) test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Lightweight in-process concurrent programming
-EAPI=8
-HOMEPAGE=https://greenlet.readthedocs.io/en/latest/ https://github.com/python-greenlet/greenlet/ https://pypi.org/project/greenlet/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=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/g/greenlet/greenlet-2.0.2.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5be466e3eb93c5c0c289772a0ffa2b0d
diff --git a/metadata/md5-cache/dev-python/greenlet-3.0.2 b/metadata/md5-cache/dev-python/greenlet-3.0.2
deleted file mode 100644
index 9b621f4c13f1..000000000000
--- a/metadata/md5-cache/dev-python/greenlet-3.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/objgraph[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ) ) test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Lightweight in-process concurrent programming
-EAPI=8
-HOMEPAGE=https://greenlet.readthedocs.io/en/latest/ https://github.com/python-greenlet/greenlet/ https://pypi.org/project/greenlet/
-INHERIT=distutils-r1 pypi
-IUSE=doc test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=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/g/greenlet/greenlet-3.0.2.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fff6e60ff4afc657808e1308471c25d3
diff --git a/metadata/md5-cache/dev-python/greenlet-3.0.3 b/metadata/md5-cache/dev-python/greenlet-3.0.3
index 470b2397c649..4f3adccd3a0c 100644
--- a/metadata/md5-cache/dev-python/greenlet-3.0.3
+++ b/metadata/md5-cache/dev-python/greenlet-3.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://greenlet.readthedocs.io/en/latest/ https://github.com/python-greenlet/greenlet/ https://pypi.org/project/greenlet/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/g/greenlet/greenlet-3.0.3.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f2b34271bda88042645e8f01011099f4
+_md5_=3e7910ca9698f0b4c84465952c54b099
diff --git a/metadata/md5-cache/dev-python/ipywidgets-8.1.2-r1 b/metadata/md5-cache/dev-python/ipywidgets-8.1.2-r1
index 42802975b34d..ce66795a2766 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-8.1.2-r1
+++ b/metadata/md5-cache/dev-python/ipywidgets-8.1.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/comm-0.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-4.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/widgetsnbextension-4.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab_widgets-3.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/ipykernel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/comm-0.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-4.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/widgetsnbextension-4.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-widgets-3.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=IPython HTML widgets for Jupyter
 EAPI=8
@@ -8,10 +8,10 @@ IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_
 KEYWORDS=~amd64
 LICENSE=BSD
 PDEPEND=>=dev-python/ipython-6.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-RDEPEND=>=dev-python/comm-0.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-4.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/widgetsnbextension-4.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab_widgets-3.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] 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(+)] )
+RDEPEND=>=dev-python/comm-0.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-4.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/widgetsnbextension-4.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-widgets-3.0.10[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] 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://files.pythonhosted.org/packages/source/i/ipywidgets/ipywidgets-8.1.2.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=235aacb689c4ea0d0d6b512264d79f1c
+_md5_=559f143463da5fcd1e2d6c2210acfe31
diff --git a/metadata/md5-cache/dev-python/ipywidgets-8.1.3 b/metadata/md5-cache/dev-python/ipywidgets-8.1.3
new file mode 100644
index 000000000000..116306f349e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipywidgets-8.1.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/comm-0.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-4.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/widgetsnbextension-4.0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-widgets-3.0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython HTML widgets for Jupyter
+EAPI=8
+HOMEPAGE=https://ipywidgets.readthedocs.io/ https://github.com/jupyter-widgets/ipywidgets/ https://pypi.org/project/ipywidgets/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=BSD
+PDEPEND=>=dev-python/ipython-6.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+RDEPEND=>=dev-python/comm-0.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-4.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/widgetsnbextension-4.0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-widgets-3.0.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] 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://files.pythonhosted.org/packages/source/i/ipywidgets/ipywidgets-8.1.3.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9f8292c6acfd9c00247834f53320881e
diff --git a/metadata/md5-cache/dev-python/jupyterlab_widgets-3.0.10 b/metadata/md5-cache/dev-python/jupyterlab-widgets-3.0.10
index 3ead96ac6223..a9b0d0c79ad9 100644
--- a/metadata/md5-cache/dev-python/jupyterlab_widgets-3.0.10
+++ b/metadata/md5-cache/dev-python/jupyterlab-widgets-3.0.10
@@ -10,6 +10,6 @@ LICENSE=BSD
 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 )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab_widgets/jupyterlab_widgets-3.0.10.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-widgets/jupyterlab_widgets-3.0.10.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
 _md5_=8913da74aa9d2644ba8a12f80ce84155
diff --git a/metadata/md5-cache/dev-python/jupyterlab-widgets-3.0.11 b/metadata/md5-cache/dev-python/jupyterlab-widgets-3.0.11
new file mode 100644
index 000000000000..85a8b02b93d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-widgets-3.0.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/jupyterlab-4.1.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] 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/jupyter-packaging-0.12.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jupyter interactive widgets for JupyterLab
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://pypi.org/project/jupyterlab-widgets/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=BSD
+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 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-widgets/jupyterlab_widgets-3.0.11.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8913da74aa9d2644ba8a12f80ce84155
diff --git a/metadata/md5-cache/dev-python/lxml-5.2.2 b/metadata/md5-cache/dev-python/lxml-5.2.2
index 98b93468fce4..e6195a00f495 100644
--- a/metadata/md5-cache/dev-python/lxml-5.2.2
+++ b/metadata/md5-cache/dev-python/lxml-5.2.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml/
 INHERIT=distutils-r1 optfeature toolchain-funcs
 IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 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
+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=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.10.3 >=dev-libs/libxslt-1.1.38 python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-5.2.2.tar.gz -> lxml-5.2.2.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a126d91fd367876e401828ea9aa73e4d
+_md5_=71efa4b3a5aa0088ea561dda8d84eb5d
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.9.1 b/metadata/md5-cache/dev-python/nodeenv-1.9.1
new file mode 100644
index 000000000000..43b104fa9bfd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nodeenv-1.9.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Node.js virtual environment builder
+EAPI=8
+HOMEPAGE=https://github.com/ekalinin/nodeenv/ https://pypi.org/project/nodeenv/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+PROPERTIES=test_network
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.9.1.tar.gz -> nodeenv-1.9.1.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=694fd679091f699c824ae99b32cb0845
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.38 b/metadata/md5-cache/dev-python/phonenumbers-8.13.38
new file mode 100644
index 000000000000..48a942fb42f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.13.38
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+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://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.38.tar.gz -> python-phonenumbers-8.13.38.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e9252a11e4df548c17882e3ff4037e05
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.11.2-r1 b/metadata/md5-cache/dev-python/pikepdf-8.11.2-r1
index 64c2e1feb123..20ab9759bfad 100644
--- a/metadata/md5-cache/dev-python/pikepdf-8.11.2-r1
+++ b/metadata/md5-cache/dev-python/pikepdf-8.11.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.7.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.7.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-11.7.0:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python library to work with pdf files based on qpdf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.11.2.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ac2830732f15b73bb5bd3329aeb39c66
+_md5_=9801ae9ebccdc1bd5bcaf4f775d0650a
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.14.0-r1 b/metadata/md5-cache/dev-python/pikepdf-8.14.0-r1
index 72a4ff7aa67c..f20eac4d828c 100644
--- a/metadata/md5-cache/dev-python/pikepdf-8.14.0-r1
+++ b/metadata/md5-cache/dev-python/pikepdf-8.14.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-11.5.0:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python library to work with pdf files based on qpdf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.14.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=41265a076b37dcae4e4c7b72009f29e2
+_md5_=1051e6c650824e8717bc0941207380d1
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.15.1-r1 b/metadata/md5-cache/dev-python/pikepdf-8.15.1-r1
index 7a9b97bcb62f..ebadd25e7ac6 100644
--- a/metadata/md5-cache/dev-python/pikepdf-8.15.1-r1
+++ b/metadata/md5-cache/dev-python/pikepdf-8.15.1-r1
@@ -1,11 +1,11 @@
-BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !big-endian? ( >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-11.5.0:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python library to work with pdf files based on qpdf
 EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+IUSE=big-endian test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.15.1.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=41265a076b37dcae4e4c7b72009f29e2
+_md5_=a0fc5cc6745b20dd73c0cbf6c92b4745
diff --git a/metadata/md5-cache/dev-python/pikepdf-8.4.1-r1 b/metadata/md5-cache/dev-python/pikepdf-8.4.1-r1
index e20f3dc4e068..90dd6612d640 100644
--- a/metadata/md5-cache/dev-python/pikepdf-8.4.1-r1
+++ b/metadata/md5-cache/dev-python/pikepdf-8.4.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-9.0[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-9.0[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-11.5.0:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python library to work with pdf files based on qpdf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-8.4.1.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a4c4174ef85844037b46493ef1202c13
+_md5_=1b494d71e667b85f92f51cfafb46cbd9
diff --git a/metadata/md5-cache/dev-python/pikepdf-9.0.0 b/metadata/md5-cache/dev-python/pikepdf-9.0.0
index a86dba825276..fe476a5468ad 100644
--- a/metadata/md5-cache/dev-python/pikepdf-9.0.0
+++ b/metadata/md5-cache/dev-python/pikepdf-9.0.0
@@ -1,11 +1,11 @@
-BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=>=dev-python/pybind11-2.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-scm-7.0.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.36[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.21.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-5.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !big-endian? ( >=dev-python/python-xmp-toolkit-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) media-libs/tiff[zlib] ) test? ( >=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-text/qpdf-11.5.0:0= python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python library to work with pdf files based on qpdf
 EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+IUSE=big-endian test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.5.0:0= dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-10.0.1[lcms,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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-9.0.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=f198dc57c13963103395f4f39b1db8c3
+_md5_=cd2f188f3d0b2ce3fc079e41968803a6
diff --git a/metadata/md5-cache/dev-python/pillow-10.0.1 b/metadata/md5-cache/dev-python/pillow-10.0.1
deleted file mode 100644
index 316bd407e857..000000000000
--- a/metadata/md5-cache/dev-python/pillow-10.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=8
-HOMEPAGE=https://python-pillow.org/ https://github.com/python-pillow/ https://pypi.org/project/Pillow/
-INHERIT=distutils-r1 toolchain-funcs virtualx
-IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-REQUIRED_USE=test? ( jpeg jpeg2k lcms tiff truetype ) || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-pillow/Pillow/archive/10.0.1.tar.gz -> pillow-10.0.1.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=5befe67db256dd556727e1999c9ff0a6
diff --git a/metadata/md5-cache/dev-python/pillow-10.1.0-r1 b/metadata/md5-cache/dev-python/pillow-10.1.0-r1
deleted file mode 100644
index 37322bb04fed..000000000000
--- a/metadata/md5-cache/dev-python/pillow-10.1.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=8
-HOMEPAGE=https://python-pillow.org/ https://github.com/python-pillow/ https://pypi.org/project/Pillow/
-INHERIT=distutils-r1 toolchain-funcs virtualx
-IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-REQUIRED_USE=test? ( jpeg jpeg2k lcms tiff truetype ) || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-pillow/Pillow/archive/10.1.0.tar.gz -> pillow-10.1.0.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=41b2ba7652e1d8e34ea21a5cfbaea0e4
diff --git a/metadata/md5-cache/dev-python/pillow-10.2.0 b/metadata/md5-cache/dev-python/pillow-10.2.0
deleted file mode 100644
index 21aed43ca5b2..000000000000
--- a/metadata/md5-cache/dev-python/pillow-10.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=8
-HOMEPAGE=https://python-pillow.org/ https://github.com/python-pillow/Pillow/ https://pypi.org/project/pillow/
-INHERIT=distutils-r1 toolchain-funcs virtualx
-IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-REQUIRED_USE=test? ( jpeg jpeg2k lcms tiff truetype ) || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-pillow/Pillow/archive/10.2.0.tar.gz -> pillow-10.2.0.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5
-_md5_=fcc12df57e882813b678492e9c86e17f
diff --git a/metadata/md5-cache/dev-python/prompt-toolkit-3.0.46 b/metadata/md5-cache/dev-python/prompt-toolkit-3.0.46
new file mode 100644
index 000000000000..c1b84df255c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prompt-toolkit-3.0.46
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Building powerful interactive command lines in Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/prompt-toolkit/prompt_toolkit-3.0.46.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f3d3457889360e96d1cd8cdbf2e83cce
diff --git a/metadata/md5-cache/dev-python/pycurl-7.45.3 b/metadata/md5-cache/dev-python/pycurl-7.45.3
index 09aca77762d2..89c0f6f7150d 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.45.3
+++ b/metadata/md5-cache/dev-python/pycurl-7.45.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/bottle-0.12.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2] ) test? ( >=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( >=dev-python/bottle-0.12.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2] ) test? ( >=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=net-misc/curl-7.25.0-r1:=[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= ) curl_ssl_openssl? ( dev-libs/openssl:= ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 DESCRIPTION=Python bindings for curl/libcurl
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-7.45.3.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=757c383fee6fc418d953806a8b12495b
+_md5_=43553668e7e9800132137b7bb131952c
diff --git a/metadata/md5-cache/dev-python/pydevd-2.10.0 b/metadata/md5-cache/dev-python/pydevd-2.10.0
deleted file mode 100644
index 71a3cc47b9c9..000000000000
--- a/metadata/md5-cache/dev-python/pydevd-2.10.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/untangle[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[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-debug/gdb >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-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=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
-EAPI=8
-HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/ https://pypi.org/project/pydevd/
-INHERIT=distutils-r1 multiprocessing toolchain-funcs
-IUSE=test 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
-LICENSE=EPL-1.0
-RDEPEND=dev-debug/gdb 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/fabioz/PyDev.Debugger/archive/pydev_debugger_2_10_0.tar.gz -> PyDev.Debugger-pydev_debugger_2_10_0.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4db0cbbf0cda8127d66b36fd0c3c174b
diff --git a/metadata/md5-cache/dev-python/pydevd-2.9.5 b/metadata/md5-cache/dev-python/pydevd-2.9.5
deleted file mode 100644
index 304428706465..000000000000
--- a/metadata/md5-cache/dev-python/pydevd-2.9.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/untangle[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-debug/gdb >=dev-python/pytest-7.4.4[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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
-EAPI=8
-HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=EPL-1.0
-RDEPEND=dev-debug/gdb 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? ( test )
-SLOT=0
-SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/pydev_debugger_2_9_5.tar.gz -> pydevd-2.9.5.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2898daa5a795eab8572638291a3044d5
diff --git a/metadata/md5-cache/dev-python/pydevd-3.0.3 b/metadata/md5-cache/dev-python/pydevd-3.0.3
deleted file mode 100644
index f8098c01b8b3..000000000000
--- a/metadata/md5-cache/dev-python/pydevd-3.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/untangle[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-debug/gdb >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-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=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
-EAPI=8
-HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/ https://pypi.org/project/pydevd/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=test 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
-LICENSE=EPL-1.0
-RDEPEND=dev-debug/gdb 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/fabioz/PyDev.Debugger/archive/pydev_debugger_3_0_3.tar.gz -> PyDev.Debugger-pydev_debugger_3_0_3.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5823353dded52519391a1289a0a7ffb7
diff --git a/metadata/md5-cache/dev-python/pydevd-3.1.0 b/metadata/md5-cache/dev-python/pydevd-3.1.0
deleted file mode 100644
index 7b98b03b2e8b..000000000000
--- a/metadata/md5-cache/dev-python/pydevd-3.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/untangle[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-debug/gdb >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-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=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
-EAPI=8
-HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/ https://pypi.org/project/pydevd/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=test 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
-LICENSE=EPL-1.0
-RDEPEND=dev-debug/gdb 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/fabioz/PyDev.Debugger/archive/pydev_debugger_3_1_0.tar.gz -> PyDev.Debugger-pydev_debugger_3_1_0.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0fb9a76c6636ad5533c1e60210921b07
diff --git a/metadata/md5-cache/dev-python/pydevd-3.1.0-r1 b/metadata/md5-cache/dev-python/pydevd-3.1.0-r1
new file mode 100644
index 000000000000..c1067d456ee2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydevd-3.1.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/untangle[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/psutil[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-rerunfailures[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-debug/gdb >=dev-python/pytest-7.4.4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
+EAPI=8
+HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/ https://pypi.org/project/pydevd/
+INHERIT=distutils-r1 toolchain-funcs
+IUSE=test 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
+LICENSE=EPL-1.0
+RDEPEND=dev-debug/gdb python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/pydev_debugger_3_1_0.tar.gz -> PyDev.Debugger-pydev_debugger_3_1_0.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=6d2fc2eb55501783fecd6b18ab95230f
diff --git a/metadata/md5-cache/dev-python/pylint-3.2.2 b/metadata/md5-cache/dev-python/pylint-3.2.2
index 77625198e735..f42297c0f9ab 100644
--- a/metadata/md5-cache/dev-python/pylint-3.2.2
+++ b/metadata/md5-cache/dev-python/pylint-3.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pylint/ https://github.com/pylint-dev/pylint/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-3.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/astroid-3.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/dill-0.3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/isort-4.2.5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/isort-6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/mccabe-0.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-2.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomlkit-0.10.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylint-dev/pylint/archive/v3.2.2.tar.gz -> pylint-3.2.2.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a18f84fec463e2f4851c7cbea3c33c5a
+_md5_=60841c5ecdb8f5f249cf4eaec0c4acff
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-2.1.3 b/metadata/md5-cache/dev-python/pyproject-fmt-2.1.3
index d0268440f779..8ac33f2dde75 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-2.1.3
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-2.1.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=~dev-python/pyproject-fmt-rust-1.1.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyproject-fmt/pyproject_fmt-2.1.3.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6ef201b23f6a76daf844b42d478b7584
+_md5_=c1ee25e44449aceffc2829330481e64b
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-rust-1.1.3 b/metadata/md5-cache/dev-python/pyproject-fmt-rust-1.1.3
index 0974cc3d3587..80abb6072dfe 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-rust-1.1.3
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-rust-1.1.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt-rust/ https://pypi.org/project/pyproject-fmt-rust/
 INHERIT=cargo distutils-r1 pypi
 IUSE=test debug python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT Apache-2.0-with-LLVM-exceptions ISC MIT Unicode-DFS-2016 || ( Apache-2.0 BSD-2 ) || ( Apache-2.0 Boost-1.0 )
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyproject-fmt-rust/pyproject_fmt_rust-1.1.3.tar.gz https://crates.io/api/v1/crates/ahash/0.8.11/download -> ahash-0.8.11.crate https://crates.io/api/v1/crates/aho-corasick/1.1.3/download -> aho-corasick-1.1.3.crate https://crates.io/api/v1/crates/any_ascii/0.1.7/download -> any_ascii-0.1.7.crate https://crates.io/api/v1/crates/arc-swap/1.7.1/download -> arc-swap-1.7.1.crate https://crates.io/api/v1/crates/autocfg/1.2.0/download -> autocfg-1.2.0.crate https://crates.io/api/v1/crates/beef/0.5.2/download -> beef-0.5.2.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/1.9.1/download -> bstr-1.9.1.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/countme/3.0.1/download -> countme-3.0.1.crate https://crates.io/api/v1/crates/deranged/0.3.11/download -> deranged-0.3.11.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/either/1.11.0/download -> either-1.11.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/futures-channel/0.3.30/download -> futures-channel-0.3.30.crate https://crates.io/api/v1/crates/futures-core/0.3.30/download -> futures-core-0.3.30.crate https://crates.io/api/v1/crates/futures-executor/0.3.30/download -> futures-executor-0.3.30.crate https://crates.io/api/v1/crates/futures-io/0.3.30/download -> futures-io-0.3.30.crate https://crates.io/api/v1/crates/futures-macro/0.3.30/download -> futures-macro-0.3.30.crate https://crates.io/api/v1/crates/futures-sink/0.3.30/download -> futures-sink-0.3.30.crate https://crates.io/api/v1/crates/futures-task/0.3.30/download -> futures-task-0.3.30.crate https://crates.io/api/v1/crates/futures-timer/3.0.3/download -> futures-timer-3.0.3.crate https://crates.io/api/v1/crates/futures-util/0.3.30/download -> futures-util-0.3.30.crate https://crates.io/api/v1/crates/futures/0.3.30/download -> futures-0.3.30.crate https://crates.io/api/v1/crates/getrandom/0.2.14/download -> getrandom-0.2.14.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.14/download -> globset-0.4.14.crate https://crates.io/api/v1/crates/hashbrown/0.14.3/download -> hashbrown-0.14.3.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.5.0/download -> idna-0.5.0.crate https://crates.io/api/v1/crates/indoc/2.0.5/download -> indoc-2.0.5.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.11/download -> itoa-1.0.11.crate https://crates.io/api/v1/crates/lexical-sort/0.3.1/download -> lexical-sort-0.3.1.crate https://crates.io/api/v1/crates/libc/0.2.153/download -> libc-0.2.153.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/logos-derive/0.12.1/download -> logos-derive-0.12.1.crate https://crates.io/api/v1/crates/logos/0.12.1/download -> logos-0.12.1.crate https://crates.io/api/v1/crates/memchr/2.7.2/download -> memchr-2.7.2.crate https://crates.io/api/v1/crates/memoffset/0.9.1/download -> memoffset-0.9.1.crate https://crates.io/api/v1/crates/num-conv/0.1.0/download -> num-conv-0.1.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/pep440_rs/0.6.0/download -> pep440_rs-0.6.0.crate https://crates.io/api/v1/crates/pep508_rs/0.6.0/download -> pep508_rs-0.6.0.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.14/download -> pin-project-lite-0.2.14.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/portable-atomic/1.6.0/download -> portable-atomic-1.6.0.crate https://crates.io/api/v1/crates/powerfmt/0.2.0/download -> powerfmt-0.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.81/download -> proc-macro2-1.0.81.crate https://crates.io/api/v1/crates/pyo3-build-config/0.21.2/download -> pyo3-build-config-0.21.2.crate https://crates.io/api/v1/crates/pyo3-ffi/0.21.2/download -> pyo3-ffi-0.21.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.21.2/download -> pyo3-macros-backend-0.21.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.21.2/download -> pyo3-macros-0.21.2.crate https://crates.io/api/v1/crates/pyo3/0.21.2/download -> pyo3-0.21.2.crate https://crates.io/api/v1/crates/quote/1.0.36/download -> quote-1.0.36.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/regex-automata/0.4.6/download -> regex-automata-0.4.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/regex-syntax/0.8.3/download -> regex-syntax-0.8.3.crate https://crates.io/api/v1/crates/regex/1.10.4/download -> regex-1.10.4.crate https://crates.io/api/v1/crates/relative-path/1.9.2/download -> relative-path-1.9.2.crate https://crates.io/api/v1/crates/rowan/0.15.15/download -> rowan-0.15.15.crate https://crates.io/api/v1/crates/rstest/0.19.0/download -> rstest-0.19.0.crate https://crates.io/api/v1/crates/rstest_macros/0.19.0/download -> rstest_macros-0.19.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/ryu/1.0.17/download -> ryu-1.0.17.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/semver/1.0.22/download -> semver-1.0.22.crate https://crates.io/api/v1/crates/serde/1.0.198/download -> serde-1.0.198.crate https://crates.io/api/v1/crates/serde_derive/1.0.198/download -> serde_derive-1.0.198.crate https://crates.io/api/v1/crates/serde_json/1.0.116/download -> serde_json-1.0.116.crate https://crates.io/api/v1/crates/slab/0.4.9/download -> slab-0.4.9.crate https://crates.io/api/v1/crates/smallvec/1.13.2/download -> smallvec-1.13.2.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.60/download -> syn-2.0.60.crate https://crates.io/api/v1/crates/taplo/0.13.0/download -> taplo-0.13.0.crate https://crates.io/api/v1/crates/target-lexicon/0.12.14/download -> target-lexicon-0.12.14.crate https://crates.io/api/v1/crates/text-size/1.1.1/download -> text-size-1.1.1.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.59/download -> thiserror-impl-1.0.59.crate https://crates.io/api/v1/crates/thiserror/1.0.59/download -> thiserror-1.0.59.crate https://crates.io/api/v1/crates/time-core/0.1.2/download -> time-core-0.1.2.crate https://crates.io/api/v1/crates/time-macros/0.2.18/download -> time-macros-0.2.18.crate https://crates.io/api/v1/crates/time/0.3.36/download -> time-0.3.36.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/tracing-attributes/0.1.27/download -> tracing-attributes-0.1.27.crate https://crates.io/api/v1/crates/tracing-core/0.1.32/download -> tracing-core-0.1.32.crate https://crates.io/api/v1/crates/tracing/0.1.40/download -> tracing-0.1.40.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.15/download -> unicode-bidi-0.3.15.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.23/download -> unicode-normalization-0.1.23.crate https://crates.io/api/v1/crates/unicode-width/0.1.12/download -> unicode-width-0.1.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/unscanny/0.1.0/download -> unscanny-0.1.0.crate https://crates.io/api/v1/crates/url/2.5.0/download -> url-2.5.0.crate https://crates.io/api/v1/crates/urlencoding/2.1.3/download -> urlencoding-2.1.3.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/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/zerocopy-derive/0.7.32/download -> zerocopy-derive-0.7.32.crate https://crates.io/api/v1/crates/zerocopy/0.7.32/download -> zerocopy-0.7.32.crate
 _eclasses_=cargo	172dcb548e750dda201deb8263a17124	distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7056b043ac113c2071781fbf53c5e997
+_md5_=d2f231ef62052d44bf480eed5ecc45a6
diff --git a/metadata/md5-cache/dev-python/pytest-8.2.2 b/metadata/md5-cache/dev-python/pytest-8.2.2
new file mode 100644
index 000000000000..d423bd12799a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-8.2.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-scm-6.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/pluggy-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pluggy-1.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) !!<=dev-python/flaky-3.7.0-r5 python_targets_pypy3? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/attrs-19.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/attrs-19.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/attrs-19.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/attrs-19.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/attrs-19.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple powerful testing with Python
+EAPI=8
+HOMEPAGE=https://pytest.org/ https://github.com/pytest-dev/pytest/ https://pypi.org/project/pytest/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/pluggy-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pluggy-1.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) !!<=dev-python/flaky-3.7.0-r5 python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest/pytest-8.2.2.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=63dc360281761bcf2d20770d5c9fc082
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.6 b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.6
deleted file mode 100644
index 299cc096dc1d..000000000000
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/hypothesis-3.64[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for testing asyncio code with pytest
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio/ https://pypi.org/project/pytest-asyncio/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-asyncio/pytest-asyncio-0.23.6.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=45be6ba895609ef2892c67320054528e
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.7 b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.7
index 17918b48d0c6..df021ce1e252 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.23.7
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.23.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio/ https://pypi.org/project/pytest-asyncio/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-asyncio/pytest_asyncio-0.23.7.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ac7724362ce1a48f0e0beb7841f422f1
+_md5_=0733e15395af53beecd711a7852044fa
diff --git a/metadata/md5-cache/dev-python/pytest-bdd-7.2.0 b/metadata/md5-cache/dev-python/pytest-bdd-7.2.0
new file mode 100644
index 000000000000..ed88998d55ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-bdd-7.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/parse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/parse_type[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BDD library for the pytest runner
+EAPI=8
+HOMEPAGE=https://pytest-bdd.readthedocs.io/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/mako[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/parse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/parse_type[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/7.2.0.tar.gz -> pytest-bdd-7.2.0.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=e9b8506e550fd08d470999a191bc5989
diff --git a/metadata/md5-cache/dev-python/pytest-localftpserver-1.2.0 b/metadata/md5-cache/dev-python/pytest-localftpserver-1.2.0
deleted file mode 100644
index f26fad97c97b..000000000000
--- a/metadata/md5-cache/dev-python/pytest-localftpserver-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pyftpdlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PyTest plugin which provides an FTP fixture for your tests
-EAPI=8
-HOMEPAGE=https://github.com/oz123/pytest-localftpserver/ https://pypi.org/project/pytest-localftpserver/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/pyftpdlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[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/pytest-localftpserver/pytest_localftpserver-1.2.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6cebc835b88bf4442a6f3441c1a50947
diff --git a/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.1-r1 b/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.1-r1
deleted file mode 100644
index fd6039381fa6..000000000000
--- a/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pyftpdlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PyTest plugin which provides an FTP fixture for your tests
-EAPI=8
-HOMEPAGE=https://github.com/oz123/pytest-localftpserver/ https://pypi.org/project/pytest-localftpserver/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyftpdlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[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/pytest-localftpserver/pytest_localftpserver-1.3.1.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b9fa7bb09c5ec7038175672b59ae272c
diff --git a/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.2 b/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.2
index eba4bb5eb359..b474833f2cf5 100644
--- a/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.2
+++ b/metadata/md5-cache/dev-python/pytest-localftpserver-1.3.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/oz123/pytest-localftpserver/ https://pypi.org/project/pytest-localftpserver/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pyftpdlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-localftpserver/pytest_localftpserver-1.3.2.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d5814c03ba786dcd23c3f46007b147ef
+_md5_=a2649106f4a69d092978db85fe040b63
diff --git a/metadata/md5-cache/dev-python/pytest-twisted-1.14.1 b/metadata/md5-cache/dev-python/pytest-twisted-1.14.1
index ff0b4442dcfc..3b12a282961e 100644
--- a/metadata/md5-cache/dev-python/pytest-twisted-1.14.1
+++ b/metadata/md5-cache/dev-python/pytest-twisted-1.14.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-twisted/ https://pypi.org/project/pytest-twisted/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/twisted[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-twisted/archive/v1.14.1.tar.gz -> pytest-twisted-1.14.1.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5d233eb35eec0627dc5aaeebde1dd724
+_md5_=f1956ff5cc9ab50f668369cc072e4cb4
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-1.0.1 b/metadata/md5-cache/dev-python/pytest-xprocess-1.0.1
deleted file mode 100644
index a96dd63cb636..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xprocess-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage external processes across test runs
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-xprocess/pytest-xprocess-1.0.1.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=791f82996acaff56c5afabdcb4ce1343
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-1.0.2 b/metadata/md5-cache/dev-python/pytest-xprocess-1.0.2
index b5c683ac3960..a9960a2a4b77 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-1.0.2
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-1.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-xprocess/pytest-xprocess-1.0.2.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=85f7d6b0104d26a807a2e09696c698a6
+_md5_=791f82996acaff56c5afabdcb4ce1343
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
deleted file mode 100644
index 93cd4f98d29c..000000000000
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] ) ) ) test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( media-libs/exempi )
-DESCRIPTION=Library for working with XMP metadata
-EAPI=8
-HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/pytz[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-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8ba0d376feb2557748626ae0f84ee54d
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2-r1
index 7f0f83d2e136..7b3d9f5658f5 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.2-r1
@@ -1,17 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] ) ) ) test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] ) ( dev-python/pypy3 >=dev-python/sphinx-7.2.6[python_targets_pypy3(-)] ) ) ) test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-libs/exempi python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( media-libs/exempi )
 DESCRIPTION=Library for working with XMP metadata
 EAPI=8
 HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86
 LICENSE=BSD
-RDEPEND=dev-python/pytz[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 )
+RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-libs/exempi 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-xmp-toolkit/python-xmp-toolkit/archive/v2.0.2.tar.gz -> python-xmp-toolkit-2.0.2.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=241356cd967ea3aa8c73bc3459599ee5
+_md5_=bb963255f787009499caeded3dee634f
diff --git a/metadata/md5-cache/dev-python/quart-0.19.5 b/metadata/md5-cache/dev-python/quart-0.19.5
deleted file mode 100644
index 8faca77cfab2..000000000000
--- a/metadata/md5-cache/dev-python/quart-0.19.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/aiofiles[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/blinker-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-8.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flask-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypercorn-0.11.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python ASGI web microframework with the same API as Flask
-EAPI=8
-HOMEPAGE=https://github.com/pallets/quart/ https://pypi.org/project/Quart/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/aiofiles[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/blinker-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-8.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flask-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypercorn-0.11.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-3.0.0[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/pallets/quart/archive/0.19.5.tar.gz -> quart-0.19.5.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3a06e78cad850aed4ab52f2916ef450a
diff --git a/metadata/md5-cache/dev-python/quart-0.19.6 b/metadata/md5-cache/dev-python/quart-0.19.6
index 8b2574f379c5..39ebb281da69 100644
--- a/metadata/md5-cache/dev-python/quart-0.19.6
+++ b/metadata/md5-cache/dev-python/quart-0.19.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pallets/quart/ https://pypi.org/project/Quart/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/aiofiles[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/blinker-1.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-8.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flask-3.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypercorn-0.11.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-3.0.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/quart/archive/0.19.6.tar.gz -> quart-0.19.6.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=848784af68ea1383a90e718612cf713c
+_md5_=3a06e78cad850aed4ab52f2916ef450a
diff --git a/metadata/md5-cache/dev-python/requests-file-2.0.0 b/metadata/md5-cache/dev-python/requests-file-2.0.0
deleted file mode 100644
index 51a53c9bea8b..000000000000
--- a/metadata/md5-cache/dev-python/requests-file-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File transport adapter for Requests
-EAPI=8
-HOMEPAGE=https://github.com/dashea/requests-file/ https://pypi.org/project/requests-file/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 arm64 ~loong x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-file/requests-file-2.0.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6e2e71367652f69c58659726cd3161ad
diff --git a/metadata/md5-cache/dev-python/requests-file-2.1.0 b/metadata/md5-cache/dev-python/requests-file-2.1.0
index b43cbbd8408d..3a5cee8e1c62 100644
--- a/metadata/md5-cache/dev-python/requests-file-2.1.0
+++ b/metadata/md5-cache/dev-python/requests-file-2.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/dashea/requests-file/ https://pypi.org/project/requests-file/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm64 ~loong ~x86
+KEYWORDS=amd64 arm64 ~loong x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/requests-file/requests_file-2.1.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=345561b19bf4a151bf5d225f973ab972
+_md5_=f00394de2d32d60ae2a34e05540ecfd5
diff --git a/metadata/md5-cache/dev-python/sabctools-8.2.3 b/metadata/md5-cache/dev-python/sabctools-8.2.3
index 21a68cf0f6f0..2ad9d19de6c0 100644
--- a/metadata/md5-cache/dev-python/sabctools-8.2.3
+++ b/metadata/md5-cache/dev-python/sabctools-8.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sabnzbd/sabctools/ https://pypi.org/project/sabctools/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3
 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabctools/archive/v8.2.3.tar.gz -> sabctools-8.2.3.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9b15771b1b378ceb95847901ab999ff3
+_md5_=ea091461efbf2b638315702e286c7475
diff --git a/metadata/md5-cache/dev-python/scikit-learn-1.5.0 b/metadata/md5-cache/dev-python/scikit-learn-1.5.0
index 0f4adc62791f..42893255e20b 100644
--- a/metadata/md5-cache/dev-python/scikit-learn-1.5.0
+++ b/metadata/md5-cache/dev-python/scikit-learn-1.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scikit-learn.org/stable/ https://github.com/scikit-learn/scikit-learn/ https://pypi.org/project/scikit-learn/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=virtual/blas:= virtual/cblas:= >=dev-python/numpy-1.19.5:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/joblib-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/threadpoolctl-3.1.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/1.5.0.tar.gz -> scikit-learn-1.5.0.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ec7c97e622992f59a07a679d972b612d
+_md5_=4917edbb0c81a050e036ff01f2558ccd
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-2.4.0 b/metadata/md5-cache/dev-python/sentry-sdk-2.4.0
new file mode 100644
index 000000000000..bfac8feafad7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/executing[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fakeredis[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask-login[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyrsistent[python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/pytest-8[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-aiohttp[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-forked[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-localserver[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/python-socks[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/responses[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/werkzeug[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/zope-event[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/urllib3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/certifi[python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/certifi[python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getsentry/sentry-python/archive/2.4.0.tar.gz -> sentry-python-2.4.0.gh.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a3ac43b233a6de8f593f162ba24a8cab
diff --git a/metadata/md5-cache/dev-python/setuptools-70.0.0 b/metadata/md5-cache/dev-python/setuptools-70.0.0
index c73e84f47b32..69e4160ed759 100644
--- a/metadata/md5-cache/dev-python/setuptools-70.0.0
+++ b/metadata/md5-cache/dev-python/setuptools-70.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 PDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/packaging-24[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[xml(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-70.0.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=7162cbcba98763a2918659a5f94c297a
+_md5_=b998fc28b488e65fd644cc1efa256470
diff --git a/metadata/md5-cache/dev-python/simpy-4.1.1 b/metadata/md5-cache/dev-python/simpy-4.1.1
index 8e18138a551c..5199ff2745e9 100644
--- a/metadata/md5-cache/dev-python/simpy-4.1.1
+++ b/metadata/md5-cache/dev-python/simpy-4.1.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) python_targets_python3_11? ( dev-lang/python:3.11[tk] ) python_targets_python3_12? ( dev-lang/python:3.12[tk] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/py[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) python_targets_python3_11? ( dev-lang/python:3.11[tk] ) python_targets_python3_12? ( dev-lang/python:3.12[tk] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Object-oriented, process-based discrete-event simulation language
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/simpy/simpy-4.1.1.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=517e3b73207e95310eb2afb793657900
+_md5_=c0d305876911914fc81e7d075a0d123f
diff --git a/metadata/md5-cache/dev-python/stomp-py-8.1.0 b/metadata/md5-cache/dev-python/stomp-py-8.1.0
deleted file mode 100644
index ec1be6eb9160..000000000000
--- a/metadata/md5-cache/dev-python/stomp-py-8.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python client library for the STOMP messaging protocol
-EAPI=8
-HOMEPAGE=https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/docopt-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
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/stomp.py/stomp.py-8.1.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5fce0ebd3817d776333b246cd955380e
diff --git a/metadata/md5-cache/dev-python/stomp-py-8.1.2 b/metadata/md5-cache/dev-python/stomp-py-8.1.2
index 54a573d0cd3d..d7aba7aec2d3 100644
--- a/metadata/md5-cache/dev-python/stomp-py-8.1.2
+++ b/metadata/md5-cache/dev-python/stomp-py-8.1.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/stomp-py/ https://github.com/jasonrbriggs/stomp.py/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/docopt-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/websocket-client[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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/stomp-py/stomp_py-8.1.2.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=03e5aec6b3d7383a4540a4f375ac10dd
+_md5_=bee863d809c9c7ecea8dcabc3e87e316
diff --git a/metadata/md5-cache/dev-python/tables-3.9.0 b/metadata/md5-cache/dev-python/tables-3.9.0
deleted file mode 100644
index 23014c4c2119..000000000000
--- a/metadata/md5-cache/dev-python/tables-3.9.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig cpudetection? ( dev-python/py-cpuinfo[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/c-blosc2:= dev-libs/lzo:2= <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/hdf5-1.8.4:= >=dev-python/numexpr-2.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] cpudetection? ( dev-python/py-cpuinfo[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/c-blosc2:= dev-libs/lzo:2= <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/hdf5-1.8.4:= python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] )
-DESCRIPTION=Hierarchical datasets for Python
-EAPI=8
-HOMEPAGE=https://www.pytables.org/ https://github.com/PyTables/PyTables/ https://pypi.org/project/tables/
-INHERIT=distutils-r1 prefix pypi
-IUSE=+cpudetection examples test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/c-blosc2:= dev-libs/lzo:2= <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-libs/hdf5-1.8.4:= >=dev-python/numexpr-2.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] cpudetection? ( dev-python/py-cpuinfo[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/tables/tables-3.9.0.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=050c8496e22a20fd6b08d96cce55268f
diff --git a/metadata/md5-cache/dev-python/tables-3.9.1-r1 b/metadata/md5-cache/dev-python/tables-3.9.1-r1
deleted file mode 100644
index 1d6925c06897..000000000000
--- a/metadata/md5-cache/dev-python/tables-3.9.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig cpudetection? ( dev-python/py-cpuinfo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= >=dev-libs/c-blosc2-2.10.4:= dev-libs/lzo:2= <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.19.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sci-libs/hdf5-1.8.4:= >=dev-python/numexpr-2.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] cpudetection? ( dev-python/py-cpuinfo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) 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_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= >=dev-libs/c-blosc2-2.10.4:= dev-libs/lzo:2= <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.19.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sci-libs/hdf5-1.8.4:= 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=Hierarchical datasets for Python
-EAPI=8
-HOMEPAGE=https://www.pytables.org/ https://github.com/PyTables/PyTables/ https://pypi.org/project/tables/
-INHERIT=distutils-r1 prefix pypi
-IUSE=+cpudetection examples test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= >=dev-libs/c-blosc2-2.10.4:= dev-libs/lzo:2= <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.19.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sci-libs/hdf5-1.8.4:= >=dev-python/numexpr-2.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] cpudetection? ( dev-python/py-cpuinfo[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/tables/tables-3.9.1.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=53231a22736fb970dcc6d260df7f334a
diff --git a/metadata/md5-cache/dev-python/trimesh-4.3.2 b/metadata/md5-cache/dev-python/trimesh-4.3.2
deleted file mode 100644
index 52d0c62eefe3..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-4.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mapbox_earcut[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[webp,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/rtree[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimesh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/rtree[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/mikedh/trimesh/archive/4.3.2.tar.gz -> trimesh-4.3.2.gh.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=afff4b1ea679d1d59ca02dc571b7a7da
diff --git a/metadata/md5-cache/dev-python/trimesh-4.4.0 b/metadata/md5-cache/dev-python/trimesh-4.4.0
index 08268fd54802..afeec580efaa 100644
--- a/metadata/md5-cache/dev-python/trimesh-4.4.0
+++ b/metadata/md5-cache/dev-python/trimesh-4.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://trimesh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/rtree[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikedh/trimesh/archive/4.4.0.tar.gz -> trimesh-4.4.0.gh.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a6e23f4300b44149385a17a43618bfb9
+_md5_=2665002da02f50cea02564b0bf3eb941
diff --git a/metadata/md5-cache/dev-python/unearth-0.15.1 b/metadata/md5-cache/dev-python/unearth-0.15.1
deleted file mode 100644
index d0bc4f04f5d6..000000000000
--- a/metadata/md5-cache/dev-python/unearth-0.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-httpserver[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-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/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.27.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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.8[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 ~arm64
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.27.0[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.15.1.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c1a944c4e92b4c30c704e01b7dc1b6d9
diff --git a/metadata/md5-cache/dev-python/unearth-0.15.2 b/metadata/md5-cache/dev-python/unearth-0.15.2
deleted file mode 100644
index f0991ea5bf21..000000000000
--- a/metadata/md5-cache/dev-python/unearth-0.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-httpserver[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-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/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.27.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) 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.8[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 ~arm64
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.27.0[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.15.2.tar.gz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c1a944c4e92b4c30c704e01b7dc1b6d9
diff --git a/metadata/md5-cache/dev-python/unearth-0.15.4 b/metadata/md5-cache/dev-python/unearth-0.15.4
new file mode 100644
index 000000000000..339a37ab5125
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unearth-0.15.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-httpserver[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests-wsgi-adapter[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/httpx-0.27.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pdm-backend-2.1.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=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 python_targets_python3_13
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/httpx-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/httpx-0.27.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/u/unearth/unearth-0.15.4.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5cfe1588cbeb1362b6c829a965be2848
diff --git a/metadata/md5-cache/dev-python/weasyprint-62.2 b/metadata/md5-cache/dev-python/weasyprint-62.2
new file mode 100644
index 000000000000..1fd9f49b64c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/weasyprint-62.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-text/ghostscript-gpl-9.56.1-r3 media-fonts/ahem ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
+EAPI=8
+HOMEPAGE=https://weasyprint.org/ https://github.com/Kozea/WeasyPrint/ https://pypi.org/project/weasyprint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/html5lib-1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydyf-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tinycss2-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] media-fonts/dejavu x11-libs/pango 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/w/weasyprint/weasyprint-62.2.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=0e1597c09d05f9c3e78fb40e91bbb7aa
diff --git a/metadata/md5-cache/dev-python/werkzeug-3.0.3 b/metadata/md5-cache/dev-python/werkzeug-3.0.3
index 296ff755cbfd..c9b1b1f52fd3 100644
--- a/metadata/md5-cache/dev-python/werkzeug-3.0.3
+++ b/metadata/md5-cache/dev-python/werkzeug-3.0.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-xprocess-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/watchdog-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-xprocess-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/watchdog-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of various utilities for WSGI applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/werkzeug/werkzeug-3.0.3.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a82b7373567219f8d30d26c77b98dcb0
+_md5_=412706130c2fdcf73d7742af14e8133b
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.11 b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.11
new file mode 100644
index 000000000000..8638a7a8fb01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.11
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/jupyter-packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] 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-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython HTML widgets for Jupyter
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://pypi.org/project/widgetsnbextension/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+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 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/w/widgetsnbextension/widgetsnbextension-4.0.11.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=d728652f6661ec67ed14762a9fa2f4ab
diff --git a/metadata/md5-cache/dev-python/zipp-3.19.2 b/metadata/md5-cache/dev-python/zipp-3.19.2
new file mode 100644
index 000000000000..2413f070a608
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-3.19.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-itertools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-test[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/zipp/ https://pypi.org/project/zipp/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+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/z/zipp/zipp-3.19.2.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1230dec901f966ec7374c6d718cc39b2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2292d6f25ada..0e8af068fd6c 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/curses-1.4.6 b/metadata/md5-cache/dev-ruby/curses-1.4.6
new file mode 100644
index 000000000000..d832b5fc5956
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.6
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/ncurses:0 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
+EAPI=8
+HOMEPAGE=https://github.com/ruby/curses
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=|| ( Ruby BSD-2 )
+RDEPEND=sys-libs/ncurses:0 ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/curses-1.4.6.gem
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=deaa289c6e39329f75d4827ba4996ada
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.6.0 b/metadata/md5-cache/dev-ruby/io-event-1.6.0
new file mode 100644
index 000000000000..c2f5d6f82a46
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/io-event-1.6.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sus[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/sus[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/sus[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=io-uring? ( sys-libs/liburing:= ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=An event loop
+EAPI=8
+HOMEPAGE=https://github.com/socketry/io-event
+INHERIT=ruby-fakegem
+IUSE=+io-uring ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=io-uring? ( sys-libs/liburing:= ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/socketry/io-event/archive/v1.6.0.tar.gz -> io-event-1.6.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4b8eec64fe90d8c37b928f7f5c7d1e55
diff --git a/metadata/md5-cache/dev-ruby/memo_wise-1.9.0 b/metadata/md5-cache/dev-ruby/memo_wise-1.9.0
new file mode 100644
index 000000000000..caabf3ce0875
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/memo_wise-1.9.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby33? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby33(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+DESCRIPTION=The wise choice for Ruby memoization
+EAPI=8
+HOMEPAGE=https://github.com/panorama-ed/memo_wise
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/panorama-ed/memo_wise/archive/v1.9.0.tar.gz -> memo_wise-1.9.0.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=5111c6d7c56417faf4579649c5ad7514
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.5.0 b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
deleted file mode 100644
index c24799de482c..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-6.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby31(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby31(-)] dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby32(-)] >dev-ruby/racc-1.4.10[ruby_targets_ruby32(-)] dev-ruby/rake[ruby_targets_ruby32(-)] test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=8
-HOMEPAGE=https://github.com/ruby/rdoc/
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=|| ( GPL-2 Ruby-BSD )
-RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby/rdoc/archive/v6.5.0.tar.gz -> rdoc-6.5.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	4ef520a992dc54fdd8f49d875c1ab2c0	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=bdb2845b8e66cd0231f46000651b2b5c
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index c025382c56a9..9f1082cbe141 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/bigloo-4.4c_p4-r6 b/metadata/md5-cache/dev-scheme/bigloo-4.5b
index 8e4c16d46409..d282fa7bfe72 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-4.4c_p4-r6
+++ b/metadata/md5-cache/dev-scheme/bigloo-4.5b
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/boehm-gc[threads] dev-libs/libpcre2:= dev-libs/libunistring:= dev-libs/openssl:= alsa? ( media-libs/alsa-lib ) avahi? ( net-dns/avahi ) flac? ( media-libs/flac:= ) gmp? ( dev-libs/gmp:= ) gpg? ( app-crypt/gnupg ) gstreamer? ( media-libs/gst-plugins-base:1.0= media-libs/gstreamer:1.0= ) java? ( app-arch/zip virtual/jdk:* ) libuv? ( dev-libs/libuv:= ) mp3? ( media-sound/mpg123 ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3= )
 DESCRIPTION=Practical Scheme Compiler with many extensions
 EAPI=8
-HOMEPAGE=http://www-sop.inria.fr/indes/fp/Bigloo/index.html
+HOMEPAGE=https://www-sop.inria.fr/indes/fp/Bigloo/index.html
 INHERIT=elisp-common flag-o-matic toolchain-funcs
 IUSE=alsa avahi emacs flac +gmp gpg gstreamer java libuv mp3 pulseaudio +sqlite
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/boehm-gc[threads] dev-libs/libpcre2:= dev-libs/libunistring:= dev-libs/openssl:= alsa? ( media-libs/alsa-lib ) avahi? ( net-dns/avahi ) flac? ( media-libs/flac:= ) gmp? ( dev-libs/gmp:= ) gpg? ( app-crypt/gnupg ) gstreamer? ( media-libs/gst-plugins-base:1.0= media-libs/gstreamer:1.0= ) java? ( app-arch/zip virtual/jdk:* ) libuv? ( dev-libs/libuv:= ) mp3? ( media-sound/mpg123 ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3= ) emacs? ( >=app-editors/emacs-23.1:* ) sys-devel/binutils dev-debug/gdb
-REQUIRED_USE=flac? ( alsa ) mp3? ( alsa )
+REQUIRED_USE=flac? ( alsa ) mp3? ( alsa ) gstreamer? ( pulseaudio )
 SLOT=0
-SRC_URI=ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-4.4c-4.tar.gz
+SRC_URI=ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-4.5b.tar.gz
 _eclasses_=elisp-common	abb2dda42f680fce87602c8273f832c7	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ba04030f046414431a73ecd163840067
+_md5_=cca14d380c854ceaeafa19fb9c4b908e
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 6314722ef2a3..393139cd7fb6 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2023_p59159-r3 b/metadata/md5-cache/dev-texlive/texlive-basic-2023_p59159-r3
deleted file mode 100644
index 6fa9dc5a5111..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2023_p59159-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-text/texlive-core-2023 app-arch/xz-utils
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=>=app-text/texlive-core-2023[luajittex?]
-DESCRIPTION=TeXLive Essential programs and files
-EAPI=8
-HOMEPAGE=https://www.tug.org/texlive/
-INHERIT=texlive-module
-IUSE=doc source +luajittex
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-1+ GPL-2+ LGPL-2.1 LPPL-1.0 LPPL-1.3 LPPL-1.3c MIT OFL-1.1 TeX TeX-other-free public-domain
-RDEPEND=>=app-text/texlive-core-2023[luajittex?] >=app-text/dvipsk-2023.03.11_p66203 >=app-text/texlive-core-2023
-SLOT=0
-SRC_URI=https://mirrors.ctan.org/systems/texlive/tlnet/archive/collection-basic.r59159.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/amsfonts.r61937.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/bibtex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/cm.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/colorprofiles.r49086.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ec.r25033.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/enctex.r34957.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex.r66203.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex-pkg.r41784.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/graphics-def.r64487.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyph-utf8.r61719.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyphenex.r57387.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ifplatform.r45533.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/iftex.r61910.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/knuth-lib.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/knuth-local.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lua-alt-getopt.r56414.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luahbtex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luatex.r69182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/metafont.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mflogo.r42428.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mfware.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/modes.r69113.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pdftex.r66243.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/plain.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex-ini-files.r68920.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-msg-translations.r69696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tlshell.r66771.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/unicode-data.r68311.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/collection-basic.r59159.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/amsfonts.r61937.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/bibtex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/cm.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/colorprofiles.r49086.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ec.r25033.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/enctex.r34957.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex.r66203.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex-pkg.r41784.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/graphics-def.r64487.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyph-utf8.r61719.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyphenex.r57387.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ifplatform.r45533.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/iftex.r61910.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/knuth-lib.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/knuth-local.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lua-alt-getopt.r56414.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luahbtex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luatex.r69182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/metafont.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mflogo.r42428.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mfware.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/modes.r69113.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pdftex.r66243.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/plain.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex-ini-files.r68920.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-msg-translations.r69696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tlshell.r66771.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/unicode-data.r68311.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/amsfonts.doc.r61937.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/bibtex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/cm.doc.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/colorprofiles.doc.r49086.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ec.doc.r25033.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/enctex.doc.r34957.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex.doc.r66203.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex-pkg.doc.r41784.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/graphics-def.doc.r64487.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyph-utf8.doc.r61719.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ifplatform.doc.r45533.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/iftex.doc.r61910.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lua-alt-getopt.doc.r56414.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luahbtex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luatex.doc.r69182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/metafont.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mflogo.doc.r42428.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mfware.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/modes.doc.r69113.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pdftex.doc.r66243.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex-ini-files.doc.r68920.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-common.doc.r68510.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-en.doc.r67184.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tlshell.doc.r66771.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/unicode-data.doc.r68311.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/amsfonts.doc.r61937.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/bibtex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/cm.doc.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/colorprofiles.doc.r49086.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ec.doc.r25033.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/enctex.doc.r34957.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex.doc.r66203.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex-pkg.doc.r41784.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/graphics-def.doc.r64487.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyph-utf8.doc.r61719.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ifplatform.doc.r45533.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/iftex.doc.r61910.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lua-alt-getopt.doc.r56414.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luahbtex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luatex.doc.r69182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/metafont.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mflogo.doc.r42428.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mfware.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/modes.doc.r69113.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pdftex.doc.r66243.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex-ini-files.doc.r68920.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-common.doc.r68510.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-en.doc.r67184.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tlshell.doc.r66771.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/unicode-data.doc.r68311.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/amsfonts.source.r61937.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyph-utf8.source.r61719.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyphenex.source.r57387.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ifplatform.source.r45533.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mflogo.source.r42428.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/amsfonts.source.r61937.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyph-utf8.source.r61719.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyphenex.source.r57387.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ifplatform.source.r45533.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mflogo.source.r42428.tar.xz )
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	texlive-common	8eb189ef6113c001970b6dfed9a50a42	texlive-module	fd353340bc217dc2e55a0a11d4a5e6f6
-_md5_=434aa084aa77b772567d7fa2d061750f
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2023_p59159-r4 b/metadata/md5-cache/dev-texlive/texlive-basic-2023_p59159-r4
new file mode 100644
index 000000000000..8cff16b11977
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2023_p59159-r4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/texlive-core-2023 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=app-text/texlive-core-2023[luajittex?]
+DESCRIPTION=TeXLive Essential programs and files
+EAPI=8
+HOMEPAGE=https://www.tug.org/texlive/
+INHERIT=texlive-module
+IUSE=doc source +luajittex
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-1+ GPL-2+ LGPL-2.1 LPPL-1.0 LPPL-1.3 LPPL-1.3c MIT OFL-1.1 TeX TeX-other-free public-domain
+RDEPEND=>=app-text/texlive-core-2023[luajittex?] >=app-text/dvipsk-2023.03.11_p66203 >=app-text/texlive-core-2023
+SLOT=0
+SRC_URI=https://mirrors.ctan.org/systems/texlive/tlnet/archive/collection-basic.r59159.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/amsfonts.r61937.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/bibtex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/cm.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/colorprofiles.r49086.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ec.r25033.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/enctex.r34957.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex.r66203.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex-pkg.r41784.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/graphics-def.r64487.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyph-utf8.r61719.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyphenex.r57387.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ifplatform.r45533.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/iftex.r61910.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/knuth-lib.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/knuth-local.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lua-alt-getopt.r56414.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luahbtex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luajittex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luatex.r69182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/metafont.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mflogo.r42428.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mfware.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/modes.r69113.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pdftex.r66243.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/plain.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex-ini-files.r68920.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-msg-translations.r69696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tlshell.r66771.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/unicode-data.r68311.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/collection-basic.r59159.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/amsfonts.r61937.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/bibtex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/cm.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/colorprofiles.r49086.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ec.r25033.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/enctex.r34957.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex.r66203.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex-pkg.r41784.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/graphics-def.r64487.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyph-utf8.r61719.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyphenex.r57387.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ifplatform.r45533.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/iftex.r61910.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/knuth-lib.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/knuth-local.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lua-alt-getopt.r56414.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luahbtex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luajittex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luatex.r69182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/metafont.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mflogo.r42428.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mfware.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/modes.r69113.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pdftex.r66243.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/plain.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex-ini-files.r68920.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-msg-translations.r69696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tlshell.r66771.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/unicode-data.r68311.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/amsfonts.doc.r61937.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/bibtex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/cm.doc.r57963.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/colorprofiles.doc.r49086.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ec.doc.r25033.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/enctex.doc.r34957.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex.doc.r66203.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/etex-pkg.doc.r41784.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/graphics-def.doc.r64487.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyph-utf8.doc.r61719.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ifplatform.doc.r45533.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/iftex.doc.r61910.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/lua-alt-getopt.doc.r56414.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luahbtex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luajittex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luatex.doc.r69182.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/metafont.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mflogo.doc.r42428.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mfware.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/modes.doc.r69113.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/pdftex.doc.r66243.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex.doc.r66186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tex-ini-files.doc.r68920.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-common.doc.r68510.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/texlive-en.doc.r67184.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/tlshell.doc.r66771.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/unicode-data.doc.r68311.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/amsfonts.doc.r61937.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/bibtex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/cm.doc.r57963.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/colorprofiles.doc.r49086.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ec.doc.r25033.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/enctex.doc.r34957.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex.doc.r66203.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/etex-pkg.doc.r41784.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/graphics-def.doc.r64487.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyph-utf8.doc.r61719.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ifplatform.doc.r45533.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/iftex.doc.r61910.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/lua-alt-getopt.doc.r56414.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luahbtex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luajittex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luatex.doc.r69182.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/metafont.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mflogo.doc.r42428.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mfware.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/modes.doc.r69113.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/pdftex.doc.r66243.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tex-ini-files.doc.r68920.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-common.doc.r68510.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/texlive-en.doc.r67184.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/tlshell.doc.r66771.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/unicode-data.doc.r68311.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/amsfonts.source.r61937.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyph-utf8.source.r61719.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/hyphenex.source.r57387.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/ifplatform.source.r45533.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/mflogo.source.r42428.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/amsfonts.source.r61937.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyph-utf8.source.r61719.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/hyphenex.source.r57387.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/ifplatform.source.r45533.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/mflogo.source.r42428.tar.xz )
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	texlive-common	8eb189ef6113c001970b6dfed9a50a42	texlive-module	fd353340bc217dc2e55a0a11d4a5e6f6
+_md5_=f1411a6b7fbba9ecd47617ba567356cf
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r2 b/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r2
deleted file mode 100644
index e71ebe712a86..000000000000
--- a/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-text/texlive-core-2023 app-arch/xz-utils
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-texlive/texlive-basic-2023 >=app-text/texlive-core-2023[xetex,luajittex?]
-DESCRIPTION=TeXLive ConTeXt and packages
-EAPI=8
-HOMEPAGE=https://www.tug.org/texlive/
-INHERIT=texlive-module
-IUSE=doc source +luajittex
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD BSD-2 GPL-1+ GPL-2 GPL-3 LGPL-2+ LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain
-RDEPEND=>=dev-texlive/texlive-basic-2023 dev-lang/ruby >=app-text/texlive-core-2023
-SLOT=0
-SRC_URI=https://mirrors.ctan.org/systems/texlive/tlnet/archive/collection-context.r69108.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context.r69665.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-calendar-examples.r66947.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-collating-marks.r68696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-cyrillicnumbers.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-filter.r62070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-gnuplot.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-handlecsv.r69186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-legacy.r69173.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-letter.r60787.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-mathsets.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-pocketdiary.r66953.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-simpleslides.r67070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-squares.r68545.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-sudoku.r67289.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-texlive.r66924.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-transliterator.r61127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-typescripts.r60422.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-vim.r62071.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/jmn.r45751.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luajittex.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/collection-context.r69108.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context.r69665.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-calendar-examples.r66947.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-collating-marks.r68696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-cyrillicnumbers.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-filter.r62070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-gnuplot.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-handlecsv.r69186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-legacy.r69173.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-letter.r60787.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-mathsets.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-pocketdiary.r66953.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-simpleslides.r67070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-squares.r68545.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-sudoku.r67289.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-texlive.r66924.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-transliterator.r61127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-typescripts.r60422.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-vim.r62071.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/jmn.r45751.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luajittex.r66186.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/context.doc.r69665.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-calendar-examples.doc.r66947.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-collating-marks.doc.r68696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-cyrillicnumbers.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-filter.doc.r62070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-gnuplot.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-handlecsv.doc.r69186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-legacy.doc.r69173.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-letter.doc.r60787.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-mathsets.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66725.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-pocketdiary.doc.r66953.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-simpleslides.doc.r67070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-squares.doc.r68545.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-sudoku.doc.r67289.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-transliterator.doc.r61127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-typescripts.doc.r60422.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-vim.doc.r62071.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/luajittex.doc.r66186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context.doc.r69665.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-calendar-examples.doc.r66947.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-collating-marks.doc.r68696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-cyrillicnumbers.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-filter.doc.r62070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-gnuplot.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-handlecsv.doc.r69186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-legacy.doc.r69173.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-letter.doc.r60787.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-mathsets.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-notes-zh-cn.doc.r66725.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-pocketdiary.doc.r66953.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-simpleslides.doc.r67070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-squares.doc.r68545.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-sudoku.doc.r67289.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-transliterator.doc.r61127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-typescripts.doc.r60422.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-vim.doc.r62071.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/luajittex.doc.r66186.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.source.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.source.r47085.tar.xz )
-_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	texlive-common	8eb189ef6113c001970b6dfed9a50a42	texlive-module	fd353340bc217dc2e55a0a11d4a5e6f6
-_md5_=67f4c853c41a6336b2a3ce6a72ec1598
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r3 b/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r3
new file mode 100644
index 000000000000..a54035feabbb
--- /dev/null
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2023_p69108-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/texlive-core-2023 app-arch/xz-utils
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=>=dev-texlive/texlive-basic-2023 >=app-text/texlive-core-2023[xetex]
+DESCRIPTION=TeXLive ConTeXt and packages
+EAPI=8
+HOMEPAGE=https://www.tug.org/texlive/
+INHERIT=texlive-module
+IUSE=doc source
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD BSD-2 GPL-1+ GPL-2 GPL-3 LGPL-2+ LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain
+RDEPEND=>=dev-texlive/texlive-basic-2023 dev-lang/ruby >=app-text/texlive-core-2023
+SLOT=0
+SRC_URI=https://mirrors.ctan.org/systems/texlive/tlnet/archive/collection-context.r69108.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context.r69665.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-calendar-examples.r66947.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-collating-marks.r68696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-cyrillicnumbers.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-filter.r62070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-gnuplot.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-handlecsv.r69186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-legacy.r69173.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-letter.r60787.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-mathsets.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-pocketdiary.r66953.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-simpleslides.r67070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-squares.r68545.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-sudoku.r67289.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-texlive.r66924.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-transliterator.r61127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-typescripts.r60422.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-vim.r62071.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/jmn.r45751.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/collection-context.r69108.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context.r69665.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-calendar-examples.r66947.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-collating-marks.r68696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-cyrillicnumbers.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-filter.r62070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-gnuplot.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-handlecsv.r69186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-legacy.r69173.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-letter.r60787.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-mathsets.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-pocketdiary.r66953.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-simpleslides.r67070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-squares.r68545.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-sudoku.r67289.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-texlive.r66924.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-transliterator.r61127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-typescripts.r60422.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-vim.r62071.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/jmn.r45751.tar.xz doc? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/context.doc.r69665.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-calendar-examples.doc.r66947.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-collating-marks.doc.r68696.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-cyrillicnumbers.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-filter.doc.r62070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-gnuplot.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-handlecsv.doc.r69186.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-legacy.doc.r69173.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-letter.doc.r60787.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-mathsets.doc.r47085.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66725.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-pocketdiary.doc.r66953.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-simpleslides.doc.r67070.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-squares.doc.r68545.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-sudoku.doc.r67289.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-transliterator.doc.r61127.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-typescripts.doc.r60422.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-vim.doc.r62071.tar.xz https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context.doc.r69665.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-calendar-examples.doc.r66947.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-collating-marks.doc.r68696.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-cyrillicnumbers.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-filter.doc.r62070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-gnuplot.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-handlecsv.doc.r69186.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-legacy.doc.r69173.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-letter.doc.r60787.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-mathsets.doc.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-notes-zh-cn.doc.r66725.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-pocketdiary.doc.r66953.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-simpleslides.doc.r67070.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-squares.doc.r68545.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-sudoku.doc.r67289.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-transliterator.doc.r61127.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-typescripts.doc.r60422.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-vim.doc.r62071.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.doc.r47085.tar.xz ) source? ( https://mirrors.ctan.org/systems/texlive/tlnet/archive/context-visualcounter.source.r47085.tar.xz https://dev.gentoo.org/~flow/distfiles/texlive/context-visualcounter.source.r47085.tar.xz )
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	texlive-common	8eb189ef6113c001970b6dfed9a50a42	texlive-module	fd353340bc217dc2e55a0a11d4a5e6f6
+_md5_=7873c647927fdf538dabe96d02e28ddb
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c1ab8fb612e0..c121e9368c8e 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/catalyst-4.0_rc1 b/metadata/md5-cache/dev-util/catalyst-4.0_rc1
index f55945d44e70..b9386e042f81 100644
--- a/metadata/md5-cache/dev-util/catalyst-4.0_rc1
+++ b/metadata/md5-cache/dev-util/catalyst-4.0_rc1
@@ -1,16 +1,16 @@
-BDEPEND=app-text/asciidoc 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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=app-text/asciidoc python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 INHERIT=distutils-r1 linux-info optfeature tmpfiles
-IUSE=doc +iso python_targets_python3_10 python_targets_python3_11
+IUSE=doc +iso python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydecomp-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools dev-libs/libisoburn amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] sys-fs/mtools ) arm64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ia64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydecomp-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools dev-libs/libisoburn amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] sys-fs/mtools ) arm64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ia64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) 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 ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-4.0-rc1.tar.bz2
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=634927374db809b8db0ac70fbcd80977
+_md5_=2648ebded6f2791cd392c9568cd661ed
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 243db110bb0a..8c57bb517cac 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -1,15 +1,15 @@
-BDEPEND=app-text/asciidoc 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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-text/asciidoc python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 INHERIT=distutils-r1 linux-info optfeature tmpfiles git-r3
-IUSE=doc +iso python_targets_python3_10 python_targets_python3_11
+IUSE=doc +iso python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydecomp-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools dev-libs/libisoburn amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] sys-fs/mtools ) arm64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ia64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=sys-apps/portage[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/util-linux[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydecomp-0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools dev-libs/libisoburn amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] sys-fs/mtools ) arm64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ia64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) 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 ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	linux-info	e967b81f54be6f49f4219a57ce7db437	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2a7bbb7caecde2c231f6cc8944898d4b
+_md5_=053f07a41b4f21c6754ebd07033d6250
diff --git a/metadata/md5-cache/dev-util/ccache-4.10-r1 b/metadata/md5-cache/dev-util/ccache-4.10-r1
index c1a8f2826eda..598742f17d96 100644
--- a/metadata/md5-cache/dev-util/ccache-4.10-r1
+++ b/metadata/md5-cache/dev-util/ccache-4.10-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://ccache.dev/
 IDEPEND=dev-util/shadowman
 INHERIT=cmake toolchain-funcs flag-o-matic prefix verify-sig
 IUSE=doc redis +static-c++ test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0 elibc_mingw? ( LGPL-3 ISC PSF-2 )
 RDEPEND=>=app-arch/zstd-1.3.4:= >=dev-cpp/cpp-httplib-0.10.6:= >=dev-libs/blake3-1.4.0:= >=dev-libs/libfmt-8.0.0:= >=dev-libs/xxhash-0.8.0 redis? ( >=dev-libs/hiredis-0.13.3:= ) dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.10/ccache-4.10.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.10/ccache-4.10.tar.xz.asc ) !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/ccache/ccache-4.10-docs.tar.xz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=755ad60e0844783f30c3442c4d940b90
+_md5_=e81e4fcf57ff9ad4b51c2fdb28446c40
diff --git a/metadata/md5-cache/dev-util/cookiecutter-2.5.0 b/metadata/md5-cache/dev-util/cookiecutter-2.5.0
index c3ee773dd4f7..a179946bd28d 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-2.5.0
+++ b/metadata/md5-cache/dev-util/cookiecutter-2.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cookiecutter/cookiecutter
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/arrow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/binaryornot-0.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/click-9.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-2.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jinja-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-slugify-4.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.23.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rich[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cookiecutter/cookiecutter/archive/2.5.0.tar.gz -> cookiecutter-2.5.0.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=ec516fd1245663cae64dfa4b6e4b7003
+_md5_=81f7e89abb71eca285d7d8bbeb14cdb8
diff --git a/metadata/md5-cache/dev-util/gitlab-cli-1.41.0 b/metadata/md5-cache/dev-util/gitlab-cli-1.41.0
new file mode 100644
index 000000000000..5646afe451c4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-cli-1.41.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=the official gitlab command line interface
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/cli
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/cli/-/archive/v1.41.0/gitlab-cli-v1.41.0.tar.bz2 -> gitlab-cli-1.41.0.tar.bz2 https://dev.gentoo.org/~williamh/dist/gitlab-cli-1.41.0-deps.tar.xz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=a27d8960a19678cd81fe2af73d068eba
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2024.6.5 b/metadata/md5-cache/dev-util/gprof2dot-2024.6.5
new file mode 100644
index 000000000000..9354c56c765c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gprof2dot-2024.6.5
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts profiling output to dot graphs
+EAPI=8
+HOMEPAGE=https://github.com/jrfonseca/gprof2dot/ https://pypi.org/project/gprof2dot/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[xml(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/g/gprof2dot/gprof2dot-2024.6.5.tar.gz
+_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c93cab2c71b042b85599071cca9ad4fc
diff --git a/metadata/md5-cache/dev-util/intel_clc-24.1.1 b/metadata/md5-cache/dev-util/intel_clc-24.1.1
new file mode 100644
index 000000000000..f5c349eb5697
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel_clc-24.1.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-libs/libclc dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm llvm_slot_16? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17 sys-devel/llvm:17 ) llvm_slot_18? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18 sys-devel/llvm:18 ) dev-libs/expat
+DESCRIPTION=intel_clc tool used for building OpenCL C to SPIR-V
+EAPI=8
+HOMEPAGE=https://mesa3d.org/
+INHERIT=llvm-r1 meson python-any-r1
+IUSE=debug +llvm_slot_17 llvm_slot_16 llvm_slot_18
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT SGI-B-2.0
+RDEPEND=dev-libs/libclc dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm llvm_slot_16? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16 sys-devel/llvm:16 ) llvm_slot_17? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17 sys-devel/llvm:17 ) llvm_slot_18? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18 sys-devel/llvm:18 )
+REQUIRED_USE=^^ ( llvm_slot_16 llvm_slot_17 llvm_slot_18 )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-24.1.1.tar.xz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=4935c70e65214aaa3e5acc186b1d53d9
diff --git a/metadata/md5-cache/dev-util/pahole-1.26-r1 b/metadata/md5-cache/dev-util/pahole-1.26-r1
new file mode 100644
index 000000000000..5ab562e16273
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pahole-1.26-r1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-arnaldocarvalhodemelo ) app-alternatives/ninja >=dev-build/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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/elfutils-0.178 sys-libs/zlib
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=8
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+INHERIT=cmake python-single-r1 verify-sig
+IUSE=debug python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+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/elfutils-0.178 sys-libs/zlib
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+SLOT=0
+SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.26.tar.xz verify-sig? ( http://fedorapeople.org/~acme/dwarves/dwarves-1.26.tar.sign )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9a7ae5e2d3479289418494942d7dd074
diff --git a/metadata/md5-cache/dev-util/pahole-9999 b/metadata/md5-cache/dev-util/pahole-9999
index 4206fb946934..a28174dfc05a 100644
--- a/metadata/md5-cache/dev-util/pahole-9999
+++ b/metadata/md5-cache/dev-util/pahole-9999
@@ -12,4 +12,4 @@ RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3cd67313377bc09b9411c42cf541feea
+_md5_=9a7ae5e2d3479289418494942d7dd074
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index f28d49cee925..94f483ac0dda 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/wmenu-0.1.8 b/metadata/md5-cache/gui-apps/wmenu-0.1.8
index 46cffccafe74..a951b5a6162a 100644
--- a/metadata/md5-cache/gui-apps/wmenu-0.1.8
+++ b/metadata/md5-cache/gui-apps/wmenu-0.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=dynamic menu for wlroots compositors, maintains the look and feel of
 EAPI=8
 HOMEPAGE=https://sr.ht/~adnano/wmenu/
 INHERIT=meson
-KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/cairo x11-libs/pango dev-libs/wayland x11-libs/libxkbcommon
 SLOT=0
 SRC_URI=https://git.sr.ht/~adnano/wmenu/archive/0.1.8.tar.gz -> wmenu-0.1.8.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a4f7313b94a391d5cd307e049f1bc1c5
+_md5_=08bbaa9fd02db604d42674cc708746c9
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 8e88e0469a53..f8fb3f63934f 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.8.1-r2 b/metadata/md5-cache/gui-wm/wayfire-0.8.1-r2
index 65b2ba5fc449..509d0bc78d0a 100644
--- a/metadata/md5-cache/gui-wm/wayfire-0.8.1-r2
+++ b/metadata/md5-cache/gui-wm/wayfire-0.8.1-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/WayfireWM/wayfire
 INHERIT=meson
 IUSE=+dbus +gles3 test X
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=amd64 ~arm64 ~riscv
 LICENSE=MIT
 RDEPEND=dev-cpp/nlohmann_json dev-libs/glib:2 dev-libs/libevdev >=dev-libs/libinput-1.7.0:= dev-libs/wayland >=dev-libs/wayland-protocols-1.12 gui-libs/wf-config:0/0.8 gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?] media-libs/glm media-libs/libglvnd media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman dbus? ( sys-apps/dbus ) X? ( x11-libs/libxcb:= ) x11-misc/xkeyboard-config
 RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/v0.8.1/wayfire-0.8.1.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d855c74b13d3f0f09e7812484b5e7316
+_md5_=2cdb0465c0c3ab0869227faf0fce138b
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 599b038dc73f..7c0a04150459 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-23.08.5-r1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-23.08.5-r1
index a86a40954ce5..164a97d4179c 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-23.08.5-r1
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-23.08.5-r1
@@ -3,8 +3,8 @@ DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
 EAPI=8
 HOMEPAGE=https://apps.kde.org/
 IUSE=+bittorrent dropbox samba +screencast +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kget-23.08.5:5 >=kde-apps/krdc-23.08.5:5 >=kde-misc/kdeconnect-23.08.5:5 >=net-im/neochat-23.08.5 >=net-im/tokodon-23.08.5 >=net-irc/konversation-23.08.5:5 >=net-misc/kio-zeroconf-23.08.5:5 >=net-news/alligator-23.08.5 bittorrent? ( >=net-libs/libktorrent-23.08.5:5 >=net-p2p/ktorrent-23.08.5:5 ) dropbox? ( >=kde-apps/dolphin-plugins-dropbox-23.08.5:5 ) samba? ( >=kde-apps/kdenetwork-filesharing-23.08.5:5 ) screencast? ( >=kde-apps/krfb-23.08.5:5 ) webengine? ( >=kde-apps/kaccounts-integration-23.08.5:5 >=kde-apps/kaccounts-providers-23.08.5:5 >=kde-apps/signon-kwallet-extension-23.08.5:5 >=kde-misc/kio-gdrive-23.08.5:5 )
 SLOT=0
-_md5_=8c1b1a53a093b01e96ea41d6a5ed97c4
+_md5_=4e8d57bb8fea3a526e0ddca24e9a09e7
diff --git a/metadata/md5-cache/kde-apps/konqueror-23.08.5-r1 b/metadata/md5-cache/kde-apps/konqueror-23.08.5-r1
index c0c25c320b46..a52738cdfc57 100644
--- a/metadata/md5-cache/kde-apps/konqueror-23.08.5-r1
+++ b/metadata/md5-cache/kde-apps/konqueror-23.08.5-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://apps.kde.org/konqueror/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=flag-o-matic ecm gear.kde.org optfeature
 IUSE=activities speech debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtwebengine-5.15.9:5[widgets] >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtx11extras-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 >=kde-frameworks/karchive-5.106.0:5 >=kde-frameworks/kbookmarks-5.106.0:5 >=kde-frameworks/kcmutils-5.106.0:5 >=kde-frameworks/kcodecs-5.106.0:5 >=kde-frameworks/kcompletion-5.106.0:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/kdbusaddons-5.106.0:5 >=kde-frameworks/kdesu-5.106.0:5 >=kde-frameworks/kguiaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kiconthemes-5.106.0:5 >=kde-frameworks/kinit-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kitemviews-5.106.0:5 >=kde-frameworks/kjobwidgets-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/kservice-5.106.0:5 >=kde-frameworks/kwallet-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kwindowsystem-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.15.9:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:* || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/23.08.5/src/konqueror-23.08.5.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	322462a1b61f437f69f66ac730eb98c5	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gear.kde.org	030f79862cf2c98a486998abfeb14163	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c40710839eee0397af1c5ad2e5423b4b
+_md5_=82a71d0f0e9c32b0c5afb2870f30eedf
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 640056585c3d..d943039ee63f 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1
index dcbe070587b5..62a21db38ff2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm plasma.kde.org
 IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry +wallpaper-metadata debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.27.11:*
 RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtdeclarative-5.15.9:5[widgets] >=dev-qt/qtgui-5.15.9:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.9:5 >=dev-qt/qtsql-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwayland-5.15.9:5= >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtx11extras-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 >=kde-frameworks/karchive-5.106.0:5 >=kde-frameworks/kauth-5.106.0:5 >=kde-frameworks/kbookmarks-5.106.0:5 >=kde-frameworks/kcmutils-5.106.0:5 >=kde-frameworks/kcompletion-5.106.0:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/kdbusaddons-5.106.0:5 >=kde-frameworks/kdeclarative-5.106.0:5 >=kde-frameworks/kded-5.106.0:5 >=kde-frameworks/kglobalaccel-5.106.0:5 >=kde-frameworks/kguiaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kiconthemes-5.106.0:5 >=kde-frameworks/kidletime-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kitemmodels-5.106.0:5 >=kde-frameworks/kitemviews-5.106.0:5 >=kde-frameworks/kjobwidgets-5.106.0:5 >=kde-frameworks/knewstuff-5.106.0:5 >=kde-frameworks/knotifications-5.106.0:5 >=kde-frameworks/knotifyconfig-5.106.0:5 >=kde-frameworks/kpackage-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/kpeople-5.106.0:5 >=kde-frameworks/krunner-5.106.0:5 >=kde-frameworks/kservice-5.106.0:5 >=kde-frameworks/ktexteditor-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kunitconversion-5.106.0:5 >=kde-frameworks/kwallet-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kwindowsystem-5.106.0:5[X] >=kde-frameworks/kxmlgui-5.106.0:5 >=kde-frameworks/prison-5.106.0:5[qml] >=kde-frameworks/solid-5.106.0:5 >=kde-plasma/breeze-5.27.11:5 >=kde-plasma/kscreenlocker-5.27.11:5 >=kde-plasma/kwayland-5.106.0:5 >=kde-plasma/kwin-5.27.11:5 >=kde-plasma/layer-shell-qt-5.27.11:5 >=kde-plasma/libkscreen-5.27.11:5 >=kde-plasma/libksysguard-5.27.11:5 >=kde-plasma/libkworkspace-5.27.11:5 >=kde-plasma/libplasma-5.106.0:5 >=kde-plasma/plasma-activities-5.106.0:5 >=kde-plasma/plasma-activities-stats-5.106.0:5 >=media-libs/phonon-4.11.0[qt5(+)] sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util appstream? ( <dev-libs/appstream-1[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.106.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.9:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.106.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt[qt5(+)] virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.9:5=[egl] >=kde-plasma/kpipewire-5.27.11:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.106.0:5 ) telemetry? ( kde-frameworks/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.27.0:5 app-text/iso-codes >=dev-qt/qdbus-5.15.9:* >=dev-qt/qtgraphicaleffects-5.15.9:5 >=dev-qt/qtquickcontrols-5.15.9:5[widgets] >=dev-qt/qtquickcontrols2-5.15.9:5 || ( kde-apps/kio-extras-kf5:5 kde-apps/kio-extras:5 ) >=kde-frameworks/kirigami-5.106.0:5 >=kde-frameworks/kquickcharts-5.106.0:5 >=kde-plasma/kactivitymanagerd-5.27.11:5 >=kde-plasma/milou-5.27.11:5 >=kde-plasma/plasma-integration-5.27.11:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -16,4 +16,4 @@ RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	322462a1b61f437f69f66ac730eb98c5	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plasma.kde.org	04eb5849283348eac80db74a8749b14a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aca5578a89561759a9611156451d4ee9
+_md5_=7da4b7e65527c8216b762694531b0a84
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1-r1
new file mode 100644
index 000000000000..a8d609cfc21d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.27.11.1-r1
@@ -0,0 +1,19 @@
+BDEPEND=>=dev-qt/qtwaylandscanner-5.15.9:5 >=dev-util/wayland-scanner-1.19.0 >=kde-frameworks/kcmutils-5.106.0:5 virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.106.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:*
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtdeclarative-5.15.9:5[widgets] >=dev-qt/qtgui-5.15.9:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.9:5 >=dev-qt/qtsql-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwayland-5.15.9:5= >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtx11extras-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 >=kde-frameworks/karchive-5.106.0:5 >=kde-frameworks/kauth-5.106.0:5 >=kde-frameworks/kbookmarks-5.106.0:5 >=kde-frameworks/kcmutils-5.106.0:5 >=kde-frameworks/kcompletion-5.106.0:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/kdbusaddons-5.106.0:5 >=kde-frameworks/kdeclarative-5.106.0:5 >=kde-frameworks/kded-5.106.0:5 >=kde-frameworks/kglobalaccel-5.106.0:5 >=kde-frameworks/kguiaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kiconthemes-5.106.0:5 >=kde-frameworks/kidletime-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kitemmodels-5.106.0:5 >=kde-frameworks/kitemviews-5.106.0:5 >=kde-frameworks/kjobwidgets-5.106.0:5 >=kde-frameworks/knewstuff-5.106.0:5 >=kde-frameworks/knotifications-5.106.0:5 >=kde-frameworks/knotifyconfig-5.106.0:5 >=kde-frameworks/kpackage-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/kpeople-5.106.0:5 >=kde-frameworks/krunner-5.106.0:5 >=kde-frameworks/kservice-5.106.0:5 >=kde-frameworks/ktexteditor-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kunitconversion-5.106.0:5 >=kde-frameworks/kwallet-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kwindowsystem-5.106.0:5[X] >=kde-frameworks/kxmlgui-5.106.0:5 >=kde-frameworks/prison-5.106.0:5[qml] >=kde-frameworks/solid-5.106.0:5 >=kde-plasma/breeze-5.27.11:5 >=kde-plasma/kscreenlocker-5.27.11:5 >=kde-plasma/kwayland-5.106.0:5 >=kde-plasma/kwin-5.27.11:5 >=kde-plasma/layer-shell-qt-5.27.11:5 >=kde-plasma/libkscreen-5.27.11:5 >=kde-plasma/libksysguard-5.27.11:5 >=kde-plasma/libkworkspace-5.27.11:5 >=kde-plasma/libplasma-5.106.0:5 >=kde-plasma/plasma-activities-5.106.0:5 >=kde-plasma/plasma-activities-stats-5.106.0:5 >=media-libs/phonon-4.11.0[qt5(+)] sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util appstream? ( <dev-libs/appstream-1[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.106.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.9:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.106.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt[qt5(+)] virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.9:5=[egl] >=kde-plasma/kpipewire-5.27.11:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.106.0:5 ) telemetry? ( kde-frameworks/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) >=dev-libs/plasma-wayland-protocols-1.6.0 >=dev-libs/wayland-protocols-1.31 >=dev-qt/qtconcurrent-5.15.9:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry +wallpaper-metadata debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.27.11:*
+RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtdeclarative-5.15.9:5[widgets] >=dev-qt/qtgui-5.15.9:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.9:5 >=dev-qt/qtsql-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwayland-5.15.9:5= >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtx11extras-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 >=kde-frameworks/karchive-5.106.0:5 >=kde-frameworks/kauth-5.106.0:5 >=kde-frameworks/kbookmarks-5.106.0:5 >=kde-frameworks/kcmutils-5.106.0:5 >=kde-frameworks/kcompletion-5.106.0:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/kdbusaddons-5.106.0:5 >=kde-frameworks/kdeclarative-5.106.0:5 >=kde-frameworks/kded-5.106.0:5 >=kde-frameworks/kglobalaccel-5.106.0:5 >=kde-frameworks/kguiaddons-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kiconthemes-5.106.0:5 >=kde-frameworks/kidletime-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kitemmodels-5.106.0:5 >=kde-frameworks/kitemviews-5.106.0:5 >=kde-frameworks/kjobwidgets-5.106.0:5 >=kde-frameworks/knewstuff-5.106.0:5 >=kde-frameworks/knotifications-5.106.0:5 >=kde-frameworks/knotifyconfig-5.106.0:5 >=kde-frameworks/kpackage-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/kpeople-5.106.0:5 >=kde-frameworks/krunner-5.106.0:5 >=kde-frameworks/kservice-5.106.0:5 >=kde-frameworks/ktexteditor-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kunitconversion-5.106.0:5 >=kde-frameworks/kwallet-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kwindowsystem-5.106.0:5[X] >=kde-frameworks/kxmlgui-5.106.0:5 >=kde-frameworks/prison-5.106.0:5[qml] >=kde-frameworks/solid-5.106.0:5 >=kde-plasma/breeze-5.27.11:5 >=kde-plasma/kscreenlocker-5.27.11:5 >=kde-plasma/kwayland-5.106.0:5 >=kde-plasma/kwin-5.27.11:5 >=kde-plasma/layer-shell-qt-5.27.11:5 >=kde-plasma/libkscreen-5.27.11:5 >=kde-plasma/libksysguard-5.27.11:5 >=kde-plasma/libkworkspace-5.27.11:5 >=kde-plasma/libplasma-5.106.0:5 >=kde-plasma/plasma-activities-5.106.0:5 >=kde-plasma/plasma-activities-stats-5.106.0:5 >=media-libs/phonon-4.11.0[qt5(+)] sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util appstream? ( <dev-libs/appstream-1[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.106.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.9:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.106.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( sys-auth/polkit-qt[qt5(+)] virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.9:5=[egl] >=kde-plasma/kpipewire-5.27.11:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.106.0:5 ) telemetry? ( kde-frameworks/kuserfeedback:5 ) wallpaper-metadata? ( kde-apps/libkexiv2:5 ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.27.0:5 app-text/iso-codes >=dev-qt/qdbus-5.15.9:* >=dev-qt/qtgraphicaleffects-5.15.9:5 >=dev-qt/qtquickcontrols-5.15.9:5[widgets] >=dev-qt/qtquickcontrols2-5.15.9:5 || ( kde-apps/kio-extras-kf5:5 kde-apps/kio-extras:5 ) >=kde-frameworks/kirigami-5.106.0:5 >=kde-frameworks/kquickcharts-5.106.0:5 >=kde-plasma/kactivitymanagerd-5.27.11:5 >=kde-plasma/milou-5.27.11:5 >=kde-plasma/plasma-integration-5.27.11:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	322462a1b61f437f69f66ac730eb98c5	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plasma.kde.org	04eb5849283348eac80db74a8749b14a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=062253573406b1c653f9aa2f73c8c221
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-6.0.90-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-6.0.90-r2
index 3c692d08303c..7881b4b38e4d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-6.0.90-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-6.0.90-r2
@@ -14,6 +14,6 @@ RDEPEND=dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qt5compat-6.7.1:6[qml] >
 REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test !test? ( test ) mirror
 SLOT=6
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/plasma-workspace-6.0.90_p20240601-58ced80a.tar.gz
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/plasma-workspace-6.0.90-7a700862.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	322462a1b61f437f69f66ac730eb98c5	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plasma.kde.org	04eb5849283348eac80db74a8749b14a	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=acbf129a0c5adc492820fc38ee6a41d2
+_md5_=84660a526d6f9e53ce29397906ec219a
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 29a817880cef..9c47eecaeea5 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/exempi-2.6.2 b/metadata/md5-cache/media-libs/exempi-2.6.2
deleted file mode 100644
index e3b71ec58978..000000000000
--- a/metadata/md5-cache/media-libs/exempi-2.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/autoconf-archive sys-devel/gettext >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv test? ( dev-libs/boost )
-DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
-EAPI=8
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
-INHERIT=autotools
-IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
-RESTRICT=!test? ( test )
-SLOT=2/8
-SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.2.tar.bz2
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5dfd278ff62efefe945b562aa7ac1d5f
diff --git a/metadata/md5-cache/media-libs/exempi-2.6.3 b/metadata/md5-cache/media-libs/exempi-2.6.3
index 521aed93bf08..b0d65aa2d352 100644
--- a/metadata/md5-cache/media-libs/exempi-2.6.3
+++ b/metadata/md5-cache/media-libs/exempi-2.6.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
 INHERIT=autotools
 IUSE=examples test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=2/8
 SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.3.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0744588b2f5f7770abcf3c9f81c707e8
+_md5_=bdf55f50734434d3e33f4bb875a0dd64
diff --git a/metadata/md5-cache/media-libs/exempi-2.6.3-r1 b/metadata/md5-cache/media-libs/exempi-2.6.3-r1
deleted file mode 100644
index b89b8e4ea2db..000000000000
--- a/metadata/md5-cache/media-libs/exempi-2.6.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/autoconf-archive sys-devel/gettext >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv test? ( dev-libs/boost )
-DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
-EAPI=8
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
-INHERIT=autotools
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
-RESTRICT=!test? ( test )
-SLOT=2/8
-SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.3.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0057aa072bef0a6eab24967b472dd725
diff --git a/metadata/md5-cache/media-libs/exempi-2.6.4 b/metadata/md5-cache/media-libs/exempi-2.6.4
deleted file mode 100644
index b331f0d61a0b..000000000000
--- a/metadata/md5-cache/media-libs/exempi-2.6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-build/autoconf-archive sys-devel/gettext >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv test? ( dev-libs/boost )
-DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
-EAPI=8
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
-INHERIT=autotools
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
-RESTRICT=!test? ( test )
-SLOT=2/8
-SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.4.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0057aa072bef0a6eab24967b472dd725
diff --git a/metadata/md5-cache/media-libs/exempi-2.6.5 b/metadata/md5-cache/media-libs/exempi-2.6.5
index 17c9a49058bc..b44d322e8c08 100644
--- a/metadata/md5-cache/media-libs/exempi-2.6.5
+++ b/metadata/md5-cache/media-libs/exempi-2.6.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
 INHERIT=autotools flag-o-matic
 IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=2/8
 SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.5.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=2a105b5914e52848760ab60eb892a62c
+_md5_=dfae12f4fb15ffcf926f8fcf485c3e12
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.3.20 b/metadata/md5-cache/media-libs/gmmlib-22.3.20
new file mode 100644
index 000000000000..effa0d9bb5b1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gmmlib-22.3.20
@@ -0,0 +1,14 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Intel Graphics Memory Management Library
+EAPI=8
+HOMEPAGE=https://github.com/intel/gmmlib
+INHERIT=cmake-multilib
+IUSE=+custom-cflags test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/12.3
+SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.3.20.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0b7e7df0ff5d9e72b113f5043d9aef3e
diff --git a/metadata/md5-cache/media-libs/libjxl-0.10.2-r1 b/metadata/md5-cache/media-libs/libjxl-0.10.2-r1
new file mode 100644
index 000000000000..75ae793ca2e9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjxl-0.10.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=JPEG XL image format reference implementation
+EAPI=8
+HOMEPAGE=https://github.com/libjxl/libjxl/
+INHERIT=cmake-multilib gnome2-utils
+IUSE=+gdk-pixbuf gif jpeg openexr +png test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-misc/shared-mime-info-2.2
+REQUIRED_USE=test? ( png )
+RESTRICT=!test? ( test )
+SLOT=0/0.10
+SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.10.2.tar.gz -> libjxl-0.10.2.tar.gz test? ( https://github.com/libjxl/testdata/archive/ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz -> libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome2-utils	30dbce54b89e77b86f366548f94419ad	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fdab6ea0470bb72e434d93345fee7bc9
diff --git a/metadata/md5-cache/media-libs/libjxl-0.8.2-r2 b/metadata/md5-cache/media-libs/libjxl-0.8.2-r2
new file mode 100644
index 000000000000..86f154f265eb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjxl-0.8.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=JPEG XL image format reference implementation
+EAPI=8
+HOMEPAGE=https://github.com/libjxl/libjxl
+INHERIT=cmake-multilib
+IUSE=gif jpeg openexr +png test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-misc/shared-mime-info-2.2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.8.2.tar.gz -> libjxl-0.8.2.tar.gz test? ( https://github.com/libjxl/testdata/archive/d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz -> libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cfee14f6d7412221fabda0d86151c3f8
diff --git a/metadata/md5-cache/media-libs/libjxl-0.9.2-r1 b/metadata/md5-cache/media-libs/libjxl-0.9.2-r1
new file mode 100644
index 000000000000..4bf69ba03bb9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjxl-0.9.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=JPEG XL image format reference implementation
+EAPI=8
+HOMEPAGE=https://github.com/libjxl/libjxl/
+INHERIT=cmake-multilib gnome2-utils
+IUSE=+gdk-pixbuf gif jpeg openexr +png test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-misc/shared-mime-info-2.2
+REQUIRED_USE=test? ( png )
+RESTRICT=!test? ( test )
+SLOT=0/0.9
+SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.9.2.tar.gz -> libjxl-0.9.2.tar.gz test? ( https://github.com/libjxl/testdata/archive/ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz -> libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnome2-utils	30dbce54b89e77b86f366548f94419ad	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f27911ae09d05ecd81e085c246ec27cb
diff --git a/metadata/md5-cache/media-libs/libjxl-9999 b/metadata/md5-cache/media-libs/libjxl-9999
index 6ec5ed34035e..7e8754bb976b 100644
--- a/metadata/md5-cache/media-libs/libjxl-9999
+++ b/metadata/md5-cache/media-libs/libjxl-9999
@@ -1,15 +1,16 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=JPEG XL image format reference implementation
 EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl/
 INHERIT=cmake-multilib git-r3 gnome2-utils
-IUSE=+gdk-pixbuf openexr test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+gdk-pixbuf gif jpeg openexr +png test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) openexr? ( media-libs/openexr:= ) >=x11-misc/shared-mime-info-2.2
+RDEPEND=app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/highway-1.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-misc/shared-mime-info-2.2
+REQUIRED_USE=test? ( png )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnome2-utils	30dbce54b89e77b86f366548f94419ad	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3e3f01b78e77744dafc2953b41a8da1d
+_md5_=94301ab88260ebf5ec3f5b4c0841c7eb
diff --git a/metadata/md5-cache/media-libs/mesa-24.0.7 b/metadata/md5-cache/media-libs/mesa-24.0.7
index 5008d39b998b..b38b64ccb636 100644
--- a/metadata/md5-cache/media-libs/mesa-24.0.7
+++ b/metadata/md5-cache/media-libs/mesa-24.0.7
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-24.0.7 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-24.0.7 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.611.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.30 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.0.7.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3c162483394ef59da66098b586f92126
+_md5_=7a0587c1428fda6dca98a8aa91a98299
diff --git a/metadata/md5-cache/media-libs/mesa-24.0.8 b/metadata/md5-cache/media-libs/mesa-24.0.8
index 0bb66f829531..705b9bba1d79 100644
--- a/metadata/md5-cache/media-libs/mesa-24.0.8
+++ b/metadata/md5-cache/media-libs/mesa-24.0.8
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-24.0.8 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-24.0.8 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.611.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.30 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.0.8.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6757d6911ec95a55288ee5f0d0c4730b
+_md5_=abf9baceab4afbe38d4ffae1ed833923
diff --git a/metadata/md5-cache/media-libs/mesa-24.0.8-r1 b/metadata/md5-cache/media-libs/mesa-24.0.8-r1
index 290ecbc2a3df..0c88c31a978d 100644
--- a/metadata/md5-cache/media-libs/mesa-24.0.8-r1
+++ b/metadata/md5-cache/media-libs/mesa-24.0.8-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-24.0.8 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang llvm? ( video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ~dev-util/intel_clc-24.0.8 dev-libs/libclc[spirv(-)] ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.611.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.30 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.0.8.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=592e0f7a5d278c19cd23e5e6aa263752
+_md5_=d7a6299eb05652ca61d925f9a6bc010c
diff --git a/metadata/md5-cache/media-libs/mesa-24.1.0 b/metadata/md5-cache/media-libs/mesa-24.1.0
index f999564306e7..9ef0e7584f4c 100644
--- a/metadata/md5-cache/media-libs/mesa-24.1.0
+++ b/metadata/md5-cache/media-libs/mesa-24.1.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-24.1.0 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 <dev-build/meson-1.4.0 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-24.1.0 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 <dev-build/meson-1.4.0 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.613.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.1.0.tar.xz https://github.com/dtolnay/syn/archive/refs/tags/2.0.39.tar.gz -> syn-2.0.39.tar.gz https://github.com/dtolnay/proc-macro2/archive/refs/tags/1.0.70.tar.gz -> proc-macro2-1.0.70.tar.gz https://github.com/dtolnay/quote/archive/refs/tags/1.0.33.tar.gz -> quote-1.0.33.tar.gz https://github.com/dtolnay/unicode-ident/archive/refs/tags/1.0.12.tar.gz -> unicode-ident-1.0.12.tar.gz https://github.com/dtolnay/paste/archive/refs/tags/1.0.14.tar.gz -> paste-1.0.14.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=5cf851333ef33f556d5de177e7e14b8a
+_md5_=8ce34a9ca80ae8e950c8228e90b1b0bc
diff --git a/metadata/md5-cache/media-libs/mesa-24.1.0-r1 b/metadata/md5-cache/media-libs/mesa-24.1.0-r1
index ca52b47393eb..b11d6ae73eeb 100644
--- a/metadata/md5-cache/media-libs/mesa-24.1.0-r1
+++ b/metadata/md5-cache/media-libs/mesa-24.1.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-24.1.0 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 <dev-build/meson-1.4.0 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-24.1.0 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 <dev-build/meson-1.4.0 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.613.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.613.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_nvk video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_nvk video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware video_cards_zink cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=MIT SGI-B-2.0
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
-REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X ) zink? ( opengl vulkan )
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
+REQUIRED_USE=d3d9? ( || ( video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_panfrost video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_vmware video_cards_zink ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_zink? ( vulkan opengl ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-24.1.0.tar.xz https://github.com/dtolnay/syn/archive/refs/tags/2.0.39.tar.gz -> syn-2.0.39.tar.gz https://github.com/dtolnay/proc-macro2/archive/refs/tags/1.0.70.tar.gz -> proc-macro2-1.0.70.tar.gz https://github.com/dtolnay/quote/archive/refs/tags/1.0.33.tar.gz -> quote-1.0.33.tar.gz https://github.com/dtolnay/unicode-ident/archive/refs/tags/1.0.12.tar.gz -> unicode-ident-1.0.12.tar.gz https://github.com/dtolnay/paste/archive/refs/tags/1.0.14.tar.gz -> paste-1.0.14.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1c69a2a76fc38a991c89169c47450b4e
+_md5_=87b68dfba157488dc92eb442af4c52e5
diff --git a/metadata/md5-cache/media-libs/mesa-24.1.1 b/metadata/md5-cache/media-libs/mesa-24.1.1
new file mode 100644
index 000000000000..ff3fddecd031
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-24.1.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) >=dev-build/meson-1.4.1 app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-24.1.1 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.613.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_nvk video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware video_cards_zink cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=MIT SGI-B-2.0
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
+REQUIRED_USE=d3d9? ( || ( video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_panfrost video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_vmware video_cards_zink ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_zink? ( vulkan opengl ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-24.1.1.tar.xz https://github.com/dtolnay/syn/archive/refs/tags/2.0.39.tar.gz -> syn-2.0.39.tar.gz https://github.com/dtolnay/proc-macro2/archive/refs/tags/1.0.70.tar.gz -> proc-macro2-1.0.70.tar.gz https://github.com/dtolnay/quote/archive/refs/tags/1.0.33.tar.gz -> quote-1.0.33.tar.gz https://github.com/dtolnay/unicode-ident/archive/refs/tags/1.0.12.tar.gz -> unicode-ident-1.0.12.tar.gz https://github.com/dtolnay/paste/archive/refs/tags/1.0.14.tar.gz -> paste-1.0.14.tar.gz
+_eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f2200d16bbccda0fdf90d81a4031d355
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index ba0c707ff75f..381a118b57c5 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,17 +1,17 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 >=dev-build/meson-1.3.1 ) app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-9999 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 <dev-build/meson-1.4.0 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) >=dev-build/meson-1.4.1 app-alternatives/yacc app-alternatives/lex virtual/pkgconfig || ( ( dev-lang/python:3.12 >=dev-python/mako-0.8.0[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] ) ) video_cards_intel? ( ~dev-util/intel_clc-9999 dev-libs/libclc[spirv(-)] || ( ( dev-lang/python:3.12 dev-python/ply[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) vulkan? ( dev-util/glslang video_cards_nvk? ( >=dev-util/bindgen-0.68.1 >=dev-util/cbindgen-0.26.0 >=virtual/rust-1.74.1 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.613.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] ) video_cards_d3d12? ( >=dev-util/directx-headers-1.613.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(-)?] ) valgrind? ( dev-debug/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.34 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain toolchain-funcs git-r3
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_nvk video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_nvk video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware video_cards_zink cpu_flags_x86_sse2 d3d9 debug +llvm lm-sensors opencl +opengl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa +zstd +llvm_slot_17 llvm_slot_15 llvm_slot_16 llvm_slot_18 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT SGI-B-2.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
-REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X ) zink? ( opengl vulkan )
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( llvm_slot_15? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:15 sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_16? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:16 sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_17? ( sys-devel/llvm:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:17 sys-devel/clang:17[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) llvm_slot_18? ( sys-devel/llvm:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opencl? ( dev-util/spirv-llvm-translator:18 sys-devel/clang:18[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.119[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.119[video_cards_amdgpu] )
+REQUIRED_USE=d3d9? ( || ( video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_panfrost video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_vmware video_cards_zink ) ) llvm? ( ^^ ( llvm_slot_15 llvm_slot_16 llvm_slot_17 llvm_slot_18 ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_zink? ( vulkan opengl ) video_cards_nvk? ( vulkan video_cards_nouveau ) vdpau? ( X ) xa? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dtolnay/syn/archive/refs/tags/2.0.39.tar.gz -> syn-2.0.39.tar.gz https://github.com/dtolnay/proc-macro2/archive/refs/tags/1.0.70.tar.gz -> proc-macro2-1.0.70.tar.gz https://github.com/dtolnay/quote/archive/refs/tags/1.0.33.tar.gz -> quote-1.0.33.tar.gz https://github.com/dtolnay/unicode-ident/archive/refs/tags/1.0.12.tar.gz -> unicode-ident-1.0.12.tar.gz https://github.com/dtolnay/paste/archive/refs/tags/1.0.14.tar.gz -> paste-1.0.14.tar.gz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	linux-info	e967b81f54be6f49f4219a57ce7db437	llvm-r1	b0b1f2b1f205cf6142716789254aea99	llvm-utils	e59dc622da7e7e7f16879105bed34858	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1c69a2a76fc38a991c89169c47450b4e
+_md5_=f2200d16bbccda0fdf90d81a4031d355
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.12.0 b/metadata/md5-cache/media-libs/openimageio-2.4.12.0
deleted file mode 100644
index a42e8f5e38e9..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.4.12.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( media-libs/libglvnd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( media-libs/libglvnd dev-qt/qtbase:6[gui,widgets,opengl] ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( media-libs/libglvnd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( media-libs/libglvnd dev-qt/qtbase:6[gui,widgets,opengl] ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) qt5? ( tools ) qt6? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.4
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.4.12.0.tar.gz -> openimageio-2.4.12.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0e10da4bec9efcd4dffbe35c793288b4
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.13.0 b/metadata/md5-cache/media-libs/openimageio-2.4.13.0
deleted file mode 100644
index a8127ee2b659..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.4.13.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( media-libs/libglvnd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( media-libs/libglvnd dev-qt/qtbase:6[gui,widgets,opengl] ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake flag-o-matic font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( media-libs/libglvnd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( media-libs/libglvnd dev-qt/qtbase:6[gui,widgets,opengl] ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) qt5? ( tools ) qt6? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.4
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.4.13.0.tar.gz -> openimageio-2.4.13.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e0b540dfe7995f1d60f164d93e9e319
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.14.0 b/metadata/md5-cache/media-libs/openimageio-2.4.14.0
deleted file mode 100644
index 2461b8bdcdea..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.4.14.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= jpeg? ( media-libs/libjpeg-turbo:= ) media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake flag-o-matic font python-single-r1
-IUSE=dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= jpeg? ( media-libs/libjpeg-turbo:= ) media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.4
-SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.4.14.0.tar.gz -> openimageio-2.4.14.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=15e31a62a1b68d54353b1fb474e65088
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.15.0 b/metadata/md5-cache/media-libs/openimageio-2.4.15.0
deleted file mode 100644
index 8edc53e4d74c..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.4.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= jpeg? ( media-libs/libjpeg-turbo:= ) media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake flag-o-matic font python-single-r1
-IUSE=dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= jpeg? ( media-libs/libjpeg-turbo:= ) media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.4
-SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.4.15.0.tar.gz -> openimageio-2.4.15.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=15e31a62a1b68d54353b1fb474e65088
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.16.0 b/metadata/md5-cache/media-libs/openimageio-2.4.16.0
deleted file mode 100644
index c374217d594e..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.4.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= jpeg? ( media-libs/libjpeg-turbo:= ) media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake flag-o-matic font python-single-r1
-IUSE=dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= jpeg? ( media-libs/libjpeg-turbo:= ) media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.4
-SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.4.16.0.tar.gz -> openimageio-2.4.16.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=15e31a62a1b68d54353b1fb474e65088
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.6.0-r1 b/metadata/md5-cache/media-libs/openimageio-2.4.6.0-r1
deleted file mode 100644
index 3fdfeed7f78b..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.4.6.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0/2.4
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.4.6.0.tar.gz -> openimageio-2.4.6.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz -> openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=58a284bd061ab3af6ade023be5d478c5
diff --git a/metadata/md5-cache/media-libs/openimageio-2.5.12.0 b/metadata/md5-cache/media-libs/openimageio-2.5.12.0
new file mode 100644
index 000000000000..0536495907f3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-2.5.12.0
@@ -0,0 +1,17 @@
+BDEPEND=jpeg2k? ( app-arch/unzip ) doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) fits? ( sci-libs/cfitsio:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=A library for reading and writing images
+EAPI=8
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+INHERIT=cmake flag-o-matic python-single-r1 virtualx
+IUSE=dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) fits? ( sci-libs/cfitsio:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools ) test? ( tools truetype )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/2.5
+SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.5.12.0.tar.gz -> openimageio-2.5.12.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz -> openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip ) fits? ( https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits ) )
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e9ad92283764a115ca879d4ca174c60a
diff --git a/metadata/md5-cache/media-libs/openimageio-2.5.4.0 b/metadata/md5-cache/media-libs/openimageio-2.5.4.0
deleted file mode 100644
index dd153f2ea6ad..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.5.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake flag-o-matic font python-single-r1
-IUSE=dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.5
-SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.5.4.0.tar.gz -> openimageio-2.5.4.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bc8300ca12a349e719cfce1e6b20581b
diff --git a/metadata/md5-cache/media-libs/openimageio-2.5.5.0 b/metadata/md5-cache/media-libs/openimageio-2.5.5.0
deleted file mode 100644
index 4a4699b389fc..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.5.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-text/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) app-alternatives/ninja >=dev-build/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake flag-o-matic font python-single-r1
-IUSE=dicom doc ffmpeg gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.13.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-libs/boost:=[python,python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] ) ) gui? ( media-libs/libglvnd !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets,opengl] ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) gui? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/2.5
-SRC_URI=https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v2.5.5.0.tar.gz -> openimageio-2.5.5.0.tar.gz test? ( https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz -> openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/df16e765fee28a947244657cae3251959ae63c00.tar.gz -> openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz )
-_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=665fbb4ddc49404d48b953fbf1a68109
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 80f461d0d6fd..0029d0085aac 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/cava-0.10.2 b/metadata/md5-cache/media-sound/cava-0.10.2
index a3e59e665d04..d36367440a74 100644
--- a/metadata/md5-cache/media-sound/cava-0.10.2
+++ b/metadata/md5-cache/media-sound/cava-0.10.2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/iniparser:4 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib ) ja
 SLOT=0
 SRC_URI=https://github.com/karlstav/cava/archive/refs/tags/0.10.2.tar.gz -> cava-0.10.2.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=21bfdf71dd70810fe6cc6d92d05bee29
+_md5_=2bfc86930d10888265122db3fc9c3486
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r6 b/metadata/md5-cache/media-sound/lash-0.5.4-r6
index 128b73e25d45..05f9b1603e6a 100644
--- a/metadata/md5-cache/media-sound/lash-0.5.4-r6
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) || ( sys-libs/readline dev-libs/libedit ) python? ( dev-lang/swig )
+DEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) || ( sys-libs/readline dev-libs/libedit ) python? ( dev-lang/swig )
 DESCRIPTION=LASH Audio Session Handler
 EAPI=8
 HOMEPAGE=http://www.nongnu.org/lash/
 INHERIT=autotools multilib-minimal python-single-r1
-IUSE=alsa debug gtk python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+IUSE=alsa debug gtk python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
+KEYWORDS=amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) || ( sys-libs/readline dev-libs/libedit )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RDEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) ) || ( sys-libs/readline dev-libs/libedit )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) )
 SLOT=0
 SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=cd13ddef67278b508e7cd90af09cf64b
+_md5_=e554b18b996fd588430c3e7c20e27ae2
diff --git a/metadata/md5-cache/media-sound/pavucontrol-5.0-r2 b/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
deleted file mode 100644
index 8def842b41ca..000000000000
--- a/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DEFINED_PHASES=configure
-DEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-libs/libpulse-15.0[glib] virtual/freedesktop-icon-theme
-DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
-EAPI=7
-HOMEPAGE=https://freedesktop.org/software/pulseaudio/pavucontrol/
-IUSE=nls
-KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-libs/libpulse-15.0[glib] virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-5.0.tar.xz
-_md5_=e154b256e14449d39e10db81b28faa71
diff --git a/metadata/md5-cache/media-sound/spotify-1.2.31 b/metadata/md5-cache/media-sound/spotify-1.2.37
index 04c1b009d0d8..c67d54be750b 100644
--- a/metadata/md5-cache/media-sound/spotify-1.2.31
+++ b/metadata/md5-cache/media-sound/spotify-1.2.37
@@ -11,6 +11,6 @@ LICENSE=Spotify
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/openssl:0= dev-python/dbus-python media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl(+)] sys-apps/dbus sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango !gnome-extra/gnome-integration-spotify libnotify? ( x11-libs/libnotify ) dev-libs/libayatana-appindicator local-playback? ( media-video/ffmpeg:0/56.58.58 ) pulseaudio? ( media-libs/libpulse ) !pulseaudio? ( media-sound/apulse )
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.2.31.1205.g4d59ad7c_amd64.deb
+SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.2.37.701.ge66eb7bc_amd64.deb
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d5419e29f65d86ea615c4408d6e2ef8
+_md5_=f7daba277f651396d576bc1d671ac1ad
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index e43e19376091..1b2be285ae73 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/subtitlecomposer-0.8.0 b/metadata/md5-cache/media-video/subtitlecomposer-0.8.0
index b87884301ed0..350a6e0ce690 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.8.0
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.8.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/subtitlecomposer/subtitlecomposer-0.8.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/subtitlecomposer-0.7.1-patchset-1.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	ecm	322462a1b61f437f69f66ac730eb98c5	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ef9769d85fa0a80ad93ebf8d712bb499
+_md5_=0b2625d67438552fee2e8e0a60ce6cb5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 37b5515a5cad..65e9445072ae 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.2.5 b/metadata/md5-cache/net-analyzer/wireshark-4.2.5
index 88ec68d9b0eb..78ae57cb3bda 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-4.2.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.2.5
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.wireshark.org/
 IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake verify-sig
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) http3? ( net-libs/nghttp3 ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.2.5
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.2.5.tar.xz verify-sig? ( https://www.wireshark.org/download/SIGNATURES-4.2.5.txt -> wireshark-4.2.5-signatures.txt )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b73ed93052f604eac833efa53c74402a
+_md5_=86324769958278993ae054e511657ad0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-7.0.0 b/metadata/md5-cache/net-analyzer/zabbix-7.0.0
new file mode 100644
index 000000000000..88596870144d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-7.0.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2? ( !gnutls ) proxy? ( ^^ ( mysql postgres sqlite ) ) server? ( ^^ ( mysql postgres ) !sqlite ) static? ( !snmp )
+RESTRICT=test strip
+SLOT=0/7.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-7.0.0.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-7.0.0-go-deps.tar.xz )
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	go-env	dbefaac6fd7019213514bccd65949d9a	go-module	83fd3ed1657cfc316c93d6a37018290d	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	de2d3d345b44597c10d7104a7bcdf7b2
+_md5_=ed92992efdc832a9c806810b5df43f4b
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 7d1fbba8af02..d4d44a2f3368 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/nsd-4.9.1 b/metadata/md5-cache/net-dns/nsd-4.9.1
index ef6908b22e1c..032dac09cdfc 100644
--- a/metadata/md5-cache/net-dns/nsd-4.9.1
+++ b/metadata/md5-cache/net-dns/nsd-4.9.1
@@ -12,4 +12,4 @@ RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-
 SLOT=0
 SRC_URI=https://www.nlnetlabs.nl/downloads/nsd/nsd-4.9.1.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=58479bfaf351463327d78c3e91563b71
+_md5_=117aea98de34c14e24a7a06fe2b31761
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 6405aec5f820..0db78bb44c5a 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/discord-0.0.54 b/metadata/md5-cache/net-im/discord-0.0.55
index d79de7010517..1caa43fab916 100644
--- a/metadata/md5-cache/net-im/discord-0.0.54
+++ b/metadata/md5-cache/net-im/discord-0.0.55
@@ -10,6 +10,6 @@ LICENSE=all-rights-reserved
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango appindicator? ( dev-libs/libayatana-appindicator )
 RESTRICT=bindist mirror strip test
 SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.54/discord-0.0.54.tar.gz
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.55/discord-0.0.55.tar.gz
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=666d03bfb1285292037102c59da55a8f
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5e309a0374b8..bbf74e16023b 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/nghttp3-1.3.0 b/metadata/md5-cache/net-libs/nghttp3-1.3.0
index 2f98e296c2cd..84f509ab77a9 100644
--- a/metadata/md5-cache/net-libs/nghttp3-1.3.0
+++ b/metadata/md5-cache/net-libs/nghttp3-1.3.0
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/ngtcp2/nghttp3/
 INHERIT=cmake-multilib
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~riscv ~x86
 LICENSE=MIT
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/nghttp3/releases/download/v1.3.0/nghttp3-1.3.0.tar.xz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9be6e8f2165d0b90941d858444ba070a
+_md5_=ba66ce050b9abdec6b8a4864af4f95fb
diff --git a/metadata/md5-cache/net-libs/nodejs-20.14.0 b/metadata/md5-cache/net-libs/nodejs-20.14.0
new file mode 100644
index 000000000000..f679a09313d1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-20.14.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12[threads(+)] dev-lang/python:3.11[threads(+)] dev-lang/python:3.10[threads(+)] ) app-alternatives/ninja sys-apps/coreutils virtual/pkgconfig test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.46.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= >=net-libs/ngtcp2-1.1.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-71:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=8
+HOMEPAGE=https://nodejs.org/
+INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+IUSE=corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.46.0:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.41.0:= >=net-libs/ngtcp2-1.1.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-71:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=!test? ( test )
+SLOT=0/20
+SRC_URI=https://nodejs.org/dist/v20.14.0/node-v20.14.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2da05c0a71c147d0d69bbf8daa70fb03
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 7b99c362f61c..568864447225 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/redir-3.3 b/metadata/md5-cache/net-misc/redir-3.3
index 70e97c935eba..b8531236b257 100644
--- a/metadata/md5-cache/net-misc/redir-3.3
+++ b/metadata/md5-cache/net-misc/redir-3.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Redir is a port redirector
 EAPI=7
 HOMEPAGE=https://github.com/troglobit/redir
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/troglobit/redir/releases/download/v3.3/redir-3.3.tar.xz
-_md5_=91d4e437e0968d72f823b99ce878d9f7
+_md5_=036818cb191e6e6e84fa0316dffaf35c
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index e5f1dd498226..f77d29bcbd29 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/openldap-2.6.4-r3 b/metadata/md5-cache/net-nds/openldap-2.6.4-r3
index 0134df25b7f9..d26aa1d73508 100644
--- a/metadata/md5-cache/net-nds/openldap-2.6.4-r3
+++ b/metadata/md5-cache/net-nds/openldap-2.6.4-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openldap.org/
 INHERIT=autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
 IUSE=systemd argon2 +cleartext crypt experimental minimal samba tcpd overlays perl autoca debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test kerberos kinit pbkdf2 sha2 smbkrb5passwd cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=OPENLDAP GPL-2
 RDEPEND=kernel_linux? ( sys-apps/util-linux ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[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/libgcrypt-1.5.3: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(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libevent:= dev-libs/libltdl sys-fs/e2fsprogs >=dev-db/lmdb-0.9.30:= argon2? ( app-crypt/argon2:= ) crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( dev-libs/openssl:0= ) smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) ) selinux? ( sec-policy/selinux-ldap ) virtual/tmpfiles
 REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.6
 SRC_URI=https://gitlab.com/openldap/openldap/-/archive/OPENLDAP_REL_ENG_2_6_4/openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=be4af901aebd9eebb48f7a03bcaf02bd
+_md5_=75a13a773941ad81692ae14a80944dd4
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 9c92372c8480..2bcbf8636145 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/deluge-2.1.1-r1 b/metadata/md5-cache/net-p2p/deluge-2.1.1-r1
deleted file mode 100644
index 9c09e45a1bd1..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.1.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool test? ( python_single_target_python3_10? ( >=dev-python/pytest-twisted-1.13.4-r1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-twisted-1.13.4-r1[python_targets_python3_11(-)] ) ) test? ( acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.4.4[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=8
-HOMEPAGE=https://deluge-torrent.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 systemd xdg
-IUSE=console gui libnotify sound webinterface test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
-LICENSE=GPL-2
-RDEPEND=acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=libnotify? ( gui ) sound? ( gui ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.1/deluge-2.1.1.tar.xz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c258a7288cff0395083b6aad4d0d0120
diff --git a/metadata/md5-cache/net-p2p/deluge-2.1.1-r4 b/metadata/md5-cache/net-p2p/deluge-2.1.1-r4
deleted file mode 100644
index 92a3fdca7678..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.1.1-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool test? ( python_single_target_python3_10? ( >=dev-python/pytest-twisted-1.13.4-r1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-twisted-1.13.4-r1[python_targets_python3_11(-)] ) ) test? ( acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.4.4[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] >=dev-python/setuptools-69.0.3[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=8
-HOMEPAGE=https://deluge-torrent.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 systemd xdg
-IUSE=console gui libnotify sound webinterface test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
-LICENSE=GPL-2
-RDEPEND=acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=libnotify? ( gui ) sound? ( gui ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.1/deluge-2.1.1.tar.xz
-_eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=df42397a31d22ba82dc3f5bd1c7a7a50
diff --git a/metadata/md5-cache/net-p2p/deluge-2.1.1-r5 b/metadata/md5-cache/net-p2p/deluge-2.1.1-r5
index d4eb29624e22..885a911942ca 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.1.1-r5
+++ b/metadata/md5-cache/net-p2p/deluge-2.1.1-r5
@@ -6,7 +6,7 @@ HOMEPAGE=https://deluge-torrent.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 systemd xdg
 IUSE=console gui libnotify sound webinterface test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_12? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_12(-)] ) dev-python/pygobject:3[python_targets_python3_12(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_12(-)] dev-python/distro[python_targets_python3_12(-)] dev-python/pillow[python_targets_python3_12(-)] dev-python/pyopenssl[python_targets_python3_12(-)] dev-python/pyxdg[python_targets_python3_12(-)] dev-python/rencode[python_targets_python3_12(-)] dev-python/setproctitle[python_targets_python3_12(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_12(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_12(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_12(-)] dev-python/mako[python_targets_python3_12(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=libnotify? ( gui ) sound? ( gui ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.1/deluge-2.1.1.tar.xz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8ef8e40365a80af0dc7b6d5c9453e493
+_md5_=f97914e8eb7253c458f89c0af1d8e742
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index abff944f797e..2b782c8b6fb5 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=libnotify? ( gui ) sound? ( gui ) ^^ ( python_single_target_python3
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c9c4f79d44f41fa472827b8f2ccc3757
+_md5_=2a6a8c5bd2b2f8b2d93ca84dd8f6161f
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index dc9f280d9688..f975d93bad82 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-filters-2.0.0-r1 b/metadata/md5-cache/net-print/cups-filters-2.0.0-r1
index f15c0ab7de80..51866e50adcc 100644
--- a/metadata/md5-cache/net-print/cups-filters-2.0.0-r1
+++ b/metadata/md5-cache/net-print/cups-filters-2.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Cups filters
 EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=+foomatic
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-print/libcupsfilters net-print/libppd >=net-print/cups-1.7.3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups-filters/releases/download/2.0.0/cups-filters-2.0.0.tar.xz
-_md5_=076c1e1d6385f664a69a75e9115f284e
+_md5_=2c4c7f81d162f92f4f1515631cd68fe1
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index afe79fab9cb3..e3c3e6351381 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/openvpn-2.6.9 b/metadata/md5-cache/net-vpn/openvpn-2.6.9
index d4f167cc749b..5a33ecf48c42 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.6.9
+++ b/metadata/md5-cache/net-vpn/openvpn-2.6.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://openvpn.net/
 INHERIT=autotools systemd linux-info tmpfiles
 IUSE=dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl pam pkcs11 +plugins selinux systemd test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( >=dev-libs/openssl-1.0.2:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= ) sys-libs/libcap-ng:= acct-group/openvpn acct-user/openvpn selinux? ( sec-policy/selinux-openvpn ) virtual/tmpfiles
 REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins ) dco? ( !iproute2 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://build.openvpn.net/downloads/releases/openvpn-2.6.9.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=261435be412a16a5404d9ff289ad8cec
+_md5_=c847e97c47acc9345bc5b6cf90962caa
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 223fcf1f9c0d..e8eda192cb32 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/neard-0.19 b/metadata/md5-cache/net-wireless/neard-0.19
index 95bbb89c7968..50fbef57bf0f 100644
--- a/metadata/md5-cache/net-wireless/neard-0.19
+++ b/metadata/md5-cache/net-wireless/neard-0.19
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-nfc/neard
 INHERIT=autotools
 IUSE=test tools systemd
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28 dev-libs/libnl:3= >=sys-apps/dbus-1.2 systemd? ( sys-apps/systemd:0 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linux-nfc/neard/archive/refs/tags/v0.19.tar.gz -> neard-0.19.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=84801e31f5dccc81c92f80e394e4d906
+_md5_=db1a9bc49215b23673817dfb11b08921
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 30afffbd136f..11e464d5b30a 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/biopython-1.81-r1 b/metadata/md5-cache/sci-biology/biopython-1.81-r1
index b4111c2bb8f3..4dfc7f927346 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.81-r1
+++ b/metadata/md5-cache/sci-biology/biopython-1.81-r1
@@ -1,16 +1,16 @@
-BDEPEND=app-alternatives/lex 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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=app-alternatives/lex python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rdflib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygraphviz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/reportlab-3.5.13-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydot[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 )
+DEPEND=dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rdflib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygraphviz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/reportlab-3.5.13-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pydot[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 )
 DESCRIPTION=Python modules for computational molecular biology
 EAPI=8
 HOMEPAGE=https://www.biopython.org/ https://pypi.org/project/biopython/
 INHERIT=distutils-r1 optfeature pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 debug
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
-RDEPEND=dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rdflib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygraphviz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/reportlab-3.5.13-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydot[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 )
+RDEPEND=dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rdflib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygraphviz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/reportlab-3.5.13-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pydot[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 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/b/biopython/biopython-1.81.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=552dcb4529d1b3f00ef66c658dfedda2
+_md5_=82f098dc006d74b880969c95dbd7e786
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 81850ae084ec..c7acf90b2380 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.8.1 b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.8.1
index 44d98bc09656..269e07231ec9 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.8.1
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.8.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://qalculate.github.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-4.8.1:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v4.8.1/qalculate-gtk-4.8.1.tar.gz
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9e2ec4723f8f2fee8b0320e3cc1cd1b7
+_md5_=f64b9426a0999bc73b86222b9b7bcb82
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-2.6.1 b/metadata/md5-cache/sci-chemistry/MDAnalysis-2.6.1
index c3a0e93f7be2..1b98f00a81e9 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-2.6.1
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-2.6.1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-biology/biopython-1.71[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/joblib-0.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/threadpoolctl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/numpy-1.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-biology/biopython-1.71[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/joblib-0.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/threadpoolctl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.4.4[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-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sci-biology/biopython-1.71[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/networkx-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/joblib-0.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/threadpoolctl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/numpy-1.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sci-biology/biopython-1.71[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/networkx-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/joblib-0.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/threadpoolctl[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python library to analyze and manipulate molecular dynamics trajectories
 EAPI=8
 HOMEPAGE=https://www.mdanalysis.org
 INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sci-biology/biopython-1.71[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/joblib-0.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/threadpoolctl[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 )
+RDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/scipy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=sci-biology/biopython-1.71[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/networkx-1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/GridDataFormats-0.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/joblib-0.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/matplotlib-1.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mmtf-python-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tqdm-4.43.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/gsd-1.9.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/threadpoolctl[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? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/M/MDAnalysis/MDAnalysis-2.6.1.tar.gz
 _eclasses_=distutils-r1	5400d21736d8621562bf93be4fa98eec	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=84dc6666e8c03adb1bb3340b1d1b52f9
+_md5_=9956ad98bf5fb15bc52b3c20913235f2
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index ed09b14b1875..ee8ac9c78155 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/vmd-1.9.4_alpha57 b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha57
index c49345a46b30..80e934e08918 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha57
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha57
@@ -1,18 +1,18 @@
 BDEPEND=virtual/pkgconfig dev-lang/swig
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) >=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) >=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama )
 DESCRIPTION=Visual Molecular Dynamics
 EAPI=8
 HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cuda desktop prefix python-single-r1 toolchain-funcs xdg
-IUSE=cuda gromacs msms povray sqlite tachyon xinerama python_single_target_python3_10 python_single_target_python3_11
+IUSE=cuda gromacs msms povray sqlite tachyon xinerama python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=vmd
-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_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) >=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/chemical-mime-data sci-chemistry/surf x11-misc/xdg-utils x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) >=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/chemical-mime-data sci-chemistry/surf x11-misc/xdg-utils x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=vmd-1.9.4a57.src.tar.gz fetch+https://dev.gentoo.org/~pacho/vmd/vmd-1.9.4_alpha57-gentoo-patches.tar.xz
 _eclasses_=cuda	283d0f298f6c196c755a0f8d50daca85	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1c922abe9e5c8d4e07ecb483261843c3
+_md5_=1df5bb32cce16a794d8a24f52093ec16
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 57e0318ee67a..bdb7ccfddbb6 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/librttopo-1.1.0 b/metadata/md5-cache/sci-geosciences/librttopo-1.1.0
index bf56bf70bb6c..676973f1b8b8 100644
--- a/metadata/md5-cache/sci-geosciences/librttopo-1.1.0
+++ b/metadata/md5-cache/sci-geosciences/librttopo-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=Exposes an API to create and manage standard (ISO 13249 aka SQL/MM)
 EAPI=8
 HOMEPAGE=https://git.osgeo.org/gitea/rttopo/librttopo
 INHERIT=autotools
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=GPL-2+
 RDEPEND=sci-libs/geos
 SLOT=0
 SRC_URI=https://git.osgeo.org/gitea/rttopo/librttopo/archive/librttopo-1.1.0.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=84b7978aa3574da7eb724730b2776097
+_md5_=06d948215d004b839e0cc6df7b80eea4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 52f6c73f104f..728eb2caadc8 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/cholmod-3.0.14 b/metadata/md5-cache/sci-libs/cholmod-3.0.14-r1
index 28bba464f0c7..b7a8f1861b4d 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.14
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.14-r1
@@ -9,7 +9,7 @@ IUSE=cuda doc +lapack +matrixops +modify +partition
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
 RDEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd >=sci-libs/metis-5.1.0 )
-SLOT=0
+SLOT=0/3
 SRC_URI=http://202.36.178.9/sage/cholmod-3.0.14.tar.bz2
 _eclasses_=cuda	283d0f298f6c196c755a0f8d50daca85	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9dbdbd3f56d535119b0c6f3eb85b75ca
+_md5_=41cbc32f174133d1a2b10b906c909858
diff --git a/metadata/md5-cache/sci-libs/gdal-3.8.5 b/metadata/md5-cache/sci-libs/gdal-3.8.5
index 297555bcbeb5..6e5a21a4ae36 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.8.5
+++ b/metadata/md5-cache/sci-libs/gdal-3.8.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gdal.org/
 INHERIT=cmake java-pkg-opt-2 python-single-r1
 IUSE=armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd java python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) java? ( >=virtual/jdk-1.8:*[-headless-awt] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) spatialite? ( sqlite ) test? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/34
 SRC_URI=https://download.osgeo.org/gdal/3.8.5/gdal-3.8.5.tar.xz test? ( https://download.osgeo.org/gdal/3.8.5/gdalautotest-3.8.5.tar.gz )
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=98f26cb65e1ca290480dd7dde846da6d
+_md5_=bc062451b4f5b7c7ed28c5cd7dd3a826
diff --git a/metadata/md5-cache/sci-libs/libqalculate-4.8.1 b/metadata/md5-cache/sci-libs/libqalculate-4.8.1
index 7b4260e0e002..9f39075ef5ae 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-4.8.1
+++ b/metadata/md5-cache/sci-libs/libqalculate-4.8.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://qalculate.github.io/
 INHERIT=toolchain-funcs
 IUSE=curl icu gnuplot +hardened readline test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:= dev-libs/libxml2:2 dev-libs/mpfr:= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v4.8.1/libqalculate-4.8.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e28d741d25c08256632525150a84b560
+_md5_=02ea230b534c313cd8dfc3990b0071f5
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 0d27d70b56d7..312fe72aac0c 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-arnaldocarvalhodemelo-20180830 b/metadata/md5-cache/sec-keys/openpgp-keys-arnaldocarvalhodemelo-20180830
new file mode 100644
index 000000000000..cdfea869504f
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-arnaldocarvalhodemelo-20180830
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys of Arnaldo Carvalho de Melo
+EAPI=8
+HOMEPAGE=https://www.kernel.org/signature.html
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/D65016F35352AA40.asc?id=a180d237a0d1914531072872543a50af04956896 -> openpgp-keys-arnaldocarvalhodemelo-20180830.asc
+_md5_=0ea2497074a7105ef918244dd7b79759
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6451e7ed0422..3b1a55cd0c19 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/dbus-broker-36 b/metadata/md5-cache/sys-apps/dbus-broker-36
index cc0f06b8b159..f7583fe7f30e 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-36
+++ b/metadata/md5-cache/sys-apps/dbus-broker-36
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
 INHERIT=meson
 IUSE=apparmor audit doc +launcher selinux
-KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( >=sys-libs/libapparmor-3.0 ) audit? ( >=sys-process/audit-3.0 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( >=sys-libs/libselinux-3.2 ) launcher? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/bus1/dbus-broker/releases/download/v36/dbus-broker-36.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	meson	aecae905c2e0c201d7925fae52a5576d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b435ec5196790939925049701f3bba4e
+_md5_=07c0e898569476dc9cab8f1b0aa082cf
diff --git a/metadata/md5-cache/sys-apps/eza-0.18.16 b/metadata/md5-cache/sys-apps/eza-0.18.16
new file mode 100644
index 000000000000..45c5ed7cb701
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/eza-0.18.16
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.70.0 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=git? ( >=dev-libs/libgit2-1.7.0:= )
+DESCRIPTION=A modern, maintained replacement for ls
+EAPI=8
+HOMEPAGE=https://github.com/eza-community/eza
+INHERIT=cargo shell-completion
+IUSE=+git debug
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT Apache-2.0 MIT Unicode-DFS-2016
+RDEPEND=git? ( >=dev-libs/libgit2-1.7.0:= )
+SLOT=0
+SRC_URI=https://github.com/eza-community/eza/archive/refs/tags/v0.18.16.tar.gz -> eza-0.18.16.tar.gz https://github.com/sevz17/eza-manpages/releases/download/0.18.16/eza-0.18.16-manpages.tar.xz https://crates.io/api/v1/crates/aho-corasick/1.0.5/download -> aho-corasick-1.0.5.crate https://crates.io/api/v1/crates/android-tzdata/0.1.1/download -> android-tzdata-0.1.1.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anes/0.1.6/download -> anes-0.1.6.crate https://crates.io/api/v1/crates/ansi-width/0.1.0/download -> ansi-width-0.1.0.crate https://crates.io/api/v1/crates/anstream/0.6.11/download -> anstream-0.6.11.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/3.0.1/download -> anstyle-wincon-3.0.1.crate https://crates.io/api/v1/crates/anstyle/1.0.3/download -> anstyle-1.0.3.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.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.5/download -> base64-0.21.5.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/bumpalo/3.13.0/download -> bumpalo-3.13.0.crate https://crates.io/api/v1/crates/by_address/1.2.1/download -> by_address-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cast/0.3.0/download -> cast-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.34/download -> chrono-0.4.34.crate https://crates.io/api/v1/crates/ciborium-io/0.2.1/download -> ciborium-io-0.2.1.crate https://crates.io/api/v1/crates/ciborium-ll/0.2.1/download -> ciborium-ll-0.2.1.crate https://crates.io/api/v1/crates/ciborium/0.2.1/download -> ciborium-0.2.1.crate https://crates.io/api/v1/crates/clap/4.4.3/download -> clap-4.4.3.crate https://crates.io/api/v1/crates/clap_builder/4.4.2/download -> clap_builder-4.4.2.crate https://crates.io/api/v1/crates/clap_lex/0.5.1/download -> clap_lex-0.5.1.crate https://crates.io/api/v1/crates/colorchoice/1.0.0/download -> colorchoice-1.0.0.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.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/criterion-plot/0.5.0/download -> criterion-plot-0.5.0.crate https://crates.io/api/v1/crates/criterion/0.5.1/download -> criterion-0.5.1.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/datetime/0.5.2/download -> datetime-0.5.2.crate https://crates.io/api/v1/crates/deranged/0.3.9/download -> deranged-0.3.9.crate https://crates.io/api/v1/crates/dunce/1.0.4/download -> dunce-1.0.4.crate https://crates.io/api/v1/crates/either/1.9.0/download -> either-1.9.0.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.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/errno/0.3.3/download -> errno-0.3.3.crate https://crates.io/api/v1/crates/fast-srgb8/1.0.0/download -> fast-srgb8-1.0.0.crate https://crates.io/api/v1/crates/fastrand/2.0.0/download -> fastrand-2.0.0.crate https://crates.io/api/v1/crates/filetime/0.2.22/download -> filetime-0.2.22.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/git2/0.18.3/download -> git2-0.18.3.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.14.2/download -> hashbrown-0.14.2.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-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.2/download -> iana-time-zone-haiku-0.1.2.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.57/download -> iana-time-zone-0.1.57.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/2.1.0/download -> indexmap-2.1.0.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/itoa/1.0.9/download -> itoa-1.0.9.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/js-sys/0.3.64/download -> js-sys-0.3.64.crate https://crates.io/api/v1/crates/libc/0.2.154/download -> libc-0.2.154.crate https://crates.io/api/v1/crates/libgit2-sys/0.16.2+1.7.2/download -> libgit2-sys-0.16.2+1.7.2.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/line-wrap/0.2.0/download -> line-wrap-0.2.0.crate https://crates.io/api/v1/crates/linux-raw-sys/0.4.11/download -> linux-raw-sys-0.4.11.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.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/natord/1.0.9/download -> natord-1.0.9.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/nu-ansi-term/0.50.0/download -> nu-ansi-term-0.50.0.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/openssl-src/111.26.0+1.1.1u/download -> openssl-src-111.26.0+1.1.1u.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/os_pipe/1.1.4/download -> os_pipe-1.1.4.crate https://crates.io/api/v1/crates/palette/0.7.6/download -> palette-0.7.6.crate https://crates.io/api/v1/crates/palette_derive/0.7.6/download -> palette_derive-0.7.6.crate https://crates.io/api/v1/crates/partition-identity/0.3.0/download -> partition-identity-0.3.0.crate https://crates.io/api/v1/crates/path-clean/1.0.1/download -> path-clean-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/phf/0.11.2/download -> phf-0.11.2.crate https://crates.io/api/v1/crates/phf_generator/0.11.2/download -> phf_generator-0.11.2.crate https://crates.io/api/v1/crates/phf_macros/0.11.2/download -> phf_macros-0.11.2.crate https://crates.io/api/v1/crates/phf_shared/0.11.2/download -> phf_shared-0.11.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.6.1/download -> plist-1.6.1.crate https://crates.io/api/v1/crates/plotters-backend/0.3.5/download -> plotters-backend-0.3.5.crate https://crates.io/api/v1/crates/plotters-svg/0.3.5/download -> plotters-svg-0.3.5.crate https://crates.io/api/v1/crates/plotters/0.3.5/download -> plotters-0.3.5.crate https://crates.io/api/v1/crates/powerfmt/0.2.0/download -> powerfmt-0.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.66/download -> proc-macro2-1.0.66.crate https://crates.io/api/v1/crates/proc-mounts/0.3.0/download -> proc-mounts-0.3.0.crate https://crates.io/api/v1/crates/quick-xml/0.31.0/download -> quick-xml-0.31.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon-core/1.12.1/download -> rayon-core-1.12.1.crate https://crates.io/api/v1/crates/rayon/1.10.0/download -> rayon-1.10.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.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.3.8/download -> regex-automata-0.3.8.crate https://crates.io/api/v1/crates/regex-syntax/0.7.5/download -> regex-syntax-0.7.5.crate https://crates.io/api/v1/crates/regex/1.9.5/download -> regex-1.9.5.crate https://crates.io/api/v1/crates/rustix/0.38.21/download -> rustix-0.38.21.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.107/download -> serde_json-1.0.107.crate https://crates.io/api/v1/crates/serde_spanned/0.6.5/download -> serde_spanned-0.6.5.crate https://crates.io/api/v1/crates/shlex/1.3.0/download -> shlex-1.3.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.11/download -> siphasher-0.3.11.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.8/download -> snapbox-macros-0.3.8.crate https://crates.io/api/v1/crates/snapbox/0.5.9/download -> snapbox-0.5.9.crate https://crates.io/api/v1/crates/syn/2.0.29/download -> syn-2.0.29.crate https://crates.io/api/v1/crates/tempfile/3.8.0/download -> tempfile-3.8.0.crate https://crates.io/api/v1/crates/terminal_size/0.3.0/download -> terminal_size-0.3.0.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.48/download -> thiserror-impl-1.0.48.crate https://crates.io/api/v1/crates/thiserror/1.0.48/download -> thiserror-1.0.48.crate https://crates.io/api/v1/crates/time-core/0.1.2/download -> time-core-0.1.2.crate https://crates.io/api/v1/crates/time-macros/0.2.15/download -> time-macros-0.2.15.crate https://crates.io/api/v1/crates/time/0.3.30/download -> time-0.3.30.crate https://crates.io/api/v1/crates/timeago/0.4.2/download -> timeago-0.4.2.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml_datetime/0.6.5/download -> toml_datetime-0.6.5.crate https://crates.io/api/v1/crates/toml_edit/0.22.6/download -> toml_edit-0.22.6.crate https://crates.io/api/v1/crates/trycmd/0.15.1/download -> trycmd-0.15.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.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-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.12/download -> unicode-width-0.1.12.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8parse/0.2.1/download -> utf8parse-0.2.1.crate https://crates.io/api/v1/crates/uutils_term_grid/0.6.0/download -> uutils_term_grid-0.6.0.crate https://crates.io/api/v1/crates/uzers/0.12.0/download -> uzers-0.12.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.12/download -> vcpkg-0.2.12.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.4.0/download -> walkdir-2.4.0.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.87/download -> wasm-bindgen-backend-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.87/download -> wasm-bindgen-macro-support-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.87/download -> wasm-bindgen-macro-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.87/download -> wasm-bindgen-shared-0.2.87.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.87/download -> wasm-bindgen-0.2.87.crate https://crates.io/api/v1/crates/web-sys/0.3.64/download -> web-sys-0.3.64.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-sys/0.52.0/download -> windows-sys-0.52.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows-targets/0.52.0/download -> windows-targets-0.52.0.crate https://crates.io/api/v1/crates/windows/0.48.0/download -> windows-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.0/download -> windows_aarch64_gnullvm-0.52.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.0/download -> windows_aarch64_msvc-0.52.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.52.0/download -> windows_i686_gnu-0.52.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.52.0/download -> windows_i686_msvc-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.0/download -> windows_x86_64_gnu-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.0/download -> windows_x86_64_gnullvm-0.52.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.0/download -> windows_x86_64_msvc-0.52.0.crate https://crates.io/api/v1/crates/winnow/0.6.2/download -> winnow-0.6.2.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.5.1/download -> zoneinfo_compiled-0.5.1.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	172dcb548e750dda201deb8263a17124	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=30247f7e4e98068de930dd9bba98afb3
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-255.4 b/metadata/md5-cache/sys-apps/systemd-utils-255.7
index 7c056bd6081f..4803f1b84757 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-255.4
+++ b/metadata/md5-cache/sys-apps/systemd-utils-255.7
@@ -1,4 +1,4 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf dev-util/patchelf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_10(-)] ) ukify? ( test? ( dev-python/pefile[python_targets_python3_10(-)] ) ) ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_11(-)] ) ukify? ( test? ( dev-python/pefile[python_targets_python3_11(-)] ) ) ) python_single_target_python3_12? ( dev-python/jinja[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_12(-)] ) ukify? ( test? ( dev-python/pefile[python_targets_python3_12(-)] ) ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array secureboot? ( app-crypt/sbsigntools ) virtual/pkgconfig
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf dev-util/patchelf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_10(-)] test? ( dev-python/pefile[python_targets_python3_10(-)] ) ) ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_11(-)] test? ( dev-python/pefile[python_targets_python3_11(-)] ) ) ) python_single_target_python3_12? ( dev-python/jinja[python_targets_python3_12(-)] dev-python/lxml[python_targets_python3_12(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_12(-)] test? ( dev-python/pefile[python_targets_python3_12(-)] ) ) ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array secureboot? ( app-crypt/sbsigntools ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11
 DESCRIPTION=Utilities split out from systemd for OpenRC users
@@ -12,6 +12,6 @@ RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0=
 REQUIRED_USE=|| ( kernel-install tmpfiles sysusers udev ) boot? ( kernel-install ) ukify? ( boot ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v255.4.tar.gz -> systemd-stable-255.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-255.4.tar.gz )
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v255.7.tar.gz -> systemd-stable-255.7.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-255.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	meson	aecae905c2e0c201d7925fae52a5576d	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6d42f7bb0dcc6bde910164f6769ee3bc
+_md5_=e5d957481d7d0b89e449598a30a51bff
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 86d3482aae6a..e4d6f7b84022 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/sssd-2.9.1-r1 b/metadata/md5-cache/sys-auth/sssd-2.9.5
index a9dfcde0e706..f207b7af9587 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.9.1-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.9.5
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig 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 ) doc? ( app-text/doxygen ) man? ( app-text/docbook-xml-dtd:4.4 >=dev-libs/libxslt-1.1.26 nls? ( app-text/po4a ) ) nls? ( sys-devel/gettext ) test? ( dev-libs/check dev-libs/softhsm:2 dev-util/cmocka net-libs/gnutls[pkcs11,tools] sys-libs/libfaketime sys-libs/nss_wrapper sys-libs/pam_wrapper sys-libs/uid_wrapper ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-crypt/mit-krb5-1.19.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] dev-libs/jansson:= dev-libs/libpcre2:= dev-libs/libunistring:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.10.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(-)?] >=net-nds/openldap-2.4.30:=[sasl,experimental] >=sys-apps/dbus-1.6 >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl acl? ( net-fs/cifs-utils[acl] ) keyutils? ( >=sys-apps/keyutils-1.5:= ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 ) nls? ( >=sys-devel/gettext-0.18 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) systemd? ( python_single_target_python3_10? ( dev-python/python-systemd[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-systemd[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/python-systemd[python_targets_python3_12(-)] ) ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) subid? ( >=sys-apps/shadow-4.9 ) systemd? ( sys-apps/systemd:= sys-apps/util-linux ) systemtap? ( dev-debug/systemtap )
+DEPEND=>=app-crypt/mit-krb5-1.19.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] dev-libs/jansson:= dev-libs/libpcre2:= dev-libs/libunistring:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.10.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(-)?] >=net-nds/openldap-2.4.30:=[sasl,experimental] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 ) nls? ( >=sys-devel/gettext-0.18 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) systemd? ( python_single_target_python3_10? ( dev-python/python-systemd[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-systemd[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/python-systemd[python_targets_python3_12(-)] ) ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) subid? ( >=sys-apps/shadow-4.9 ) systemd? ( sys-apps/systemd:= sys-apps/util-linux ) systemtap? ( dev-debug/systemtap )
 DESCRIPTION=System Security Services Daemon provides access to identity and authentication
 EAPI=8
 HOMEPAGE=https://github.com/SSSD/sssd
 INHERIT=autotools linux-info multilib-minimal optfeature plocale python-single-r1 pam systemd toolchain-funcs
-IUSE=acl doc keyutils +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+IUSE=acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-crypt/mit-krb5-1.19.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] dev-libs/jansson:= dev-libs/libpcre2:= dev-libs/libunistring:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.10.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(-)?] >=net-nds/openldap-2.4.30:=[sasl,experimental] >=sys-apps/dbus-1.6 >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl acl? ( net-fs/cifs-utils[acl] ) keyutils? ( >=sys-apps/keyutils-1.5:= ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 ) nls? ( >=sys-devel/gettext-0.18 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) systemd? ( python_single_target_python3_10? ( dev-python/python-systemd[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-systemd[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/python-systemd[python_targets_python3_12(-)] ) ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) subid? ( >=sys-apps/shadow-4.9 ) systemd? ( sys-apps/systemd:= sys-apps/util-linux ) systemtap? ( dev-debug/systemtap ) selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+RDEPEND=>=app-crypt/mit-krb5-1.19.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/p11-kit >=dev-libs/ding-libs-0.2 >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] dev-libs/jansson:= dev-libs/libpcre2:= dev-libs/libunistring:= >=dev-libs/popt-1.16 >=dev-libs/openssl-1.0.2:= >=net-dns/bind-tools-9.9[gssapi] >=net-dns/c-ares-1.10.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(-)?] >=net-nds/openldap-2.4.30:=[sasl,experimental] >=sys-apps/dbus-1.6 >=sys-apps/keyutils-1.5:= >=sys-libs/pam-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(-)?] >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= virtual/libintl acl? ( net-fs/cifs-utils[acl] ) netlink? ( dev-libs/libnl:3 ) nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 ) nls? ( >=sys-devel/gettext-0.18 ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) systemd? ( python_single_target_python3_10? ( dev-python/python-systemd[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/python-systemd[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/python-systemd[python_targets_python3_12(-)] ) ) ) samba? ( >=net-fs/samba-4.10.2[winbind] ) selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) subid? ( >=sys-apps/shadow-4.9 ) systemd? ( sys-apps/systemd:= sys-apps/util-linux ) systemtap? ( dev-debug/systemtap ) selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) ) test? ( sudo )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/SSSD/sssd/releases/download/2.9.1/sssd-2.9.1.tar.gz
+SRC_URI=https://github.com/SSSD/sssd/releases/download/2.9.5/sssd-2.9.5.tar.gz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3d82a1a74571beff32d0530cac32589d
+_md5_=f855658ff20db703587b7efb830b6314
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 228ed0c028e7..f049ed100bad 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/refind-0.13.2 b/metadata/md5-cache/sys-boot/refind-0.13.2
deleted file mode 100644
index ab2e945cd941..000000000000
--- a/metadata/md5-cache/sys-boot/refind-0.13.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND=sys-boot/gnu-efi
-DESCRIPTION=The UEFI Boot Manager by Rod Smith
-EAPI=7
-HOMEPAGE=https://www.rodsbooks.com/refind/
-INHERIT=multiprocessing toolchain-funcs
-IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc
-KEYWORDS=amd64 x86
-LICENSE=BSD GPL-2 GPL-3 FDL-1.3
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/refind/0.13.2/refind-src-0.13.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=91b3f5dffd5a62ea6134a86fde75aff1
diff --git a/metadata/md5-cache/sys-boot/refind-0.13.3.1 b/metadata/md5-cache/sys-boot/refind-0.13.3.1
deleted file mode 100644
index 44f5d3fab072..000000000000
--- a/metadata/md5-cache/sys-boot/refind-0.13.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=secureboot? ( app-crypt/sbsigntools )
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND=sys-boot/gnu-efi
-DESCRIPTION=The UEFI Boot Manager by Rod Smith
-EAPI=8
-HOMEPAGE=https://www.rodsbooks.com/refind/
-INHERIT=toolchain-funcs secureboot
-IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc secureboot
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2 GPL-3 FDL-1.3
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/refind/0.13.3.1/refind-src-0.13.3.1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=920edb061b274f5a89b9316c1a6400b0
diff --git a/metadata/md5-cache/sys-boot/refind-0.14.0.2 b/metadata/md5-cache/sys-boot/refind-0.14.0.2
deleted file mode 100644
index 21bf5a68e4d5..000000000000
--- a/metadata/md5-cache/sys-boot/refind-0.14.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=secureboot? ( app-crypt/sbsigntools )
-DEFINED_PHASES=compile install postinst prepare pretend setup
-DEPEND=sys-boot/gnu-efi
-DESCRIPTION=The UEFI Boot Manager by Rod Smith
-EAPI=8
-HOMEPAGE=https://www.rodsbooks.com/refind/
-INHERIT=toolchain-funcs secureboot
-IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc secureboot
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2 GPL-3 FDL-1.3
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/refind/0.14.0.2/refind-src-0.14.0.2.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=6405bd3f89549ac3121cdef54c3bf011
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 307535cf49db..972ce37913fc 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/binutils-2.42-r1 b/metadata/md5-cache/sys-devel/binutils-2.42-r1
index 161a67d7e2e0..f3d02209bd94 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.42-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.42-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) app-alternatives/lex app-alternatives/yacc >=app-portage/elt-patches-20240116 sys-devel/gnuconfig
+BDEPEND=doc? ( sys-apps/texinfo ) pgo? ( dev-util/dejagnu app-alternatives/bc ) test? ( dev-util/dejagnu app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) app-alternatives/lex app-alternatives/yacc >=app-portage/elt-patches-20240116 sys-devel/gnuconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Tools necessary to build programs
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.42
 SRC_URI=mirror://gnu/binutils/binutils-2.42.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.42.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.42.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.42-patches-3.tar.xz
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=14ed5d06fa6e4aab23af8de9aad9c135
+_md5_=303dbc9b41d1209fc5fea25c1854d0c4
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 931779e1554c..770c5cf850d5 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) app-alternatives/lex app-alternatives/yacc >=app-portage/elt-patches-20240116 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( sys-apps/texinfo ) pgo? ( dev-util/dejagnu app-alternatives/bc ) test? ( dev-util/dejagnu app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) app-alternatives/lex app-alternatives/yacc >=app-portage/elt-patches-20240116 sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Tools necessary to build programs
@@ -12,4 +12,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfut
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=d061bb8f0af6ace5aa5a2b01ad22ab78
+_md5_=146b156f3e526369ca30e536521857e8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 0ccddbab4776..ea0a7b1fac9e 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/wordpress-6.5.3 b/metadata/md5-cache/www-apps/wordpress-6.5.4
index d714005fb685..2ee918b400d7 100644
--- a/metadata/md5-cache/www-apps/wordpress-6.5.3
+++ b/metadata/md5-cache/www-apps/wordpress-6.5.4
@@ -8,7 +8,7 @@ IUSE=+akismet examples +themes vhosts vhosts
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) app-admin/webapp-config
-SLOT=6.5.3
-SRC_URI=https://wordpress.org/wordpress-6.5.3.tar.gz
+SLOT=6.5.4
+SRC_URI=https://wordpress.org/wordpress-6.5.4.tar.gz
 _eclasses_=webapp	de2d3d345b44597c10d7104a7bcdf7b2
 _md5_=8660f5c05df2310443c520b0702137fd
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index bc71d893d2dc..37b3a3d9568e 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/h2o-2.2.6-r2 b/metadata/md5-cache/www-servers/h2o-2.2.6-r2
index da902a3231ef..54832065ff14 100644
--- a/metadata/md5-cache/www-servers/h2o-2.2.6-r2
+++ b/metadata/md5-cache/www-servers/h2o-2.2.6-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://h2o.examp1e.net/
 INHERIT=cmake ruby-single ssl-cert systemd toolchain-funcs
 IUSE=libh2o +mruby
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=acct-group/h2o acct-user/h2o dev-lang/perl dev-libs/openssl:0= !sci-libs/libh2o sys-libs/zlib libh2o? ( dev-libs/libuv )
 SLOT=0
 SRC_URI=https://github.com/h2o/h2o/archive/v2.2.6.tar.gz -> h2o-2.2.6.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	ssl-cert	c6ea4108da6e229ed3a7d2d949f72a26	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=097475f04e6d9a17d93d395a6f5fa0ae
+_md5_=2cdf9e85de39e83937c5f23dda6fd68c
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index e99854023533..74926435a067 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/xconsole-1.1.0 b/metadata/md5-cache/x11-apps/xconsole-1.1.0
index 31c7d1738705..1a0a472b3771 100644
--- a/metadata/md5-cache/x11-apps/xconsole-1.1.0
+++ b/metadata/md5-cache/x11-apps/xconsole-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=monitor system console messages with X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xconsole
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xconsole-1.1.0.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	fc35203be4efc2a0ebc64ed0543d8e17
-_md5_=1f42ed5596091ac1e7521b7c4ec3148e
+_md5_=5ab36fef90db03d38a59e0e458725387
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 8958f680ee35..b63fd282c819 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04 b/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04
new file mode 100644
index 000000000000..b38615207c0c
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-555.52.04
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/m4 virtual/pkgconfig modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=8
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IDEPEND=modules? ( sys-apps/kmod[tools] )
+INHERIT=desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
+IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland dist-kernel modules-compress modules-sign +strip +modules
+LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) dev-libs/openssl:0/3 sys-libs/glibc X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+REQUIRED_USE=kernel-open? ( modules )
+SLOT=0/555
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/555.52.04/NVIDIA-Linux-x86_64-555.52.04.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/555.52.04/NVIDIA-Linux-aarch64-555.52.04.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-555.52.04.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-555.52.04.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dist-kernel-utils	145861da258122cbba5240a850f1a5e8	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	linux-info	e967b81f54be6f49f4219a57ce7db437	linux-mod-r1	9ccd2b29cd75bd48092f8f46b07fc935	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	unpacker	7b40f3faa3e2e12f5cf6d36d0fbfcd09	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
+_md5_=6895cfbcb81200fa1ad1a876e07cda54
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201
index 29664e6b951a..a31857e0a408 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201
@@ -9,8 +9,8 @@ IUSE=debug +sna tools +udev uxa valgrind xvmc dri
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-REQUIRED_USE=|| ( sna uxa )
+REQUIRED_USE=|| ( sna uxa ) uxa? ( dri )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/b74b67f0f321875492968f7097b9d6e82a66d7df/xf86-video-intel-2.99.917_p20230201.tar.bz2
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	fc35203be4efc2a0ebc64ed0543d8e17
-_md5_=ba7f8ac84d7bf1097868bc27e3fcfd80
+_md5_=56c2542162c00e90eea64a11e6586978
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
index 4fa8c2fb85c9..727b59083c16 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -9,7 +9,7 @@ IUSE=debug +sna tools +udev uxa valgrind xvmc dri
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-REQUIRED_USE=|| ( sna uxa )
+REQUIRED_USE=|| ( sna uxa ) uxa? ( dri )
 SLOT=0
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	flag-o-matic	d309b9713dfc18e754cba88d3ba69653	git-r3	fbb2889c81f3a05910c1524db69425c1	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	e967b81f54be6f49f4219a57ce7db437	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xorg-3	fc35203be4efc2a0ebc64ed0543d8e17
-_md5_=db43a99de9995e23a3fd9f8d6205a477
+_md5_=30305f7eb2a1577ac4782a25a5a72a83
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 0fcf3cf88e78..2406f608950f 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xwallpaper-0.7.4 b/metadata/md5-cache/x11-misc/xwallpaper-0.7.4
index a9849dc156fa..aa8d9398fbc3 100644
--- a/metadata/md5-cache/x11-misc/xwallpaper-0.7.4
+++ b/metadata/md5-cache/x11-misc/xwallpaper-0.7.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/stoeckmann/xwallpaper
 INHERIT=autotools
 IUSE=+jpeg +png seccomp xpm
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=ISC
 RDEPEND=x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-image jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://github.com/stoeckmann/xwallpaper/releases/download/v0.7.4/xwallpaper-0.7.4.tar.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b2609ff5bff736931c82f57e45d3387a
+_md5_=ae98adc61b2f70bcad5cff3284a3af05
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 69346bf038f2..b9b02a68d447 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/rxvt-unicode-9.31-r3 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r3
index 0811fdd408d0..6ba5b1db86eb 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r3
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
 INHERIT=autotools desktop systemd prefix
 IUSE=24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel perl startup-notification unicode3 wide-glyphs xft
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.7-r6:= dev-libs/libptytty media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.31.tar.bz2 https://dev.gentoo.org/~marecki/dists/x11-terms/rxvt-unicode/rxvt-unicode-9.31_24-bit-color_aur-9.31-20239117.patch.xz
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=737cbf673f30344634a8996895a7da03
+_md5_=0a33cb91568c2f72276d5b2a00b3955c
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index f3714dfd6a73..7809c3c0ad6e 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1-r9 b/metadata/md5-cache/x11-wm/openbox-3.6.1-r9
index 71ab1d537436..e86114926fdd 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1-r9
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1-r9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://openbox.org/wiki/Main_Page
 INHERIT=autotools python-single-r1
 IUSE=branding debug imlib nls session startup-notification svg xdg python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_10? ( dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyxdg[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyxdg[python_targets_python3_12(-)] ) )
 REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 SLOT=3
 SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
 _eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8c8743c1820a3ec0dee17839158f117d
+_md5_=0c960aef45107151e62e46065daa4e00
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0a8e434fbd13..965c6eb04dfe 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18015 BLAKE2B 0f236b16aa7102e94bdd290c9f35570b14fb7fd85c65d186e87b6144aaab308d7d7d90c949a1a279026ed000388dfc6d58203e21b0ea6f443155b2f84bd0dac1 SHA512 f7c4e16fcc69c01f6670c47e53c3d66dee0c1805037a50a3c5b41e311cff17079a9031b211bdfb4ad68df22ad33fe9c562c28c14eec3932a15d0e9e3a86b3533
-TIMESTAMP 2024-06-04T22:40:40Z
+TIMESTAMP 2024-06-05T22:40:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZfl+hfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmZg6W1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBxmA/8CfitxZ/PqTaOtZsGqdZ1XMBJoIFGic+/q4m4CKLG82qZN0IStMDGA4Lt
-ILny63QKYI5ySiWFXOHRIlki+l8vpne3cd1F4dFLfdW8G5dfNF2gUs6vtmpQW2HM
-liK1wdhRaE9vHiQGJmKWiTrgNKNp0WUWJdfzdVnmV2F040IkZIacDvbtnNnXql1u
-tV1aP0RBsWhGoeEuVEnq/J5F0CEPKqjw/bQWOyD77KfKs8EjPnDNpUnftBoCTmdz
-/FFH29pDrfEouPhUv9wkyVlZqSz/IgEfZTOBWxKBveIkeGj4v1fW3TY6H5f5qb9X
-Ybi5TgydJijTJNEceeFVZBMZbH4jjtx5iSg2gSm7MCubfHv8OZnVsgJ39YfqxIIv
-6GTURI6Nx5W/l6BU0NrP9mY7gzmBhx4T8F8nYL5ycB2SCeBV/9H/e4XuLbtpmWYR
-Eho7YQ2yFC4JDY3cgTjfRZb2xH5/3tdYuS5sslNg1iUPbQ4tNRizmvorsxtaX9Bm
-5EvCVKPwIH0pUJZwioXUEikxiDLNYTdLAbOgBjTOHIzB7mg5HtmBOc21JsBZLEx7
-ntqvKsA3dLrj1BR/9e8WXNS8CmJDGJYzobOl6HAVjYitD/uMU8mm7WbroTpXwbqo
-qzFLBG4kbRwc7uAB+pvqfp0GqoddcZlzx4aWDNgrTfSFQ9bKXog=
-=GLpu
+klAZKg//UAwJp8XO5W1XYXhCNDCP9Kra5i2u+9c/NDQfCWrTMr0vWLufDLzLeYyT
+ZPkdcyM47UL79HQ0hiMq2TMlvggfAFc+E0UHvoXAHJfX6Q0StubXoj5ZqhhuLK6m
+6Vbh/KyiI733AT5GI6+/eohZKDxXPbhoPq//u+1JzeUD2NSa0zFbqAu3JPKvzirN
+2sk5iO+acUoGIoHn2/pVf3fRR0UasMy3pr3WH2NoLGh0dWwrZUxTle06t/QXDIU6
+b6FlkcgbryVMGbVfcgol+aaWz+fNPn2PootxVxXE3x+AoKw32WddXBBFtEsTkxrE
+UlVjdQTAY8M1h/FqA6mNeGKjYC+oaXR3o1y37vPRos26oqSY8LAjDUI1s0yP6GDe
+IS+XtYn+oRQdjbQMiY15U3ay/B5plvYoFUttrmC4weL7pDmwhjaA/63CLO/ynB4J
+pyEMXZbkts8z6Bgv2M5u7x+hS84ZDt7s+GF0djbWQdb9rinnpmeTKvRbX1KSrV4q
+bIeDwIPRgGN3P/Oi3ZOLwIIOT+iqKV0PTtc+Yb24EUzuNgP/FVZLifNEWw5rNFpQ
+dKTocqThBr+UZHIxBbZ7BiYXlXGC31mc4tsb/DYP5QYOYrt7rYIDzhPCCRkANVAc
+8RjIGFieiA58saCnOSEnh8/t7skK5KGzyzxerZ1VIbAkT4QSJzg=
+=VxWt
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ac06df55d509..fb94b98bd71a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Jun 2024 22:40:37 +0000
+Wed, 05 Jun 2024 22:40:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 40f8db918fac..7108cd2a18f3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jun  4 10:40:37 PM UTC 2024
+Wed Jun  5 10:40:40 PM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index daaa9c8f2565..767e1da7f416 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Jun 2024 22:45:00 +0000
+Wed, 05 Jun 2024 22:45:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c4c6f3b58e8d..2e719023a9c7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0822c43442ed125d2f6669413e244d174ba87cca 1717532457 2024-06-04T20:20:57Z
+5f9ecc19640283912a8d484f2fa5b12baf352e8a 1717620756 2024-06-05T20:52:36Z
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cc642b825eca..2144556f4817 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1717540800 Tue 04 Jun 2024 10:40:00 PM UTC
+1717627200 Wed 05 Jun 2024 10:40:00 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ac06df55d509..fb94b98bd71a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Jun 2024 22:40:37 +0000
+Wed, 05 Jun 2024 22:40:40 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index aa2a7f3be896..9b923605aa30 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index debb9326e99f..7547c7abb0c3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -13,6 +13,6 @@ DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 536743a7e402f7a511d7612454d9770f0e6
 EBUILD wireshark-4.0.11.ebuild 8629 BLAKE2B 570d1896cdc2a12deca6e12740fd6db574ba4591191541e329c9a9e71bbcd71cf3bc547ef8be4584ee5d7d39715ea4498f6bd558b5169e623cf4f3f68f17a49d SHA512 f8c4693e14e9d7b60832ffacf70b79ecb387abee9abab3f02292ef06f08a270b3580a9e0a7569d27404b22a05adf6159027f6f494bb9c81bccff57fc389befe9
 EBUILD wireshark-4.0.15.ebuild 8630 BLAKE2B 580ac6e5184c69d9766b0697a22f147840a181b6014421d01846628c27c7506ceb564a2dadef2cb6181c26795d6488fc86a5d8b5383f0add5c735beeac6a317d SHA512 19d09a778fdd24998a0f5879b6ce32311745111b53edb46cd41fd953fca0fbb6090a20bf99afd98a276bde7b36babdf557f8822b582e05b964b891196424b4f4
 EBUILD wireshark-4.2.4-r1.ebuild 8904 BLAKE2B 3d9d741806defe5c9d87d6ecf240632cb4a18561aaa9c5c59672ce351c04d8d601e26694e2bd25a82a19a110099bcc982286dad2f0c2b0ba2f829b44ccb69079 SHA512 6b22e258580abc67c34da5ab9b8430cbd9533c5c026bbf46ffbe61966f218dba7e6797769ae43800400664ca3ced3606c976ea60cb0f8a8a8e6beeadc129cb27
-EBUILD wireshark-4.2.5.ebuild 8826 BLAKE2B d4529cec9eae4eb887e96c3c30abddec5a8b4512fc94fdb874130c568d7d60db58cc180718a8df65b0e61bdaf655d19aa973f9369cef63c2b093eec6d7cc7285 SHA512 5e61f48782f8abb40a20702874ef998b9f459dc91c648f04f9937b89c42fd0b8d57695d19e7ee9268f9902ef042773c0fee1f22aa5519600da3e6aecd085c180
+EBUILD wireshark-4.2.5.ebuild 8833 BLAKE2B 129f9c0384dfce149b9cd6312fe68d5627730a84291d6c66caef8cb85d71fbf4d6eea47b580334800cd0545d75c908e0a387d50cdba397908387a2555895699c SHA512 a1cf1743ce049a7a1362d766d60da2bfb24c3cd1cda7787aba4df1e9a77b69497259570a6ec81963bc75c3a8312790d9afe6a72b861c0d24a95131a5704fa352
 EBUILD wireshark-9999.ebuild 8818 BLAKE2B 6abcff955a4a038252f5ef742c39b98f35ed912f519916c7ff8c008fa133fae0d71fb66f726d85334f80d85d4b342710b3864245a1db399816bda946d98bdaf1 SHA512 f1549fe351261b790f3bfddf4ec1331e10195e1fda7047686d04c590cec3fd490fcd09d61b586e0edec74ac33db1d73f762f488dd8d80c896dbb4f88ac6f3cf5
 MISC metadata.xml 5352 BLAKE2B 319ae9385ccf49cf52abdc3bb2292a6181f8bad974eecb1863b69dc248e8e1b17d95de5c7267e4e70ee28809bffc82a13f06de3e7d15541d32e2e2ab7ada638f SHA512 15580364ef3f86e9d4020c8b7e2e765a2be97742dc398d11697b87e15085e1a95e951d0200eea71484fb8d124d54b86da8542921c0b8f29d064a26681192d919
diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
index ef484db79a7e..111f677c7d23 100644
--- a/net-analyzer/wireshark/wireshark-4.2.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~arm arm64 ~hppa ~x86"
+		KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86"
 	fi
 fi
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index c138d7c9e225..08f316e3a48a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -28,9 +28,12 @@ DIST zabbix-6.4.14-go-deps.tar.xz 33272120 BLAKE2B 1554414dd9ed837938d6d560b01c1
 DIST zabbix-6.4.14.tar.gz 46517773 BLAKE2B 5036019a051b6a84209a695b1a0aa33b65800e21ee77e61a80edd113999230c0566741b27cdc2c973051cfe8b87af446dd08ce1b92e6e1a71f844c16b17f8202 SHA512 fa1f404a509d0e7f78f195807469cedb049e06a9e6bd6afe53fa7f87bda008ad80158116b13558ef537ce25cb1974a920d73c6338cade9903b2d4d6d02b83317
 DIST zabbix-6.4.15-go-deps.tar.xz 33572368 BLAKE2B 2065ede50e7682b180387e08b2b2e9893fde4dd5316d2087aa7931a0e08b100558a47b49e9e5204f60ad9e0ce480dce9787e7a43d3841a67b9ea96db80fd1703 SHA512 347b51492147e203a2d7966fd8fe8f2b044fecd45948a767fcf4f79c96cebe8774643a1d0940a76103d25eecf852770a3a7c156d371a3de2cfef2121de5c076a
 DIST zabbix-6.4.15.tar.gz 46631895 BLAKE2B 3f9c23db6e8d0895b1fb5566b2cd9877d1e219c17ebea7dc5057621313c9b6f7ecd5cf1bedd3f759dfa4a429a87b50b06b97bb663d756817027c2f04ce3a625a SHA512 2fb032a02e3c507807dde140fdb17ad453ba199c724f3eb7e0e053d64df3c4f57bbc63b794eedfb3b5000f23bcabb5d6aa89039fa6f1a118c70f5cd44fd5ff02
+DIST zabbix-7.0.0-go-deps.tar.xz 33347940 BLAKE2B 7da8c3ff2bb74c31c551d61fa3d5ffc6d6a330361eea178dffc5379412da2fce9330acfe35bef2ae1c515a47ecef3ff24f54f17692cb32226d928b4f1d2072e8 SHA512 a365da2fb5dc3ecdaa2a4c4ee53aa022b298ded16e150814cc0cbd3b9dbaa12d5f163130724ba2ac6a129acc99386b7fd81ca3834d69fb856bdc805d90c0d3c2
+DIST zabbix-7.0.0.tar.gz 47919968 BLAKE2B dc6736a1e433b5f0d742ec9e908b47a0094da77f69103d566b7476379a28819e46d9327d53e388b9ccfeb7b3b4d976fb47ba94a02057ab62ef8294e19af00188 SHA512 3302f6f7b8731e25c87d1582f897d25b8e9b5eeeddb3632aea57e39bb7a47acbaa5e74e175e83166ea3476e7e932f3282b6cc353104cdfc87dea3d4976fbc703
 EBUILD zabbix-5.0.42-r1.ebuild 9819 BLAKE2B 7be0b02fa0842b250033f883c48f41963d6a0998054fa443ef26c910ffb77c1c1e40e54628fd90de8a8a24c20f45783d7570408a40e6eef727a1fd0ecaabfc3b SHA512 793e988e130abde40652ef3e9d594c46918332aa11da855b68196f23ffd206d237a21d031b21a836ab2ec19b1bdd860b21f8733631f9b2874b51787dc9b681d3
 EBUILD zabbix-6.0.29.ebuild 9934 BLAKE2B 82ced7b4693f61272cd933c319188ee41934b7be0494c1ff81312e1426f54180bd32dd267fd8073cd10f054b17dbb4204924f379c9b3b5a77eb82a8109002895 SHA512 fb1cebac60d5f86d5073f09ca85b48de0e42639eb622a49e8be4774edc4d6f25c7c4150c98611945eebff92a09dd5058329a7506386a178cc8e3d905ff2bf9cf
 EBUILD zabbix-6.0.30.ebuild 9935 BLAKE2B 709f063488c60e870ca41ae8e4fad65d56745d0cf0434ee63015b52508910f98c4eed268ca59c4a5cf0ec00591ebe74e1653f0ff0491c0b5421719a9a2945ad2 SHA512 fadde9d5c32db0c9d7ac9102542093b7168e1b4b2bd1f5ce4515f5186b3cf94de244cf5f54066308a25f6836dc5b3ed4c00c89c3a7528c5e937e3fc1c95d2662
 EBUILD zabbix-6.4.14.ebuild 10086 BLAKE2B 4d6704bafa8c9370856f7980be82929fdc45906af1b66b4f51934abc88c635847728a5a8680e6db88cf38883dedbcd64e28f4b70eb2b82e7f58fdbd75e6edaaa SHA512 dc9a6c4d50b64a9298889f1acedeba11c4e3a5d4292d8e796d17643deb79c860fe30b927a760adf14b447537875a02e5c8e9532a8470430625a367e0e0043773
 EBUILD zabbix-6.4.15.ebuild 10087 BLAKE2B 3de8cedfa2081795d888bd0d922457bb35decbdd4fbae7b276e3f16208893405e9449b66ae6fc3a12b99eb00ed21b6add86b6f4229402d88db3ef75d3c207343 SHA512 5148088dca96b51e8fc2ab86d129dbb3d3d76f0b898aa53d43be1be2e5cb859bd435c31f538d6cd81c56b30ed65c02beae0824ac1b0a5d4f4d71f085abbecf93
+EBUILD zabbix-7.0.0.ebuild 9414 BLAKE2B 79733c3971e69775e6ad25790bd91f7b4ac9263b081cab82b8f70f8d7647c31a3ab927d29f0ff868a1cf5005c28904f7b619a30926f663f83d1e163ac1e0d0d5 SHA512 d51f336ba57e8e3088f3881f2c2efda169a9059852abe1564f37902392000d3ff34c7a5782ef652065e3c99391e7656cc06fd7ed111d60f0af94aa7ae899cbb9
 MISC metadata.xml 1576 BLAKE2B 877e83a97b492fe256f3459332dacb4680b2ddeaaab34c077f1ead5eb387d8f5ef6f7cca85435eedc85cdb0db7243a805a8b49c5ef7b1b7dce39a9213b401eae SHA512 77d805096f0bcf2f3650216c69cb33c7dbbcdfc8b7c56066463ce5436af30dd0e9b8c6d124b59bfdbdac4c18aa628c92f78722920284622065af0ddb6448cd3d
diff --git a/net-analyzer/zabbix/zabbix-7.0.0.ebuild b/net-analyzer/zabbix/zabbix-7.0.0.ebuild
new file mode 100644
index 000000000000..cc85d52f0b50
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-7.0.0.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="AGPL-3"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2? ( !gnutls )
+	proxy? ( ^^ ( mysql postgres sqlite ) )
+	server? ( ^^ ( mysql postgres ) !sqlite )
+	static? ( !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+	"${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch"
+)
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch".
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b68f2942c7c0..c02c040bec51 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index be0fc9a60dac..cd8c3370c53a 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -10,6 +10,6 @@ AUX nsd.tmpfilesd-r1 24 BLAKE2B ae4078bff0e71d9b47d02855f7e7ab2389cc83b40af65722
 DIST nsd-4.8.0.tar.gz 1273228 BLAKE2B d1e6a5e8fb158bb32081bc7674d957e3f5a596ed10ee89dd6a5f6af9a79a8c130f2de7070345bee69cb7798e9f373d856a9336a9e9f65f733ff45e15e94833ff SHA512 13c9cffffe6adfcbabf744ee2effebe6ae265d83476345a1edb60dc9c6d7f838a5e239e9b18e667924e5e76b74b2caac63818fcaecf7f0fa651ff21736174a46
 DIST nsd-4.9.1.tar.gz 1309953 BLAKE2B 4a43db480be7196c0a177cc6ee2b9cd6eaaaa9af4d0c3dc7b8f07a5b9e24fd4eac816a29f83de870efe012f2f3bbcbb9bdbda903d05bf9d96574bddc97f68547 SHA512 65cd38aa8a41aee57a6950747de448bc4007a2d2c095152f1d22006f85faa7f0732ec4aa0aeae9f46bc69bff17164d8fe384bbc3441d0484364c4af938b511c1
 EBUILD nsd-4.8.0-r1.ebuild 3218 BLAKE2B e591458f0b53f6f0e0bbef131414779e2c7c151bd2de1747660b468b88e5882efdc807991809061fbeaf4348d3a23b16abb95616f25564c002de8bbdd97d9861 SHA512 3fd01e8bc80fd69dc42b1046522d3680bf6a1700df1b986a934baebdb018ab30de3b6cebb4e3f073b927182bd5058271a6197895a5bba0e71526b0000910ab4b
-EBUILD nsd-4.9.1.ebuild 4138 BLAKE2B 45b12c5bc167ddf730be5d349043e2684008a6c950e8bc408a3fbf2b8913c60b79f746adb0e45521a0a64971f6db4385309c6303a3a5136ab9eee7c39e8e6d36 SHA512 b243f631a52d14512da7244a782b8afae3028a8f049e996bb242367c1db70a160e7ac911f7d61b96dd1c32100fe838a8921f421206541a3bb1f4233a4b2cb96a
+EBUILD nsd-4.9.1.ebuild 4138 BLAKE2B bc60dd14f5742d9d17c0c3da540e2a88499276d42ea1a500b71028893d0fa68cda3154dfe00ce9d14893dae40789af645c95a49d765e2284035279680eee2f40 SHA512 812aa2032ef66ed4e0f2ac6c6c35b60bda0e695f612d159eab5c3c4524c8f068cafb1126437441080440f607720d055357c4cc3e17be12695169fa363e7a9f40
 EBUILD nsd-9999.ebuild 4015 BLAKE2B 7b200fc2c78bbde5cac4673c2a44857dea9a514606af78c5c016dd26e3b51efccfc6968ce6564e3ef99505f50b0d3bbc857227775918bb0b27e2b073c136db8f SHA512 a777f279f72307778e7ee6b12a119a5c41f69ccf4e54b90421dcafce50f2e97564cad83d365e56929253d1a9aa16bba7e05149a03d1a5a8ec439c6c04970f3c1
-MISC metadata.xml 1896 BLAKE2B df1aa7c5c3d809ebeed55651c57fe0560625730d9298d109718d9fd563d712859a2d8c47d4b9d0d2c444b684af79f015a84fb3c7d5e7bd67d30f6d2533174f1a SHA512 2c6306608ec0c26b6bfea66b2e951a831bad901f8eebe3785bcb99c1d6450e56a29c4a3bbdee974c1cb8e0e912ccc5a13aa1926623f3f2dbb5fb9da7772ab668
+MISC metadata.xml 1959 BLAKE2B b4f3fab50a0ea94afaddbdb2911d6435be479ad73fff5850faf07dc2aa8ddd355aa9c50aae9c346e01b4e4c6cd2cef0927cc941848355c57cc047d649d3344c9 SHA512 146cba8e6dc3e568c1b34c3c2efcef2eb78faa89db73f105d88b5015aa316ee5f0affcfd1d8aafbdb2e9cb9adb52e299a2ba4808db831f2c910e457d4d291be8
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index b674d51d0880..1afdcd842cc0 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -12,12 +12,13 @@
 		<flag name="ipv6">Enable IPv6 support</flag>
 		<flag name="largefile">Enables support for large files</flag>
 		<flag name="libevent">Use libevent or libev, useful when zone count is high</flag>
+		<flag name="mmap">Use mmap(2) instead of malloc(3); currently experimental</flag>
 		<flag name="memclean">Cleanup memory (at exit) for eg. valgrind, memcheck</flag>
 		<flag name="minimal-responses">If minimal responses are disabled, responses are more likely to get truncated, resulting in TCP fallback</flag>
 		<flag name="munin">Install a plugin for <pkg>net-analyzer/munin</pkg> to graph statistical data from nsd</flag>
 		<flag name="nsec3">Enable NSEC3 support</flag>
 		<flag name="packed">Enable packed structure alignment; uses less memory but has unaligned reads</flag>
-		<flag name="radix-tree">Use a red-black tree for main lookups; uses less memory at the expense of more CPU</flag>
+		<flag name="radix-tree">Use a radix tree for main lookups instead of a red-black tree</flag>
 		<flag name="ratelimit">Enables ratelimiting, based on query name, type and source</flag>
 		<flag name="recvmmsg">Enable recvmmsg and sendmmsg compilation, faster but some kernel versions may have implementation problems for IPv6</flag>
 		<flag name="root-server">Configure NSD as a root server (OBSOLETE: removed in >=4.9.x)</flag>
diff --git a/net-dns/nsd/nsd-4.9.1.ebuild b/net-dns/nsd/nsd-4.9.1.ebuild
index eb62a90576fc..53cbc4f1d5f1 100644
--- a/net-dns/nsd/nsd-4.9.1.ebuild
+++ b/net-dns/nsd/nsd-4.9.1.ebuild
@@ -122,7 +122,7 @@ src_install() {
 		exeinto "/usr/libexec/munin/plugins"
 		doexe contrib/nsd_munin_
 		insinto "/etc/munin/plugin-conf.d"
-		newins "${FILESDIR}/nsd.munin-conf nsd_munin"
+		newins "${FILESDIR}/nsd.munin-conf" nsd_munin
 	fi
 
 	# Use the upstream-provided systemd service file.
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 09673235c478..2e2531d7cc73 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 8307a48cae0b..ab929de8b5c6 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.54.tar.gz 101434444 BLAKE2B 0906baa1f68c46120372c3228858119aa73470966cdfdc5edfe3200fb4d3695c36e375e4687d914e881a08bc9216a69c1ea5ce49479c61d9bc08b76681999250 SHA512 ceb6265e846fafd27e3c2941f00f0a2d4e045abe5471a2691b070bedb330ef345edee838a706b27ff65ecce40aec46b1a1dd9c4bb9763dadaa907ec181c1a222
-EBUILD discord-0.0.54.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
+DIST discord-0.0.55.tar.gz 101431088 BLAKE2B a4d7826f1198a988653996bed9a91a1005d26dc97be95ba1be3432019cab773a8eaf4dcf2b5bf281a8bbc195c4b0a81e8f2923a69705bb9a450c7df81c169e9d SHA512 c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b
+EBUILD discord-0.0.55.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.54.ebuild b/net-im/discord/discord-0.0.55.ebuild
index fefed5b524d7..fefed5b524d7 100644
--- a/net-im/discord/discord-0.0.54.ebuild
+++ b/net-im/discord/discord-0.0.55.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4d8142316882..b95b435f095d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index c1779542a4e9..1b1dda07f24a 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -1,6 +1,6 @@
 DIST nghttp3-1.2.0.tar.xz 387592 BLAKE2B b3ad897fda5d616a93f063bafde760eda6f597c90de6c81793abef3ff30de05bb2a06388fa868f95c0871a6592331d17a2d344c63817179ad21c6390bc0e499b SHA512 51ade6b17215eb15c92b18ad7a94b70e0a442d5968aee31ec734e5826d09ca34197e64407a1ac3f7bfb4ed1a0b3c3b58afc4a152542bacdcc4c71140931a7652
 DIST nghttp3-1.3.0.tar.xz 390176 BLAKE2B 8ff17da3e53efb27b13e9ab17dba4ca27cc8fd948b160a36a0b0496f61a49c2729f1281f9a29cb8fecd4dd2c274696885a3c5e001be3dcfc30f5f1c9b6339467 SHA512 a862e7a3c3f6722b07d5437976850b2998032d1f7b9da7a49e6863d59c611ff7204c9923e8e570301a9bfbd91931a30f8f85e96cfb35481783adfc2f955a8b8c
 EBUILD nghttp3-1.2.0-r2.ebuild 742 BLAKE2B e279425fed0370a7b99265a40b05f88ee0fb26a92d6b2fcb34be2b89d501d53db508a58cffdd12e40450cc74d73a27540504119c7225d583f7ea335822eab0c8 SHA512 23a87ea01d7396498e8a5ddd9b7106451fcbd693b3670e1db1d99d9ff69d67711dbe105450ada8e6caf32f622ae392a31c74fe7807f379c89545f456f56f7dc1
-EBUILD nghttp3-1.3.0.ebuild 750 BLAKE2B 3d88815774fda6d6a1aa1021ae1bf9e7793fdafeca0d356400edfd1ec953fbd46f94afb68ef29c198c50ead9ce7cc187989d1b9e9a530d58a42a5978bcdeb377 SHA512 23ab44e7b0b8fa4358c28b59f1a3afbe5b80913d34c2cf5b7b99e4f585333697440ec994c8ee4d56ec7e0d9c3b48a84f89faeac69014fec775cb3a4e3edb73bf
+EBUILD nghttp3-1.3.0.ebuild 757 BLAKE2B 47f7189cceacc6e8c745a5f3d7e99bfea2096e57767e0c256f48fd87b95793743cd6f937b796310d5457c0a8f50906ca1f0c1d30d5e5615e0e8ee05590b4606f SHA512 b4b8d39ad767f52d34e778b92866049036e482de4533da52a5d29fdf51555e95db7befb1087354365d32648f13914c6fde6a983205ce22d26c520d3f218dbc57
 EBUILD nghttp3-9999.ebuild 742 BLAKE2B e279425fed0370a7b99265a40b05f88ee0fb26a92d6b2fcb34be2b89d501d53db508a58cffdd12e40450cc74d73a27540504119c7225d583f7ea335822eab0c8 SHA512 23a87ea01d7396498e8a5ddd9b7106451fcbd693b3670e1db1d99d9ff69d67711dbe105450ada8e6caf32f622ae392a31c74fe7807f379c89545f456f56f7dc1
 MISC metadata.xml 328 BLAKE2B 6f0147cead329ef6b779485417ff33e5814b0cd86e99b571b0dc5653a7ca8f80f65fddb8b1b58fe249b7b86c0aecd32a446d415065fc70a0c72bf69651b19d25 SHA512 54e49a9c82c6a7f7a50daf557416845fa5c548f11ca243ff236105ad97903ea983436e94067c831b93ca95da154dd2561e314e96e8bde6d4678efd1adaf02f11
diff --git a/net-libs/nghttp3/nghttp3-1.3.0.ebuild b/net-libs/nghttp3/nghttp3-1.3.0.ebuild
index fe7d3db77a65..3e88aaed40b1 100644
--- a/net-libs/nghttp3/nghttp3-1.3.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-1.3.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~x86"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f06797f23561..554944b92be2 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,6 +6,7 @@ DIST node-v18.20.2.tar.xz 40550044 BLAKE2B 119e1c0a1817b982940704c3fb92bca8fa09d
 DIST node-v20.12.1.tar.xz 41743360 BLAKE2B 1e2819724051720321a429bb18967a12608e8f93ef1760c520a40c9130e6138f95ab4e87f1acbaa72142bdd801ec3050bc42d7e4fae8d6a62192c3511b922e0a SHA512 c51c4aa37cc80f3fe34381f2cdf431053124ec6b83fc8490573502adfab48601c382448132c9962ab135bebaffc257a9d5b63334ba8ff480db57b5706bbfed67
 DIST node-v20.12.2.tar.xz 41634476 BLAKE2B 4a402cd4d2a3d59e249581b8dafbd09802f1fc6c1173810a7198ebf73bbe9ccbe085226c1889461d6faa2654138f21a2636594dca1a02847af9fd64ef80293e5 SHA512 2ff2873f3e1a15d529d07a74af601194c9dc7c24e566b989c96fadda8636d7ea1c97787642e9483a00db320cf1cf0817b43c4ba3ad45b15a241997c9f0c6c288
 DIST node-v20.13.1.tar.xz 41770976 BLAKE2B 1ee95ed15aecbc5d611abdba305f97adf2769e769db8ecccce1609aec5ed8e746ce4531d7a809bacec1da304f2dea44e98167ee01c57da0250c6a8b54cafa984 SHA512 646ac044e5699ba4740d3d4caa262b1c39b0a590c333fdb05bd35f4cb1bc52695b31169fb94264417dd553f46706e6dfea5b31eb336ba865d05397df67ba3b15
+DIST node-v20.14.0.tar.xz 41795876 BLAKE2B 588c380751c12f05ccc95146f6e7f9c3eadfc77e769d836cdca1832a7739a40723fd9a7a4e59a2ab4ad087a2b2def5da76ec28077996b59ae0a6d5b2bd15d2c6 SHA512 b6148c705b2152b20c6567a9bbcbbb3925972d17273e126613b350d1d117600e2d895a93d70f793523cb903337ace9527c541a38cb10137eb81ba992778ed243
 DIST node-v22.1.0.tar.xz 44377532 BLAKE2B 161618a71d8f2c5f828e29e45f5eb410fb2c6695012ca7559bddbe3884e578d643414ebf59c1b3292dbe93bf115de43c4145f6ff24e11fb9e87a32cf4eff1859 SHA512 d991fe069e43cfab587f06e81df71b56b82fbdd7042cdbe46136fc9ccad654d6f8bd39ec9fd3a5c00fe73a82732b12e13632c26602c6f8d67c628938c2a55688
 DIST node-v22.2.0.tar.xz 44334460 BLAKE2B ab81534f1bc97ed66aaa60b07876605315ffdbffba97d2e2823ca570ca2ffe9f413e0dc7ab34ca45db06f7494003a79e583964c5c8f14787b34b60bed98a8a6f SHA512 c75c4907eaabc042c75f2c2aede8e23b2f204b70f4a777405132b3548ae35e58413f80147e3d7fadefc8048bcae175fc3064eda0138718e6f38e1dbf39ca8050
 DIST nodejs-22.1.0-deps-import-simdjson-3.9.1-for-GCC-14.patch.xz 192248 BLAKE2B 8acd447cea7ce7d68750c89a1778f0b43279ecd3b7fdbc4db36b9d0f97974efc6769266fbde2934b80e96db5a11f2550098b92d74ef72708d6e2cf542ebf0060 SHA512 7fe3f057b8785ff944cee5ad185a8708ee114f86344b9199f03443d149bc26bd2434c1ad32b8eb388f982f90632643b28aeff60177403c4851d3e7897b0272a6
@@ -14,6 +15,7 @@ EBUILD nodejs-18.20.2.ebuild 7438 BLAKE2B 156d9ca41a4c966d641cd6ba0b4a1d56634dc0
 EBUILD nodejs-20.12.1.ebuild 7599 BLAKE2B 10339e186e827ab88b9830fbd76bab4a12a181fab9d6a6ce054948d8e1e64c32e54491bcc29ef6304827da39352f25ad73b01122c872c2667ee9d945f43368ca SHA512 cac02959f6cdfc3d99dbf918b910453a8175b2fce0a8dcaeebc64a21e4cb4186b19d5f4ce46b237de52c7e66e8f9a9dc4a353b9c12969f7370c82d91ef281b02
 EBUILD nodejs-20.12.2.ebuild 7522 BLAKE2B 29dcafce452678b5cce45321961fa50fcf95571f71990e4266589a9551ee15d6538b46af8721150a34fe329aa352937af38c7f29e5a53e265108841302d952b5 SHA512 5cd70ce3dfd4c0a1102be071784a0964b990b53e0729652a759b2d3d8678e4eb0240bbfbc943fd836e11965aeae4de70040d93654892480845143971b50127e8
 EBUILD nodejs-20.13.1.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b
+EBUILD nodejs-20.14.0.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b
 EBUILD nodejs-22.1.0.ebuild 7809 BLAKE2B 461d79a24bb270546c396e6a94d584ced1abcf604671c9606be953e89cca87b8fdc8271073fce2485744d5395568f861b17d6542e783edc7677978fa15ab863a SHA512 48bb51eafd4f1dd5eb08e0c141186db7d27ed6d0fa3219042a9abdec24335cfedd400308e0a551976f9f917b043433bcd926c86381501ed88b4af1b1ec0da729
 EBUILD nodejs-22.2.0.ebuild 7788 BLAKE2B 8e1de08dd2d0d60367d72c4dae504f0cd542da5f316daf1f706b9a871a5ed3cc52ee4f153ed83ca82d29e1da32744452badcdaed22351761378f08a01b6f8d27 SHA512 d302640c0c5857204d18d759ce607bdbce5bc490f6188b6218f52fb9b96bf2c20a182c819bd4bcc49aff7e2e951155fec34861a9f27401cc71adf0c7b9c8b625
 EBUILD nodejs-99999999.ebuild 7406 BLAKE2B 71b0f9acf3a3cdf3181c7f1dc3ca2a290c5fefce6be6ab017483750a31f7bf3c996984b91f03e1144b2b6bf3cb852529b9f620974ab0484928d6a390890cf2dc SHA512 bc0b7c5171f11b9b2d29915e03614272653baba609d505885e4aaf5d51ed40291e82c5970bb7e914e41604dcb3788ecb85a0d5e8a9770aea73f77136f6915d1e
diff --git a/net-libs/nodejs/nodejs-20.14.0.ebuild b/net-libs/nodejs/nodejs-20.14.0.ebuild
new file mode 100644
index 000000000000..1ce818bc4013
--- /dev/null
+++ b/net-libs/nodejs/nodejs-20.14.0.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CONFIG_CHECK="~ADVISE_SYSCALLS"
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )
+	x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.46.0:=
+	>=net-dns/c-ares-1.18.1:=
+	>=net-libs/nghttp2-1.41.0:=
+	>=net-libs/ngtcp2-1.1.0:=
+	sys-libs/zlib
+	corepack? ( !sys-apps/yarn )
+	system-icu? ( >=dev-libs/icu-71:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
+BDEPEND="${PYTHON_DEPS}
+	app-alternatives/ninja
+	sys-apps/coreutils
+	virtual/pkgconfig
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+# These are measured on a loong machine with -ggdb on, and only checked
+# if debugging flags are present in CFLAGS.
+#
+# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
+# limit for memory usage. Disk usage was 19.1GiB for the build directory and
+# 1.2GiB for the installed image, so we leave some room for architectures with
+# fatter binaries and set the disk requirement to 22GiB.
+CHECKREQS_MEMORY="8G"
+CHECKREQS_DISK_BUILD="22G"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-lto
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
+
+	local myconf=(
+		--ninja
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-ngtcp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use corepack || myconf+=( --without-corepack )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case "${ARCH}:${ABI}" in
+		*:amd64) myarch="x64";;
+		*:arm) myarch="arm";;
+		*:arm64) myarch="arm64";;
+		loong:lp64*) myarch="loong64";;
+		riscv:lp64*) myarch="riscv64";;
+		*:ppc64) myarch="ppc64";;
+		*:x32) myarch="x32";;
+		*:x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -Onone
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
+		doenvd "${T}"/50npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	use corepack &&
+		"${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	local drop_tests=(
+	test/parallel/test-dns-resolveany-bad-ancount.js
+		test/parallel/test-dns-setserver-when-querying.js
+		test/parallel/test-fs-mkdir.js
+		test/parallel/test-fs-read-stream.js
+		test/parallel/test-fs-utimes-y2K38.js
+		test/parallel/test-fs-watch-recursive-add-file.js
+		test/parallel/test-process-euid-egid.js
+		test/parallel/test-process-initgroups.js
+		test/parallel/test-process-setgroups.js
+		test/parallel/test-process-uid-gid.js
+		test/parallel/test-release-npm.js
+		test/parallel/test-socket-write-after-fin-error.js
+		test/parallel/test-strace-openat-openssl.js
+		test/sequential/test-util-debug.js
+	)
+	rm -f "${drop_tests[@]}" || die "disabling tests failed"
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	if use npm; then
+		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
+		ewarn "	in your current shell"
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 29a0ec24f4c4..68b247ea7b43 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
index ebf975541a1f..195e14bc05b7 100644
--- a/net-misc/redir/Manifest
+++ b/net-misc/redir/Manifest
@@ -1,5 +1,5 @@
 DIST redir-3.2.tar.xz 84240 BLAKE2B d1b48a14ea83cdcd58b7b2449e340e5cc110e212f17ec2f56cb8a914bc2c880d009d102dcb2cb1ee723ec4e3ceb48cd396731863fdc9ae864fe4fbf15ed90eec SHA512 b379047e94f377847b15c4e4c94fa34be996fbf6b26a83670061d705791902b184e89270887a967b2aed993f9ca46c3d0a41cde6b162ff9b32dbb689c1384c6f
 DIST redir-3.3.tar.xz 84980 BLAKE2B 3275e8315dbcd4666adc5064af80848f3c41378c46880ef825bae4d5a6d5a4246b959596a6810f5484db033d3f27a1b1860e40c250b29c75defa600cdf48a5d1 SHA512 89d9b45bc62538751cc0d8baf8dc3dc5ed84888faf18125c4044bb813ca415607b4906e9f5ccd60484eb737ad44d5c3bd22458444dee58d6e3be31446a71c3f3
 EBUILD redir-3.2.ebuild 406 BLAKE2B f56fd6a4978b60bdee782f132345c2d1968a12edf922e88053341f2c9066887214b849b95f1341c9fcfe0aba2562c9e639d31a4cb7bfff43b66928bdab827152 SHA512 7b5e7f4a20b890d2ed80b4e74ff9ad099ca428b1b5f3a0edce1f579768cdb023e060553462c50a7171bbc63f366417e2cd0b2f9e7de41b95dab02d2359d58119
-EBUILD redir-3.3.ebuild 405 BLAKE2B a5fe2f4ace21232008540552c27db8c27bae9f678fa026e4db87a0374f8318521bab44cca0643d5b8a2db1da2e2de5925de15bfbb1906d3659f1ff512bb23721 SHA512 3435154a1deb64a1bc977f51476742ed7570b4e23b592bdfd103ec276a271a0206ad1a542336a43e19b3de22f1a4735ddbec09a8e96e447bf6e7311a60da8aa8
+EBUILD redir-3.3.ebuild 403 BLAKE2B cfc0509da5ba427e91c6f7638fde6a39de552f472822707bf4508a4420c48b780925c728947754d4c55b1ddcbb57b0838ed7453a14958e5623aa18e3a3a34b0d SHA512 66b3f557fea2c507503c4b178541300d90fe85fbfc14a7efffafbdc71aa4b0ae67a1b64c174a7d99ce284fd4bb4c225c6a1c17129c2ef876d83c54de3070edba
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-misc/redir/redir-3.3.ebuild b/net-misc/redir/redir-3.3.ebuild
index fdef86a0e2dd..26a860e1ab9f 100644
--- a/net-misc/redir/redir-3.3.ebuild
+++ b/net-misc/redir/redir-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86"
 
 DOCS=( ChangeLog.md README.md transproxy.txt )
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 7c4d2ac19c2d..655cb5d95066 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 8bc40d94a7b6..bb193ede8e6d 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -44,7 +44,7 @@ EBUILD openldap-2.5.16.ebuild 27566 BLAKE2B bfa87833b63588a49894bed58e9ebfa3ddbf
 EBUILD openldap-2.6.3-r7.ebuild 26489 BLAKE2B bac191a6aec9d0e70e16693d92e4157507e414cfd137a006ff3086479b58a563f1fd3a6a1c019b7afdd9742ff46465d8734c72dacc2c3ed3449d29a8900c3f77 SHA512 2cb92ff6bc8736ad968eeca11ea5318b7999ca900fa2f82f5783454628576a2c94f365205faff39015a7b04460444ab9154ed0996af4d758ee815690769ae1fe
 EBUILD openldap-2.6.4-r1.ebuild 27693 BLAKE2B 2360be6d6be5c525240fe0a7c81d61ba0104e1d3d69e1e09a6eb7b3b1af343a95afab8319dbf78e93190caa11bfef2b283e430a901d04e291496c9ce73af84fa SHA512 a0d86f99e4abcfbd61d05d3d4b23c2370e60872ffa8831ce3184cc660f7491b3d8de70ca3d233f3cf26b0cd339671468efac6856d46da80073addbd0e8dd6f53
 EBUILD openldap-2.6.4-r2.ebuild 27843 BLAKE2B 9492e886b0e2872b77a1f8454188a892be2c7042b63d4de3fe51d74d604fbaa0e9a7a67cb781df8a8b45008f2df4ff70e7c7101775bc0c439c71020c7b60c179 SHA512 8ffb64b3f07bba05762a79e4fa71bfe2c2b02b76208138e55b821d26ce1cafe175b1c775e81f38ffcfc0c13681035a3f05c2662fa2a0b6883fa5c2e5220a9e6d
-EBUILD openldap-2.6.4-r3.ebuild 27840 BLAKE2B 2de3179651d515f6c33ff237e52cf5a8e3ed3bd56cde94b458f4084da685aba608a7c424caec7a8d4b51af7542804124b96fb254c301b0eb9f434ed0d5f79d0e SHA512 efad61fb31f35122820e9f350562ed3598fdfdcee8677e5c84b39e341e23bff332488ea20d9a8bd4c2f546201b1a236d2b09a662626912113d42b5f3915f7ddb
+EBUILD openldap-2.6.4-r3.ebuild 27838 BLAKE2B 9c81134e05257fe88158cad12375cbb5a39bcb686dbfc2017186e9ec3b0d52cbe71715906dc8cbc0fd4324254f57fefc288b84937db9b5afa7f8f3b4a32efe5e SHA512 e82fe295074460fb9299bc2f830c4182190e45e69c5bb340befa237d9dc8d37348f6abffbbc41cfbd4f265e4c3e017fc9bece5061cbb48db4ce3bfd2e5c620d8
 EBUILD openldap-2.6.5-r1.ebuild 27768 BLAKE2B 9504f45606b6669d41af043556d53d23ea6991244033073c090c098a840bcaea3523162cae1cc320658711ec0b723deacead0b1c1ca9dee1e1c153eb9ac9ff70 SHA512 ca611ae6db8e2e6741ad9570e62466d690ad5f3d93b7a1650c2d2bd205b67305dd6b44d762861c29436b6d894a803a76fbe70a626371341ff6917e88c8b5ff6e
 EBUILD openldap-2.6.6-r2.ebuild 27826 BLAKE2B 517d061da388d584a0a3cbf68bcb491d6a2ad43dc31bcacd7ee2492ecd131f28ae7c0e89d9036b45a231fcb61d482ed4a3ad6b2abe57fef6e00cd5b6109e7455 SHA512 d6e46f61f29a8cd569e2ab6ab0168e59567e4918d02712cd8de4833a30609a4d974b7712a9c7bdfcaf406e28e4ba21ae37baf715fe5f6761b74ceb5066a9ff1c
 EBUILD openldap-2.6.6.ebuild 27769 BLAKE2B 056de7b28ac413e83a4c45028b6af231d322f614952a9d99a3f1b29c297807bf24319bf2e54962207ec2f25035eb0e33f8f727e50ee6ccb90af3f6ff5cbcb3fc SHA512 a3ad9e073b1ae4453d5b89ef6f8ce675e9a0a26eabc03e89544db9d3260693ff53e7b4adaa1a3da7ca316ebc12e9dd9cedfc8cf57c3c15227757e693ee83e74f
diff --git a/net-nds/openldap/openldap-2.6.4-r3.ebuild b/net-nds/openldap/openldap-2.6.4-r3.ebuild
index 2949d8d49c3c..cba05d444128 100644
--- a/net-nds/openldap/openldap-2.6.4-r3.ebuild
+++ b/net-nds/openldap/openldap-2.6.4-r3.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 5e4d9d1f2fd5..c5adf51dbbc7 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 6003ff891442..aa83751b033d 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -11,8 +11,6 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa
 AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
-EBUILD deluge-2.1.1-r1.ebuild 5761 BLAKE2B d299070fa825cc2d8078682d65128f589f79c041cb65763929b1137700e47b6aacb2709d3e2c92a1808837303771bb75be805df6a261c75b493dddef2bfe7c1c SHA512 f65a0673d17733238c57c0d91e9cb92d2e85e261d44cf29e63d5139c8320b948635e5e920597bd1ca26209d058e73d577531b1c4e22196a08a3a89b13b6b9967
-EBUILD deluge-2.1.1-r4.ebuild 6033 BLAKE2B 33e14686d141666665640623130cb2358a9d1482741625dc69457c0b76941789e0cd9d4220a5c2ecf557b0e07b5f5acf15b246bf710ed458da3326f87ec62cc4 SHA512 c5e894341778266d9b5bc45a56f84d083cafcf534385b750f01f81bb618e5845e1953a3122e5ad44fa2dc43fc3e459a1796236d37d108647ea4e974be66caffd
-EBUILD deluge-2.1.1-r5.ebuild 6034 BLAKE2B ecaa42d8d92b4aa9adf2112de989f02c1a65d5185b2cc19d22f7404f91a3d8c61559f672fb2bdf84eba8cce88b54c3004fa545a9ad2c071375aee288454f47d0 SHA512 1cd3a9f27f6d184ea035e4791c051e0385676949cc26606a61a157dcf0fcb616e8c43ae207b1f5e6160bfc6ff7bfe875b892330d3c0cd0f4fde5b52cf87a021a
-EBUILD deluge-9999.ebuild 5707 BLAKE2B 22929d56ad52ad251751e4fa879244073d047961b11472d8421be10507fef9d7ceeb51fe178ed692fe63fdc8ddbaee97fe29203fbac762e21a4b847a46cf972f SHA512 fa6e8769a60ebdd8dd4cd3e7b72f02f26fb39d0d7dbbb049768adc0001bbb186eb5a508cd5277639409a10364432a45f96cd6064e64b8c3b168d12e8ece1c3ee
+EBUILD deluge-2.1.1-r5.ebuild 6029 BLAKE2B 3942818a444792d06534044ee85952acf45448c9c865cae565400460d4431fc3584184771eedb93e57237eb26c55b521260c9170a5addcf7ad1664642579996c SHA512 e777ae9eb417a3d33d43fda634c490f871f224a3f2ad2cd29c1b3e82bed8f25f45a66d04d1964faff54f2b0c58b8a446f343b40ba1376631da77904fd3cac85a
+EBUILD deluge-9999.ebuild 5702 BLAKE2B a24112efd98c9918a8245c135dba64db1308ac71799e018068b58304ee137e27f479c0cedb9fabb6e460ed60ee8b582e9b1f72a0f73a57b84f647cb357728fd8 SHA512 068b3d9ba462d72cfd3839602aa963e4c8d716b0ecc8595e3c091c87aab3cd5478b90ff018a2e88f15f415b45ad69deed89663ed691e94062ca4a5a4754ec709
 MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06
diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
deleted file mode 100644
index 04ff97d96706..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.1.1-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
deleted file mode 100644
index 5f5ebcd7702f..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-twisted-22.10.patch"
-	# https://dev.deluge-torrent.org/ticket/3598
-	"${FILESDIR}/${P}-ayatana.patch"
-	# https://dev.deluge-torrent.org/ticket/3582
-	"${FILESDIR}/${P}-consoleui-deferred.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
-	elog "or"
-	elog "'systemctl start deluged.service' as root if you use systemd"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
index f0c99fabf374..a7a9d775474e 100644
--- a/net-p2p/deluge/deluge-2.1.1-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index ed7bb276078c..fbae2ca39a18 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 855b56c12fd0..5b91cbabfdb0 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index aa8693d3e944..678df9238c1b 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,6 +4,6 @@ AUX cups-filters-1.28.17-c++17.patch 1066 BLAKE2B 149001a37c5799210a7cbc6c79ab1b
 DIST cups-filters-1.28.17.tar.xz 1516052 BLAKE2B 87258391901d55d9e59b06d54603d014e54d224a373529bd70fcd38cded9dc96c88ca73bcea63d7633c065caea3f9e3274cd450aec5f1bd90130d9a88c0d3421 SHA512 320544a48206165581adafb28dbef58f39c66bebd3641be3d180a692605349d9e6af6d464044db9f7bda17a67f4a079370d8cc880cd7873d684b2209882deb35
 DIST cups-filters-2.0.0.tar.xz 447648 BLAKE2B be5e2aab4eb921aa67bfcc93aa5f95a9f1fe1a269ed73d18273a0e9a3e816187e9e32750ba6521c3ab083c3c7b7a60bb1fa679e16d4a5917f911a4ba8d4b7207 SHA512 fc8ba3bbf92d5ede295884023d1c42422c4c250dbbf21c948f160a04ded3259784df4bd17eea64492f9417f866e566be1a9fcde47d29655cd4204ef4cc7af134
 EBUILD cups-filters-1.28.17-r2.ebuild 3679 BLAKE2B 6f49716b9a904f063cf4356d856a87af14ce1d8536ff87aa92fe025f2df53d863373b8268524143500a17993b6dc98ede742c85a8ea931d279402e4dc70d5c36 SHA512 0e5d1a2d6c63ae020cab8f598d9b06e72712b95af8f3daf0b8a6eccbce311d89596e57ebcfa19dc9fcbc55c20714f22792ae84d29d1decdc07d20f1e7a03d1a3
-EBUILD cups-filters-2.0.0-r1.ebuild 1568 BLAKE2B 57aa8ff14c15b187067baed4990327503b5c697f33f11fcbf9c1e68cdbe7d559240e2418f451ffc9d4c9b001ab005e231b9284253f763398bf1cec6537560282 SHA512 7e7a26d8c691ead223da6276b9e45d7cf8028b24c5b96534ffb6069c85a0ea8dae94e776c5d19a0b2d591a8774ee3f625060e66401097bc6ce9c8dfae55ec9d0
+EBUILD cups-filters-2.0.0-r1.ebuild 1566 BLAKE2B 983b05e06474c3f4a2135d0613cbbaee06907302db9530312c721b5a98c286584b5905b51e967cb6306e2e3e087373c3c7b43874de8a0e43ee5cabc6fba6fe2a SHA512 5a9357971e0e7e0104989c0ba5ae9348caa8aefdc1411ec5e43c6f69205444672713f44fbb04ad4058fc6499b020e77e2940f1cc7b2ee8973958953f4d76eda8
 EBUILD cups-filters-2.0.0.ebuild 1422 BLAKE2B c85fcc33008f41ad75c2b8c25e5ed6671d18a3e6049afe410becf97c0f2821f8984fb78dbe301552b2972534af92cf6de1dddf381d3a241d5cd8f1edc6e5c8d8 SHA512 e997a777141dd75987c9f5b6a405076bb791d8e581471668a6a7719cc739d38388866bde5299f728174047fe4ee00c32e371b3094ed829f8599e73b2650a347f
 MISC metadata.xml 585 BLAKE2B c3ae887bff09343b882156b9020c185a9bd0d7bfabee240c71d714b8811761ef23176e4ee71f731022103a3da2255e1683b7ac4aca0f677afd994de5bedc96ca SHA512 313722d8912f26c1a7754a837b1d64dd122ac005cd9bb644ae65cac7b7a442845b25befa7891669abbf43011e9958988a6ad084dfa6ed393decbd198e852b196
diff --git a/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild b/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild
index efe14dde6359..9675761d4f1b 100644
--- a/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenPrinting/cups-filters/releases/download/${PV}/${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86"
 IUSE="+foomatic"
 
 RDEPEND="
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 96d6d396e9ba..9f547e7ab727 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 676b98558a27..047870fae49c 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -15,6 +15,6 @@ EBUILD openvpn-2.5.6-r1.ebuild 4974 BLAKE2B ea3dc28381ff32ddb305527ae4d496f953f1
 EBUILD openvpn-2.5.7-r1.ebuild 4909 BLAKE2B b81362c83a2896fb4a7bdd1e7c334bdbc7d4da3048cdc5a5ea672224e8ede39673726d4b951e0931275385d1df32a3d6fb678697099756eed436dadf6f11c60b SHA512 418860f853f4b426551e63a7e24cedd5840124e3fb1c62fa54ed1a45bad4aa41b59ebc80ec205ec89f5536a27457e798299b4cf778547b39d9530f9cdcb6709e
 EBUILD openvpn-2.6.4.ebuild 4955 BLAKE2B 68928027543d14c731dbcccaad08737a7ea82e9549c6d88cf9aa4087c4b20b5ccd424641d747781ab970ea0d77748a9eb37f3888167eabd68718d8bc7641a613 SHA512 40481133741e43d7e20e6c2e2481d071190944f17fe71bba39e8a6bab667aab0c2ec935a1206a40aba7c4f38cc72c9b70c1c51a8d5542b39c483c3f76fd4bc35
 EBUILD openvpn-2.6.8.ebuild 5006 BLAKE2B 5c8624d9ce0b947fa7acc145b6fe3cb57988aa83d08c0dfea3c4fb5d30fe45a090c9ecb2bcc373765b925625a4fe8ffa2cddfdab7b13450246b74130ea1b5c9c SHA512 d70a3d62d7e9b315556d414045c4747db95d7afc19515c002dbad7f8cd247a1b1f88859a1ab9fe279480d2e86e779aa1a378fc717e04c6b1a55d28489fe95c2e
-EBUILD openvpn-2.6.9.ebuild 5012 BLAKE2B 5964072b2a6cc3018dcf415c667b3eda18982c725ce53c4e97b5e59da9473e69b48cebe9c37b867d4ff250a16721f2bce5d4b755cd7a8a54ac59e31bc8473789 SHA512 7e94c9e2c09e6d6249a5213856b8dc482f908a915239aa4f20d65a5ed3f134b8ab07aefa63a2e3e4bd221480de8a460936946c5763331aaba25bc08635447a99
+EBUILD openvpn-2.6.9.ebuild 5007 BLAKE2B 3d289b9c5a895ba3e8c0ecf34a59f9787d1abb623ab3490002c81c145ec4ad6fb7747435ae35586f0e484b29c25faa82f660f2a220a4956c395e31bf13ac5031 SHA512 5aa51e5e55b494e36d2b7c3ef7af450dc906c0c5656581df1a779d5008d454030842c3b72bf9d1b86bdf9f69a71fa785b89464b8414fc06a313a421261e8793b
 EBUILD openvpn-9999.ebuild 5012 BLAKE2B 5964072b2a6cc3018dcf415c667b3eda18982c725ce53c4e97b5e59da9473e69b48cebe9c37b867d4ff250a16721f2bce5d4b755cd7a8a54ac59e31bc8473789 SHA512 7e94c9e2c09e6d6249a5213856b8dc482f908a915239aa4f20d65a5ed3f134b8ab07aefa63a2e3e4bd221480de8a460936946c5763331aaba25bc08635447a99
 MISC metadata.xml 1216 BLAKE2B c776b53a6590657d9c38f4d27da052d558b3fa706a944d07ff29de7fa6745e1e474a6110056dbe8c19fd03373644347054f8b7b4f2dd9d7171f3bc25ca21fe4f SHA512 1a62049e24f92d5519b1eaefa1649df23a515165e41b87e399170d1e2e140174fee5e8887f7e8589e68301093d1c2b6f76f6868db302ad7de2da911f0df3bb6d
diff --git a/net-vpn/openvpn/openvpn-2.6.9.ebuild b/net-vpn/openvpn/openvpn-2.6.9.ebuild
index ebad808e6e1f..58f25f892c8a 100644
--- a/net-vpn/openvpn/openvpn-2.6.9.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 6529cae467b3..a3e69af55e4d 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest
index 0d08694c5f80..942a79df32b0 100644
--- a/net-wireless/neard/Manifest
+++ b/net-wireless/neard/Manifest
@@ -1,5 +1,5 @@
 AUX neard.confd 274 BLAKE2B f61cc6b061a146899aabd430e3e5c082da57a8e413600a748ae23959dd4ff5668d39b17222c7c22f0cf6f990e289e8dd21287142e9d4bf21e7bdd4d15beb05ec SHA512 d696911f7e5f33f6b2a0f6508c73676998a3bfaebbda02386dc08d9149d525bf211bfcf9836276d070f31288ef84540ef1bce3d68119d4439089297c079392ef
 AUX neard.rc 417 BLAKE2B cdbd53502cebf7ac732830d5266fca64e7bfb8ec06caf660e026ec8bd9413375495e630b27e0e0b97997aab5313c5a215059c1624fd350e8b25e59bd5563c578 SHA512 68459f7dfc9bdcc6b450770d76c0ffa4b0adb248476c801317f8a8cc7c2dc9e41dea4fcf9425b9d667821037d923fb8368acb72540cc63478dd45e21ba9215d5
 DIST neard-0.19.tar.gz 229059 BLAKE2B 35976667dc22d6fc4e80468fcd21124bd8675c490e5d96e6d8d0f5bba28a92deae4255aa96070419f6a840ede9cda7fa793ef2c27fa3e725710dbf0a2a7105a5 SHA512 577061c214365853667033a2ae9f78a367adcbf07f2d7a70087c484ac31b410d34c003f396da622604f8844f30d44cba01f0d8a7cadebfd4c4c6457996541b48
-EBUILD neard-0.19.ebuild 1292 BLAKE2B 5526008b83b2d0c7dcfcc24ee5e3fd6a5ada7986bf2d0851b0e841cd4da7e2d00ebb85ebec74ed059d84f02b8d7841b8d581c2624ddf318179a22348245a7a0a SHA512 30f972819e69784940e0e0f9c378810ebcca5c7ae43eda7c023340109eedf9655b8ed0bd782b5a5bd264cf13d4aac0c30d9d29d5ba809f05c5b9f95f2d40c115
+EBUILD neard-0.19.ebuild 1299 BLAKE2B 7d4d8e7a78f1deac65e6f108cacda307c7b93f01cf12996ca9023f37e5f2fabcfb2e7daeb8e6c35b135e2e3b45f96cbfda120522ef25e492b072330e7b23fe37 SHA512 f04bc0cb24ff1ece12ba8a83a737deb3bcaad73731c917d5763c0ebc6e1aef012a45e4d917229b3f1bab37575a46a135bbbb64c570be62699f0a37e510a552d9
 MISC metadata.xml 345 BLAKE2B ff4efcacd7341f422affd38cf868262e2ca73da528803b3f5c0a7efc38f9997d66d0e4c499bc465065671637ed1eb38f05a34a43e88ba214a65ae06c10ed5344 SHA512 fb6522da05b8b33c8aafd24c7a937039756d861adaea54a0e9075b10879b647a315d66b4f94a96da9a220c1248aeedba9d3105d640e4a0ee93eec4567fcd50af
diff --git a/net-wireless/neard/neard-0.19.ebuild b/net-wireless/neard/neard-0.19.ebuild
index 9ac2be8d167c..a0c049f3fe95 100644
--- a/net-wireless/neard/neard-0.19.ebuild
+++ b/net-wireless/neard/neard-0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-nfc/neard/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test tools systemd"
 
 RESTRICT="!test? ( test )"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ef8a04132919..fcf5a9b43a8c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 8789d3aaa07c..0776dff352be 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -250,7 +250,7 @@ mail-filter/pyzor mysql
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
 # net-libs/webkit-gtk has no alpha keywords
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 368e78393fa7..71b4fd093e41 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -38,7 +38,7 @@ sci-geosciences/viking
 # Jupyterlab and friends require net-libs/nodejs
 dev-python/jupyterlab
 dev-python/jupyterlab-lsp
-dev-python/jupyterlab_widgets
+dev-python/jupyterlab-widgets
 dev-python/jupyter-server-proxy
 sci-misc/jupyterlab-desktop-bin
 dev-python/plotly
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 1350b08d459d..f48150514c33 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -250,7 +250,7 @@ dev-libs/efl avif lua_single_target_luajit physics
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
 
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index c51e084cdf1c..931d0d3d8933 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -231,7 +231,7 @@ net-analyzer/wireshark gui ilbc
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
 
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
 # Requires dev-python/networkx.
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index d534d544a17e..5d6791cd8cd2 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -45,7 +45,7 @@ media-sound/jack2 ieee1394
 
 # Sam James <sam@gentoo.org> (2020-07-30)
 # vulkan-loader and glslang are not yet stable on ppc
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-12-12)
 # Needs stable net-libs/webkit-gtk, bug #684702
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 3f1e43fa394d..b0cfa527331f 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -206,7 +206,7 @@ dev-python/diskcache test
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
 
 # Hans de Graaff <graaff@gentoo.org> (2019-04-08)
 # Obsolete ruby version, no newer versions keyworded or stable.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index a27c74642a24..4d1773b16ee7 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -307,7 +307,7 @@ media-libs/libsdl2 fcitx4
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
 
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index f03d0d11b5ea..e54f4b53d7bd 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -43,3 +43,4 @@ virgl - VIDEO_CARDS setting to build driver for virgil (virtual 3D GPU)
 virtualbox - VIDEO_CARDS setting to build driver for virtualbox emulation
 vivante - VIDEO_CARDS setting to build etnaviv driver for vivante video cards
 vmware - VIDEO_CARDS setting to build driver for vmware video cards
+zink - VIDEO_CARDS setting to build Zink OpenGL-over-Vulkan Gallium driver
diff --git a/profiles/features/big-endian/package.mask b/profiles/features/big-endian/package.mask
index 407bf030c989..0541513392c4 100644
--- a/profiles/features/big-endian/package.mask
+++ b/profiles/features/big-endian/package.mask
@@ -1,6 +1,12 @@
 # Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-06-05)
+# media-libs/exempi is seriously broken on big endian platforms.
+# https://gitlab.freedesktop.org/libopenraw/exempi/-/merge_requests/8#note_2277243
+dev-python/python-xmp-toolkit
+media-libs/exempi
+
 # matoro <matoro_gentoo@matoro.tk> (2024-01-09)
 # Test failures on BE (#920353, #902191)
 net-misc/nextcloud-client
diff --git a/profiles/features/big-endian/package.use.mask b/profiles/features/big-endian/package.use.mask
index a83df9315ceb..ea31dfe477b7 100644
--- a/profiles/features/big-endian/package.use.mask
+++ b/profiles/features/big-endian/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-06-05)
+# media-libs/exempi is seriously broken on big endian platforms.
+# https://gitlab.freedesktop.org/libopenraw/exempi/-/merge_requests/8#note_2277243
+media-libs/gexiv2 test
+
 # matoro <matoro_gentoo@matoro.tk> (2023-11-16)
 # media-libs/libvpx casualties (#700902)
 media-video/ffmpeg vpx
diff --git a/profiles/features/big-endian/use.mask b/profiles/features/big-endian/use.mask
index 49de7dd81e15..d27058eb9f0a 100644
--- a/profiles/features/big-endian/use.mask
+++ b/profiles/features/big-endian/use.mask
@@ -1,6 +1,11 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-06-05)
+# media-libs/exempi is seriously broken on big endian platforms.
+# https://gitlab.freedesktop.org/libopenraw/exempi/-/merge_requests/8#note_2277243
+xmp
+
 # matoro <matoro_gentoo@matoro.tk> (2023-06-30)
 # media-libs/libjxl casualties
 # https://github.com/libjxl/libjxl/issues/2433
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index db7e4ff91e53..8907507befc2 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -68,7 +68,7 @@ dev-python/jupyter-lsp
 dev-python/jupyter-server
 dev-python/jupyter-server-mathjax
 dev-python/jupyter-server-terminals
-dev-python/jupyterlab_widgets
+dev-python/jupyterlab-widgets
 dev-python/jupyterlab-server
 dev-python/jupyterlab
 dev-python/keyring
diff --git a/profiles/package.mask b/profiles/package.mask
index 97a901c3374e..75e5014ef9a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Maciej Barć <xgqt@gentoo.org> (2024-06-05)
+# Old and experimental Scheme compiler.
+# Bugs: 870472 and 906863
+# Removal on 2024-07-05.
+dev-scheme/scheme48
+
 # Maciej Barć <xgqt@gentoo.org> (2024-06-04)
 # Deprecated git integration backend of "app-emacs/magit".
 # No longer supported by upstream. Fails to compile (bug 928920).
diff --git a/profiles/updates/2Q-2024 b/profiles/updates/2Q-2024
index 3324b67240f7..b0d15b58ce71 100644
--- a/profiles/updates/2Q-2024
+++ b/profiles/updates/2Q-2024
@@ -9,3 +9,4 @@ move dev-perl/Term-Table perl-core/Term-Table
 move dev-perl/Test2-Suite perl-core/Test2-Suite
 move dev-python/et_xmlfile dev-python/et-xmlfile
 move dev-python/qiskit-terra dev-python/qiskit
+move dev-python/jupyterlab_widgets dev-python/jupyterlab-widgets
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c2de7d053a58..c8106c5062c4 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2834,7 +2834,6 @@ dev-tex/abntex:lyx - Install with app-office/lyx layout
 dev-tex/biblatex:biber - Install the unicode compatible backend processor
 dev-tex/pythontex:highlighting - Syntax highlighting using dev-python/pygments
 dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
-dev-texlive/texlive-context:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
 dev-util/Tensile:client - Build and install tensile_client executable to run benchmarks and tune GPU GEMM
 dev-util/babeltrace:elfutils - Build the dev-util/lttng-ust debug information filter component class
 dev-util/babeltrace:plugins - Build support for Babeltrace 2 Python plugins
@@ -3500,10 +3499,7 @@ gui-wm/sway:swaynag - Install 'swaynag': shows a message with buttons
 gui-wm/sway:tray - Enable support for StatusNotifierItem tray specification
 gui-wm/sway:wallpapers - Install sway's default wallpaper image
 gui-wm/wayfire:X - Enable support for X11 applications (XWayland).
-gui-wm/wayfire:gles - use libglvnd to do animations more efficiently
 gui-wm/wayfire:gles3 - Enable OpenGL ES 3.x Features.
-gui-wm/wayfire:system-wfconfig - Use the system-wide gui-libs/wf-config instead of building as a submodule. It will block system-wide gui-libs/wf-config from being installed.
-gui-wm/wayfire:system-wlroots - Use the system-wide gui-libs/wlroots instead of building as a submodule. It will block system-wide gui-libs/wlroots from being installed.
 kde-apps/akonadi:designer - Install plugin for dev-qt/designer
 kde-apps/akonadi:kaccounts - Enable support for system-wide defined KAccounts
 kde-apps/akonadi:tools - Install tools for developers and testing
@@ -4341,7 +4337,8 @@ media-libs/libheif:gdk-pixbuf - Enable x11-libs/gdk-pixbuf plugin
 media-libs/libheif:go - Enable building dev-lang/go code/examples
 media-libs/libheif:rav1e - Use media-video/rav1e for AVIF encoding
 media-libs/libheif:x265 - Use media-libs/x265 for HEIF encoding
-media-libs/libjxl:gdk-pixbuf - Build a gdk-pixbuf loader
+media-libs/libjxl:gdk-pixbuf - Build a gdk-pixbuf loader.
+media-libs/libjxl:jpeg - Enable full support for JPEG images. When disabled, only lossless conversion between JPEG and JPEG-XL is supported.
 media-libs/liblastfm:fingerprint - Build the lastfm-fingerprint library
 media-libs/libmp4v2:utils - Install command-line utilities
 media-libs/libmypaint:gegl - Add support for media-libs/gegl
@@ -4467,7 +4464,6 @@ media-libs/openimageio:gui - Build iv (with Qt5)
 media-libs/openimageio:opencv - Enable OpenCV support via media-libs/opencv
 media-libs/openimageio:openvdb - Enable OpenVDB support via media-gfx/openvdb
 media-libs/openimageio:ptex - Enable Ptex texture mapping system file support via media-libs/ptex
-media-libs/openimageio:qt5 - Build iv with Qt5
 media-libs/openimageio:qt6 - Build iv with Qt6
 media-libs/openimageio:tools - Build the command-line tools
 media-libs/opensubdiv:glew - Enable support for OpenGL Extension Wrangler Library (media-libs/glew)
@@ -5681,10 +5677,11 @@ net-dns/nsd:largefile - Enables support for large files
 net-dns/nsd:libevent - Use libevent or libev, useful when zone count is high
 net-dns/nsd:memclean - Cleanup memory (at exit) for eg. valgrind, memcheck
 net-dns/nsd:minimal-responses - If minimal responses are disabled, responses are more likely to get truncated, resulting in TCP fallback
+net-dns/nsd:mmap - Use mmap(2) instead of malloc(3); currently experimental
 net-dns/nsd:munin - Install a plugin for net-analyzer/munin to graph statistical data from nsd
 net-dns/nsd:nsec3 - Enable NSEC3 support
 net-dns/nsd:packed - Enable packed structure alignment; uses less memory but has unaligned reads
-net-dns/nsd:radix-tree - Use a red-black tree for main lookups; uses less memory at the expense of more CPU
+net-dns/nsd:radix-tree - Use a radix tree for main lookups instead of a red-black tree
 net-dns/nsd:ratelimit - Enables ratelimiting, based on query name, type and source
 net-dns/nsd:recvmmsg - Enable recvmmsg and sendmmsg compilation, faster but some kernel versions may have implementation problems for IPv6
 net-dns/nsd:root-server - Configure NSD as a root server (OBSOLETE: removed in >=4.9.x)
@@ -8045,7 +8042,6 @@ sys-auth/seatd:builtin - Enable embedded server in libseat
 sys-auth/seatd:server - Enable standalone seatd server, replacement to (e)logind
 sys-auth/ssh-ldap-pubkey:schema - Install a copy of the LPK schema, only needed on LDAP servers.
 sys-auth/sssd:acl - Build and use the cifsidmap plugin
-sys-auth/sssd:keyutils - Controls whether the kernel keyring should be used via sys-apps/keyutils
 sys-auth/sssd:netlink - Add support for netlink protocol via dev-libs/libnl
 sys-auth/sssd:nfsv4 - Add support for the nfsv4 idmapd plugin provided by net-fs/nfs-utils
 sys-auth/sssd:samba - Add Privileged Attribute Certificate Support for Kerberos
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 375bb3febb00..8cc25fa0210a 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/biopython/Manifest b/sci-biology/biopython/Manifest
index 8eb4fcbc9b00..a6a0a147630b 100644
--- a/sci-biology/biopython/Manifest
+++ b/sci-biology/biopython/Manifest
@@ -1,5 +1,5 @@
 AUX biopython-1.81-python3.12.patch 472 BLAKE2B 1c4b1c777e6bd7b80503b6a820caa9aad5601337a91c3275c3c7e97060a4f38deac9db77edb3d6ce76f3c20b883cc8c8301fe8cccba311c4280a99fc3264b8a4 SHA512 5e563b40e4278913a4f559b25e60b4b8909240fd367a66c1e43e1c525684482a928748838519a627bcc67c5c9bbd44537192bccf6813f8ee80bcc456af6d9bc9
 AUX biopython-1.81-reportlab4.patch 1068 BLAKE2B 1d2c2bf7929f5741f1bcae083d9842b16badba53f3be8fd3352b2b437a670b5032d146dc18610b7b360d503ad6613e9f0632457b8134392e8507900eff191526 SHA512 a576b12b8673471c27c8582f5ecb00ddf4b729a749af21a9ba67c6972dd5e9a535d7116b0ad7d06a5b89ff5b26d042914d23b1909b1081e1226df334e62d57f9
 DIST biopython-1.81.tar.gz 19324875 BLAKE2B be3a85f5b60638987d6186af498411b494f8d27389f24cd1b9e658bc6b1a29c799ec8b20a9ac0b955c6d4c239706f4dbb5b75f6d56908f63d731b1d56c9fd587 SHA512 1595fad6631bfb6cf4e1a92ed72e6093e2a0c24f3c0bd4182267ec9742fb03dff16099eedde139598aa6b5b8380bbac9e48246cb9ab8b44109333d60adfd00ed
-EBUILD biopython-1.81-r1.ebuild 1627 BLAKE2B ba598f6952dc9eea1ecfa4781e2aba9e6729a5488f003eec8f2fb8947489130da02baef37f540cd5064a3cbf9e2e70309e105d35f21796b3cf127fcd6b91dd93 SHA512 01e938abe556ab05e035f5988987e72259636bbd63c3d04e09c117c069dd9546713ca4823233900a60a340b64224847640e59c1a11f75209436574b9ae535c20
+EBUILD biopython-1.81-r1.ebuild 1628 BLAKE2B c7d242753c209922b83fe1f5ba38e33008fa2669c66a0b101591262ee34ff4b0ba38fd5e350bb45c234ef80a42c954ab9750e5ab7c5845f6c8daf48f7a55a181 SHA512 0a8cca5a42fe265ad3ee97a15cb42bf8c8a47cf10eb862a2094dd601595e017653927a7df18fb86b03a057b17c4e60282b8b88941241291d030524f751ef38f5
 MISC metadata.xml 334 BLAKE2B 4d97c23444fdddcca57631fa2ddf4a11cfcef0accf91db65071d520f6601c0626e290e67cbf162abdefe7a74f4b410f8366a23186fc417e1fab7e9ce157d7610 SHA512 a870bd044d0e0d4e2a0c48b50f710845c6269e038790243f1d1de65b1252fd653f0f403fc55b98946df8eb27f24dfae5c84f52fcc38c969afcbdb548ccbb7a59
diff --git a/sci-biology/biopython/biopython-1.81-r1.ebuild b/sci-biology/biopython/biopython-1.81-r1.ebuild
index f4fd86ba3ffb..96d83b74b492 100644
--- a/sci-biology/biopython/biopython-1.81-r1.ebuild
+++ b/sci-biology/biopython/biopython-1.81-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517="setuptools"
 DISTUTILS_EXT=1
 
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 50e2717362b7..ebbe2a3f2c08 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 975e4b0ad312..097ec6618d3b 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -8,6 +8,6 @@ EBUILD qalculate-gtk-4.5.0.ebuild 874 BLAKE2B 88c2c0d9cb5219190e8dccc9565f594547
 EBUILD qalculate-gtk-4.6.1.ebuild 874 BLAKE2B 88c2c0d9cb5219190e8dccc9565f594547c61b974a798477decdb17cbb5cc05e30b8e54c205eb6a6ccd62b3eca4bd33e5a964368018fc7b78596500b78b50529 SHA512 32c604662df76596930066c8ad6eb6e8b9d96dc9df8ddcfebc3120d990a44a37354ad3ab4136a43eb85e57edb96c1bd3b035e1fbd6b42443cad021d58140b7a0
 EBUILD qalculate-gtk-4.7.0.ebuild 875 BLAKE2B 517d1f0cd7987f2395ca9871f7d1040aca5a28643347c91a37fb057cf4952cf58ecfd37b975f95b2cb754238af2e32f87a41224947c988bca6f871119f5f15f0 SHA512 c780dde177d60d98907724d76528eba5f10c95c8aba35a004a92fb0089d9541e21c02885ad3483babc383c9709b0d4daa8c4b2f1f1cc1af9596e2de18a662064
 EBUILD qalculate-gtk-4.8.0.ebuild 908 BLAKE2B 0aeb931538b5de25c13af31c7314990525c4b346ea3aa0582520628d5b437e208b95d46ee492a4285e1123a453d5ade9c2c7e7515de91213954dfd094f02e600 SHA512 c08b13c1b265731726627c850feaf899ec003ed52ce884b88ab3238680dd67c0384acdc52d07e7a62bff23c29c05fb3a7fb7ee91c6b8ddfa5597c195526194fc
-EBUILD qalculate-gtk-4.8.1.ebuild 915 BLAKE2B 784c4375eaf6fb78885d828f206368c14e7fcb7cae93aec6937810e72604231898cd7e3d38eea2847efada3443f94489fb0ffc1faedfbb6b25e4449c040d1ea3 SHA512 b6ee734e66be8018c07cdcb3bb53db472bd93fae8c27314a2d2540b2b78116ac536d143e4bcea98b39eb98b49b48857e088252533bf02be5a25a335c156d6f53
+EBUILD qalculate-gtk-4.8.1.ebuild 914 BLAKE2B 74f5d48b47f1b475f5e2624d43b3a53e58685cc8f163eea8b0c03e0b4d011de16c856df05d3feb9a1aae1e6da20b11797be5debf5384a32250b41ef94d0164e2 SHA512 3c076569a36874c4da6f1d2111e62e8d13642103daa6850842a7a9be25706e7828612cce7f1fe2c482e4857ab04d68176193a2943a6dea95e736ccd09ed35f51
 EBUILD qalculate-gtk-5.0.0.ebuild 916 BLAKE2B f61af71ab4dc642a693a82a380c709f0cd5b3c1bc95f1d39e6d114400c44c415ca74b4e2c1abf7b373e41f3db7e0e1308f4c084521f5a31ef24671a726c9d23c SHA512 1b0d1b61ecd2aafd5c16fb6bfe3a9ef2ff6e3aa4d450b80fd4f39a443ac96e64c64e952e47025193eac6670eecec9cb38e6cb7612f2ecdc4e24b9b78e6227a57
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-4.8.1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-4.8.1.ebuild
index 57d14e1d78dc..6515af961fd1 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-4.8.1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-4.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-chemistry/MDAnalysis/MDAnalysis-2.6.1.ebuild b/sci-chemistry/MDAnalysis/MDAnalysis-2.6.1.ebuild
index d407b705b2c5..f83ee1eabaf1 100644
--- a/sci-chemistry/MDAnalysis/MDAnalysis-2.6.1.ebuild
+++ b/sci-chemistry/MDAnalysis/MDAnalysis-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
@@ -12,9 +12,9 @@ inherit distutils-r1 pypi
 
 DESCRIPTION="A python library to analyze and manipulate molecular dynamics trajectories"
 HOMEPAGE="https://www.mdanalysis.org"
+LICENSE="GPL-2"
 
 SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="~amd64 ~amd64-linux"
 
 # TODO: fix this
diff --git a/sci-chemistry/MDAnalysis/Manifest b/sci-chemistry/MDAnalysis/Manifest
index cff859e1815b..73101a1d93f2 100644
--- a/sci-chemistry/MDAnalysis/Manifest
+++ b/sci-chemistry/MDAnalysis/Manifest
@@ -1,3 +1,3 @@
 DIST MDAnalysis-2.6.1.tar.gz 4173280 BLAKE2B 14aae62733ace3eff686f6ba6be8326f86ba24c55e3870aa2e5dd88a858ca0de8d89589a622687bec3aafd332d9ccb5d6e6166eb370f56eaf79af5081f3a003e SHA512 421a27e508bcf7845b0c91f40c01bba4a48bf8ba9a3d3ed50fe555336c96fb1f64bccc5cf3ee048130d2eef9b18b8550ed5f73d3459f8962343ba694d00655bb
-EBUILD MDAnalysis-2.6.1.ebuild 1128 BLAKE2B 7677f00e7aedca6495a1116715189a756485ed66bb556df6279c2ed12f1b1bc2dfe6f185dd952205d8f73a4083f04318226f5184f3443e0664ddc4d7f8943766 SHA512 66943087679841828505ed99ac5c0329a713f7d13689482b8daa867281cf28ea0c723a9685909a0f82dd0edd2feb40af3b898be41797c2b1a1c48117118fc4e4
+EBUILD MDAnalysis-2.6.1.ebuild 1129 BLAKE2B eefcde9e4552661923ad0e4ea73c42376aa8ddce7730a79b94a3d6dbaee560b23399fb7a857a77f93ca33ea8dc922905ce554ff9e6284b5f348216318f5bb769 SHA512 82add5c75078bb8c3b6a55cb322a2b88a5351e47d607194ab5834343f172cd5ce6daab8abf26957a83fa2d6b0d83a68fe5866d4e319d5946bdbde179cbd636ba
 MISC metadata.xml 497 BLAKE2B ddd8c6379dfe6b6fe33160d31bda254774e0c8eb5f862cc51560097efc5c273fa972388c6fe8fb1bbedc11ab125a5487bb1d19002489be967fa3e8e209d7cc81 SHA512 03c1eb9bef1bc10d600169b221c65c87794f8b9bf8d0efb1dc6ddaa61a09d665722ed7d32087e3137b36aa7256b76371b9ce2cc92b34b1ed7d1c78ede6550287
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index c767c8dca84f..03191ede7ccf 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index b0ec15c4b961..b87d6941446e 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,4 +1,4 @@
 DIST vmd-1.9.4_alpha57-gentoo-patches.tar.xz 14612 BLAKE2B e50a2fc734038207174dd5cc525f01824ce324a65b8ce604f83862ce50be6b1950d199188a717e2368b2b050256a4705662009e3530d621b19c52bb109b6a844 SHA512 6283076e47dfcd780bbc94f9ca2b044a028a472c09d78616d373813d81ec764bf1697e56a8f487f9f0999cf409c0f141bf248156f60851073347d1b640a6953c
 DIST vmd-1.9.4a57.src.tar.gz 43155120 BLAKE2B de0da96f6681c24e7b1d38890f109088187198cbdddb3d86d783322e837b7a71224085699f3addf2833cf293ab2689f06ab47df284b8fbe080162740094ae844 SHA512 0a3726d8fa279ac62c368cd18724cd09535618454ff6e299d147291ef5d4198ad9d58a94f0b05699ec8a23128753c55e7397c95a5ce194e36d3fabef1bcf454c
-EBUILD vmd-1.9.4_alpha57.ebuild 7517 BLAKE2B a848eae8ebe51dfb121881094fa961a6efc21a996805b740c054c23eda23acf9597f027f60cec94f6afab38e68873197f2887c839a8c5b61086b8116208c9648 SHA512 30ecd04d695fee5321b00ea0b69c07588af65523909f8b74dd333f4694d0c2167e288d61993272f543699a0c08cfa4cc201068a1f1e50d2b8dabfcc02a5b818a
+EBUILD vmd-1.9.4_alpha57.ebuild 7516 BLAKE2B 3694b45e09af9f1ca33854543a902230bef3b72f1c2b0cf0f0e446b0e1276720e84da17eee0c0bb70eb4321c7602bdb7e2490e619a260f616d9d664c53ac4127 SHA512 80d1c81faca51066b5a4c3e6f3bf437b3ac3e5c01c0b4d156d6bac219f4dc90e1652ef77032539cfff73e62b9e19a381ec30a8a77a0de32d724c32faf39730bf
 MISC metadata.xml 697 BLAKE2B fe7fd00b1802dba4e503212cf8e0a91723dd6d255e346bca099bb2eb8cdb6291b27d1cbe9229e652c6f113e93cc3285bbf346977647d186f5403bd153a2c6d17 SHA512 f1bacf679ce42835e525265af48429d58d65a9aedc268e699cba731a1ea0bbe481777c726c2e1fd6a0ad7465c0e666f8f58145619d985cd0675eb1aff6b15472
diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild
index af9f38835c45..e0628f111574 100644
--- a/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cuda desktop prefix python-single-r1 toolchain-funcs xdg
 
@@ -15,9 +15,10 @@ SRC_URI="
 	${MY_P}.src.tar.gz
 	fetch+https://dev.gentoo.org/~pacho/${PN}/${PN}-1.9.4_alpha57-gentoo-patches.tar.xz
 "
+S="${WORKDIR}/${MY_P}"
+LICENSE="vmd"
 
 SLOT="0"
-LICENSE="vmd"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
@@ -57,9 +58,6 @@ RDEPEND="${CDEPEND}
 	msms? ( sci-chemistry/msms-bin )
 	povray? ( media-gfx/povray )
 "
-
-S="${WORKDIR}/${MY_P}"
-
 VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
 
 # Binary only plugin
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7ebfb64a5f8d..86506f62f080 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/librttopo/Manifest b/sci-geosciences/librttopo/Manifest
index 9fe4bccd6f86..963ccd9d945a 100644
--- a/sci-geosciences/librttopo/Manifest
+++ b/sci-geosciences/librttopo/Manifest
@@ -1,3 +1,3 @@
 DIST librttopo-1.1.0.tar.gz 301077 BLAKE2B 4d296593b5f50712952f54cf5bde540d32293dd7d401fe26325201df202caf7b7841eee0cf65cdbd2fd1789cb050d6fe532af60f76105ae0288c0beb1adca2f2 SHA512 624c2aeff16737d0bec28f8b38427351a3af20658a077d280a1b2422697419394f36832db9459bf25c7d699bc002eaec499dcbd65bca7d2b3f8b92e78650dea3
-EBUILD librttopo-1.1.0.ebuild 584 BLAKE2B 46c0ba5c168e55c92a2fd85641a5def8fd8b680c65af836fa96ef038065d00771f7becdb52e181e446de8d876f825c0bab95cf5e8ce72051136d739e7273c839 SHA512 351ff8832fa13f9e446c6607112c8635881c7ade6a035ee91230d7b713345c1a25f74e502387b8b8e980a2367c0d39e988ccf65bc533bc39ce57b086e4f213d4
+EBUILD librttopo-1.1.0.ebuild 583 BLAKE2B 106be74b4ab4a9a83fca7ffd169a5f6ffdcf59d622d9ec33738f0c4e476cfaebeda83ca951f9fa22161f0cdfd21048e945342c17da323c58103786d6a393119b SHA512 84ae7b3e36d0429f125ce8c40c9a5c214765bc2ab0d8d3801936fb70e3957704e8a9a470369e4f689db64ebcee80680e678333d2031edddb999a46d7cbb68997
 MISC metadata.xml 270 BLAKE2B d671fe6a94e536276e72466a25e98a1e0bc835584f788b10653270c10b976da801bdb6bad177fc69d359c1e588d08101dc4f01792f14f04432ba7b6e234787a7 SHA512 e54914ee9c11010802a2bb5b4c998c82c53e93085d12dd59c6c5ec570de962ec8938e1e1a5ad6640fe8047c3d3eedea8c367881dd07a5648e95863af32e888f9
diff --git a/sci-geosciences/librttopo/librttopo-1.1.0.ebuild b/sci-geosciences/librttopo/librttopo-1.1.0.ebuild
index 6d2203aaf4cd..3b0d006d1082 100644
--- a/sci-geosciences/librttopo/librttopo-1.1.0.ebuild
+++ b/sci-geosciences/librttopo/librttopo-1.1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/librttopo"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="sci-libs/geos"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b0ec025bb4a0..8d3e655eb165 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 667cb3eea219..5114c8e98ab1 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -3,6 +3,6 @@ DIST SuiteSparse-7.0.0.gh.tar.gz 64884962 BLAKE2B 06c6cf54ffae188f5179e0cd455237
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
 EBUILD cholmod-3.0.13.ebuild 1748 BLAKE2B 415db8bb43c849d2839befeed9165bd0e94e47c8a7105667cd45af8bc17c7c2ccadeb8a95e012e49a79fbb22fc9899d440241c985af53ab4fb087f5365b1845f SHA512 84044c3f0b566055d2f37c9b0c822fb991d334b7fdab652ba25b26fb483341b7ed901f2749894c563c404a846a5ed7a5c3681915943cd9bee5a546d3bedd36e7
-EBUILD cholmod-3.0.14.ebuild 1767 BLAKE2B a52d9de36b65740db7245120ec5d5da6e3a8773caf325fdbf2f3374bc5d20fd00442d897b720997cf0ba2bb5d7b8ac3483031520434e2e3b5c8064805b9afe23 SHA512 4fac7ec50f85e890b555ab194e270deca18b100bca9a886a8d2a4437edf204854f429ce3ddbf705818c3332863bce00be1601e7a89f02fe3450501cc1d3179f9
+EBUILD cholmod-3.0.14-r1.ebuild 1769 BLAKE2B 091efe9805e91e984188dde55b5904442196fe470495ffefa0e74f09f82c8f2f6c6ce55b52c8270a1f8918e81d68c66de50a9b6b0fef74b31340078e665ee5b9 SHA512 ee451206bf89c546c2d930fbbcf66bf0d93ede0ba8d82bdb8ce7a4884e8a25462c0f929ec1dfc4fb7d0e3e54ee29aa795976eb476a1ba5180bd3c8b16407af35
 EBUILD cholmod-4.0.3.ebuild 2974 BLAKE2B c77f759479103097bd494ecabf35b64543b9edeb42e1c3a0a98effddfeb1498909e0d7d52ee245bca29abee718accc220970f27500dc11105f75fa6ba58e4c89 SHA512 40dce0c939a3b16205b336482ec621118600f6ed34e83a897dc1b53a1c655c9f3147e5f532d3a50bfbcc44fd457f6dc78c5770ae2e8056c38715459412d6b35b
 MISC metadata.xml 1028 BLAKE2B dcd592d2142e5ed5f25f338675dedad56523ed62bef5d09b4c78eae4bb28f8b6611bbbf3922bf76d11d3c5085ed6bb583dd537ead0a3f3d17d9fc4c9cd0593a5 SHA512 d04eebb91d5ae9dcec0bb1d8d5be404d3ed94120e71523dbe353f7253f95a60ece8bf125fee9967e987692113d1b5f265fd485274005117038edc1b563208e96
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild
index 4fc1ec9b185a..669494c2ea85 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
-SLOT="0"
+SLOT="0/3"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 80680c50c2de..6aeb91b4f473 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -9,5 +9,5 @@ DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a25
 DIST gdalautotest-3.8.0.tar.gz 15615239 BLAKE2B fa524bb796a6f5b28bea79b51c4ce34e231b1d10a108a4590e30a48dc946df45880828a5a1ee0db07ed191e0f7dd5631fb294f3a73d1ce24244b6132f5cc3de1 SHA512 e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431
 DIST gdalautotest-3.8.5.tar.gz 15711701 BLAKE2B 3f0a5ba7f6a2072aaf46e2867739faaba9fae89f2679ad5cb4cb356112b197141e996fc10365bb6a95c3fce648a440bd746aa68f5c52a8743995cf696d230ef0 SHA512 18251e2fe5870bcbbde9c4278d7ce969feb6397a727679f56e6cf051cf5a3ded29217c034566cb9c5ebb02d51ad4d12933ab918eeadb0017c78859892bbf4f19
 EBUILD gdal-3.8.0-r1.ebuild 7643 BLAKE2B 38adb7951372403eff4aa19e013e8982ca3a06f3891572e4ec1316667a96bb1e864fb5be5c026dbafefeb42b6b72b7c320556a0a078fcb003fa8382cb2e3ebb8 SHA512 695c5ea85a7fc45cd2d7516ea430721a5c423b2b907d454f364d0a197a36b0120df7028c19d6b885d3bb19c64e0cd237af72a48a78d456a418fce27dee6e14d8
-EBUILD gdal-3.8.5.ebuild 7600 BLAKE2B 11d5379203a991704a0b1fb0d0998948073202ae49ef900fc413843abb18128d58ff69d1fc49f8abf0414d2eda08b632e89f9b614c583e0f742b8f4d3d85f11e SHA512 6e359153896d12f3643d425b37dc09219a15040f30d4704888516ea1a894d90be69052b9847804b70f3408fbef4c2e5187787ae86bccb0d33aa55c376ee66dc6
+EBUILD gdal-3.8.5.ebuild 7599 BLAKE2B 103a81357f0b2adbd1da68618df0f5185c4bd92721cd653e82505ddefe135e48e03a76f965658cd944b19008263c7f37dd6edff73d4a1a8304c2e05bdad12ca6 SHA512 2be1a787d0cd823150cdb6c8bcffe6dbf027573da5e84f65617a03d85e3c9c2970763b389536c96900f80481a08304e6fe63f33d0ba1f18c1cdf740da5268254
 MISC metadata.xml 1297 BLAKE2B 03cb6c5ccc7d2e6ceeaedf24779e9cb4b0dd8ba7c6609604a7d74a05844079d5b102b5413e6d622b79d464784d106665496dce6c0dc902e121382b84596061bc SHA512 df991d15bd43d009c50de6a76af9939b5c6c83b64c4043b52065a77858b8ae77c8287510505b1b80e25c45eb01ccaf276de12db47a8c2b6b22f908a7cb48fae7
diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild
index 21fe3d72c5fd..ef72a52ee603 100644
--- a/sci-libs/gdal/gdal-3.8.5.ebuild
+++ b/sci-libs/gdal/gdal-3.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/34" # subslot is libgdal.so.<SONAME>
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 65a0572a81d4..402bf061c8dd 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -10,7 +10,7 @@ EBUILD libqalculate-4.5.0.ebuild 1868 BLAKE2B be2f2f91a02aef7173c8bee825b3bc3f72
 EBUILD libqalculate-4.6.1.ebuild 1823 BLAKE2B 5b24dd124635d4e34d01fa0ba24ba1ebe44561205ed96852e0218cb4b5451795a4720338a84dcdb21e94988ad294eaf9e41f5288b7d5df7a1b1b6d3ce898b8f3 SHA512 4b057ad5c605fd94d56b849f1875bfd020137969789bd0ac6009c29facc8e33c1967f15ae6ace8ee2afdf05cef892f446a6c8d0cc6e76d1a80f04552afd7ddc1
 EBUILD libqalculate-4.7.0.ebuild 1828 BLAKE2B 7bae5fd9d112e633c90eaf935eed82611f9f63fef7cd9aceae641e70869b665b74bdfca475ebb32259fb6eeb0caa0982eac0ef92ad686f0a9ae7e6f4e1f9897c SHA512 4ba41a2696cc1696f48d4dc7ff712438b3799700f19126f444f24a33c7d8df0c01ed7ed1adf9aceaafd8f36d669287029789416f58cfe41f510f60d5f88e84fb
 EBUILD libqalculate-4.8.0.ebuild 1860 BLAKE2B 0d60ec7de319e8cb8ba6ce250df12bc33cb47d5a4d356aa7fdf5699dcda0ee66cd86627063fa64d1e42451f638611e1f32427cb5eeb696d95029e3041b4405f0 SHA512 9608777db978cf50e2d302e95c544166163c1330747efa23c1b054f1f553aa3a08539d0eb5670662fc5fd7f068fdbe53100d72443ee66f2af587fb93e4d92575
-EBUILD libqalculate-4.8.1.ebuild 1856 BLAKE2B 40d418b0da99bfbe6b3515336cd38aafc0431936c0390b6848cf604dbb1f7cc067ef4d7e16a10373b33d1c39c6c1320c1cd2c625c03b1fa50590293b0471204a SHA512 ecb5a46ff4fae76cf53cc38241202b576021a7903074626ddb0569fa8ff76112f92f463325a3d08e0fb9f917b6e3f35ee04ce84638932b8cd5efec8a3b3760cc
+EBUILD libqalculate-4.8.1.ebuild 1855 BLAKE2B 34c5c9aa745c0c1a899663ee864b89170243c0fb15c09dee2510a0e7503c28c74b040edcf30336e97217d2bbb2f5a333d0b2c8a195174471016f3c541434ce9a SHA512 6cf8a595dcd77451d43e6d2d6244124903a34d3b8c769077d64db2c8b78264677766203b604bf7853af405a4a2fee37c4242f54dbaabfe6054555fcd50d12821
 EBUILD libqalculate-5.0.0.ebuild 1861 BLAKE2B 3c1844621f8fb69f261233104f81cecc380c682b1125772c49ae87b893f46575260a59d0864dd96bdd41c4764a65b99e7a553b05b9e2ffae5f11fb46e0d201b4 SHA512 f594dd4b60df4a819d4ece2923d8a164a6831d02b9b3ec1866870f992699f639a446f5225ff24f9170a7b9f7a60988362fbb30f4ca0708bf63e183c1abc92895
 EBUILD libqalculate-5.0.0b.ebuild 1914 BLAKE2B 9b337eae1c9d5eec46ea909757fe272180ed30c6a695534e44781f1db557a5088adb46dbb0d649a27da384a7da84c28047252dd293c71de5dbcebb4a5ef8bb25 SHA512 45f9e71d5b5ee3d298b74a4557f1f577e9411886e24bc4453615c9d014b279e9e519bffdc8f5671afe16895c736cfb1d9d2a11da51a74d31311c181166197607
 MISC metadata.xml 538 BLAKE2B 70ee5d15c987169990d2065626a2bb97743bb5373ae4c80ce6d1b90acf1ace0129840f241543ceda9f42d5f19494187afb2fc3e4a12fba72e8cf1fffebdfde00 SHA512 7ae4985f3ae5db901c05d9512f34bb1bd65f3eb1f07abb746971ec086051b0560f5629c2fc0adf6ea0b6222a83acbb171516e5d71c8d406e65893e37f26fed2a
diff --git a/sci-libs/libqalculate/libqalculate-4.8.1.ebuild b/sci-libs/libqalculate/libqalculate-4.8.1.ebuild
index eebf39f1b7ff..11f18e6d5570 100644
--- a/sci-libs/libqalculate/libqalculate-4.8.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-4.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2+"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/22"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 55aa84eed61f..4ada2110bda8 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-arnaldocarvalhodemelo/Manifest b/sec-keys/openpgp-keys-arnaldocarvalhodemelo/Manifest
new file mode 100644
index 000000000000..21f8059417ef
--- /dev/null
+++ b/sec-keys/openpgp-keys-arnaldocarvalhodemelo/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-arnaldocarvalhodemelo-20180830.asc 10159 BLAKE2B 4f45335079431a383af76dacf1c9b9b41a28c50036db32a317c97814d3966ace4bde08bc890e595934e5a6b73ffe963c00d3e7be87863af01c65508d40e22b07 SHA512 e6db24be775594b570f218b7ef486fe628f0219863c095e33eb5c161ae5afb14858f2dfd0768c431c283529e7773d0ee72715b0ac19b96a326b50aa1458abbed
+EBUILD openpgp-keys-arnaldocarvalhodemelo-20180830.ebuild 698 BLAKE2B 474e81a044d9158601ce45617e9562e742657862753feab1c9a182ad969e71495fcb8da9985cf7ebe7d3766bdd15e09a52bbd11974625fdf21a04857ed73b389 SHA512 24e6e73311a402fab8ba2ad79405a39d2e781028b2b5a328e137340a85ddbd2ac3ffdf9af9ff194bd3aa9ae8408412d3733deb092bf44ace11bd289b104ce806
+MISC metadata.xml 275 BLAKE2B 321a61c8e4ba26c8144138fe5f91e67f1f8357ffd22f89997bffc1b09f5fb88288443e1e35b82451826c53516afb97f07df9ce856d0d4053fe372482e2700925 SHA512 e3e92c7a915f53572e4bd9005f1035f98c16dafb9d306e7431525aa1ddc6c8af381654f267adfdfd86dff77e025fd4292021e6ccc0b63bc21183ad88781f22ba
diff --git a/sec-keys/openpgp-keys-arnaldocarvalhodemelo/metadata.xml b/sec-keys/openpgp-keys-arnaldocarvalhodemelo/metadata.xml
new file mode 100644
index 000000000000..8d3925c0f6f3
--- /dev/null
+++ b/sec-keys/openpgp-keys-arnaldocarvalhodemelo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zzam@gentoo.org</email>
+		<name>Matthias Schwarzott</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-arnaldocarvalhodemelo/openpgp-keys-arnaldocarvalhodemelo-20180830.ebuild b/sec-keys/openpgp-keys-arnaldocarvalhodemelo/openpgp-keys-arnaldocarvalhodemelo-20180830.ebuild
new file mode 100644
index 000000000000..b6b030231086
--- /dev/null
+++ b/sec-keys/openpgp-keys-arnaldocarvalhodemelo/openpgp-keys-arnaldocarvalhodemelo-20180830.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KEYRING_COMMIT="a180d237a0d1914531072872543a50af04956896"
+
+DESCRIPTION="OpenPGP keys of Arnaldo Carvalho de Melo"
+HOMEPAGE="https://www.kernel.org/signature.html"
+SRC_URI="https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/plain/keys/D65016F35352AA40.asc?id=${KEYRING_COMMIT} -> ${P}.asc"
+
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - arnaldocarvalhodemelo.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fd6b16065805..90fb87072f3d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 316bae111886..f67fb7a1a6d8 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -5,6 +5,6 @@ DIST dbus-broker-36.tar.xz 266084 BLAKE2B 84a805982f038f0d9fe62b7f34de8ecbbdbd9b
 EBUILD dbus-broker-33-r1.ebuild 1297 BLAKE2B bb3cd910bca3b692203185d5d142dad91ee441768f498608d5ba729024f21e081dfbb776ad4f26d84c04f8e5824791b6ec4e5c3a55de12e0d221838abfd4ef65 SHA512 294b7867ebfd4e74cef21eea865d9622c6125abe154f7d2656499261b3715faf4729c050ea0c287b17adddb7de7ada9279f89e6808a9f3ca8300cb78a8c8796a
 EBUILD dbus-broker-33-r2.ebuild 1224 BLAKE2B 4e023563b04f835a700d07632ae6068d8cfd870434f6f4f958b1bb4a251eb541e9b4161b8d9dd998d4d4cb1c40ffd14aaa9633298e9919b8d7eff0ac0ab9d254 SHA512 b388839f16b2cf229e5062b5aac97aae05d3d4336cca1832c372d8cb1d9ac970c3d3ec939397efcb278a1eec0253f153fe461618078929e3056f778797f2eb4c
 EBUILD dbus-broker-35.ebuild 1172 BLAKE2B d9dba01ce97acf09452df7af43929254ac9e5f11dff35fe2ffc5a3b8fb6d4a554080dab1bcb2928c82bf6efcd3914eb8ef7b66fec894a148f579c5a8368b4151 SHA512 e67b761e44b86362964c880492b13912ef74dba678b025bc7f1d2bc9b89641b1cf36a88b4d02c458e160066047a631e461cf4d9789f9b65e5ffcec8f3ee9506a
-EBUILD dbus-broker-36.ebuild 1174 BLAKE2B 99a207aa298758fe8a2434334b1256e675936e0667e1ac7ee593efd04125581cf9a3e48320ef98d33067f167f7a4f08ffdba2e47b3f6ea1eacf6bd3ee36d9f75 SHA512 094f311bdda039c459796b849ea3747f47bcbcf79a9da18646d91f8472331e8e22705aff3928cae9edb85ee970a3bf44d8f7a9f272a72bce6f584deaa2817cd0
+EBUILD dbus-broker-36.ebuild 1173 BLAKE2B b1cdfccd4351f7e7a0862c0b8549cdfa971585c82f6814961bae4c35b14f7c0e667126b1ab83e1775faa49557298f2dee09bb09521a2d5f2d3857c8526f20450 SHA512 cb761fd0e5aa4592ad4b05150f229b44a8b9bd21555cc0301b1357a1f80ab30f1df8cc7a745f47c88cfa22a95b42f958fe69ee3d95768131d78c4b85f4585099
 EBUILD dbus-broker-9999.ebuild 1175 BLAKE2B 29ddbff215520bb46a20b132640d8d7672226b98194c08f28d3bf7f9180db54b520f79b7166315990a5d8eea891de565c3f1668fcbcb19982b1ef2ac70ddaead SHA512 ecd26c94c60af01a678acf4c85ec4f53ad32a6c15b7bcceb2b1e1bf1ab8f4e153206c079124f404a25a558efb738cfb4bc16dd6ae73722241f9573f6565909f8
 MISC metadata.xml 409 BLAKE2B 47bd4b617aaf73c385f1c321592abf3cb4fe06dbc35a574a9cd8f65417a6554314e7034a47d36c04a7f90264c6087103ac3cbcd051d5177b38f22550553b07c0 SHA512 048e0790b2c9e8dbbf446d4ce2651124245976194260b1813b3e1807366ba09cdb204a9787dc77bca0f9bc4400fe94422cfdbe63d729c3333b67c98a6a20a1c3
diff --git a/sys-apps/dbus-broker/dbus-broker-36.ebuild b/sys-apps/dbus-broker/dbus-broker-36.ebuild
index 539705c888a9..9b567317a1b0 100644
--- a/sys-apps/dbus-broker/dbus-broker-36.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-36.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
diff --git a/sys-apps/eza/Manifest b/sys-apps/eza/Manifest
index 35f874ffe3c5..4c4ae923e2a7 100644
--- a/sys-apps/eza/Manifest
+++ b/sys-apps/eza/Manifest
@@ -16,6 +16,7 @@ DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b166
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
 DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605
+DIST by_address-1.2.1.crate 8437 BLAKE2B c1dfdb111a7c9815bb084fc44f1216d45da6ab401b5b646a6eb93b2f7cd77843ac5559f0f390e006ef77645ac2fd814ba86b10e586798b96b02d928d0526ac3b SHA512 f19b8397386913892241cefb1ad71c152280a71e63d2b42e05579e10e3a54ac7a3fc4b706fc1e5e571da7b77b8d483057c9d76f91c88975a970d48f62d718ef0
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
@@ -44,6 +45,8 @@ DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a811
 DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
 DIST eza-0.18.13-manpages.tar.xz 7684 BLAKE2B 9851c72e47d16c6112160d611c44dc057dd527507c9b209baa04f842016504883c5f13af83984ff2914d9f4b23b6cae3ff77994bf9ee2c43e269507562edc9ed SHA512 b0f91ce1a8e1677d34b6a987cb26d05ed3ef40a9153168c8035c570fdd606432690b677f179ac9d16ea6aed7963902cacb3c1f1f2133cea063eab94d33501ecf
 DIST eza-0.18.13.tar.gz 1385128 BLAKE2B 1d84298f8fe950399acaa457b452e85ec9540242bdefc2d542f75bb339b82b8a861f4032b85d9240fde74397a678cd792bf81cb59bda0fb5b7442ee30f43d8b3 SHA512 e257e57e7be3419bd4b9abf72e32222ad5a8029801cd8a7128151da3ce2198a57a1f6187e70ec7a1929e012572348bad56f7904f8cce2e1c26ab8880b6041f0c
+DIST eza-0.18.16-manpages.tar.xz 7676 BLAKE2B 3fafbe01d5403441a2818c889443380f5c5c98befb88e14cafadd3b1c614202f5fc4a0bdca380be46160b4751f9fcdb655d89885f42f042fc68ae5aacfe2642a SHA512 3da68575e4bf9ae779521e0db2496a28f95bca971aa45aee59c04bd5b757b7e195a64437cff6335015a80f6360b5f6581a3b8544178cc4dbd5272727d7c16882
+DIST eza-0.18.16.tar.gz 1385656 BLAKE2B 6761aec3dd638976b0482ece6e8ede8726d4ba90b5fd0d54d8198359601f9bb4abbf6771eb0ab624034a61222c6653adfdce86b64b1c506a4f6326f17e0988e1 SHA512 92bf46df3e851275670fc445c3955999b4ea7b19b2fd6d4c6b403f93be7e4cdbb5c8e536da522603a7bed24e4d924d8ec8a37a3e2174260b378b29690a7ccf7c
 DIST eza-0.18.6-manpages.tar.xz 7680 BLAKE2B 527c4168a3db228e2b64496aee1a85b659f62e732a4d938459eb06b92139673834a4db6ff3a19763608a52d315949dbaaded451d7821080813d79540805a75d4 SHA512 98293a498c590bee460483bf5092fb3b8be5435c76cd3e8bbabca68cccf5fdb0a7152612de3eca65faae138f861e6ac408331fcef154a97efc9db57343467edf
 DIST eza-0.18.6.tar.gz 1385830 BLAKE2B b2f2b3a72388a0b33ba80c206d32a52df36325c40dddf68420b70cf59a41769ffb54599ea5a021d0f28a5f7df795b6c98993104158c590a723d1fe50596201c1 SHA512 f7e492e19a74e66b63658734b2f01c3908ce5364c3ba50982c9dadb3f8c52137d86b341af71c4362388163a19cff0b21a04452d071100bac9b471498f8b2b266
 DIST fast-srgb8-1.0.0.crate 17214 BLAKE2B c5d2e04bf43fccdcd31d6f81cdcde3d89bf0ce94bbc506c2bc09c62b4e83469a2b72db0bb09f4cc2495ace7510834e7fe49df6aa7864092452d9f7865f35cc14 SHA512 834edef5eb4ec23b9e627b5e879a1649af19a17a1af0bae97c040869dbd14751ff3b29a606c52e5fe07b60f07fb695f328409c39788a4e74af0ab7b716688a0b
@@ -68,6 +71,7 @@ DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d
 DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST libc-0.2.154.crate 743304 BLAKE2B 25ff132ec29b78dec455f0a1fc9fbfc744ee0d6eb410aba05ec6b1b08af9d83ec61e56f840f86cb833f590e8cdec7f67ce6e7b630ee227a36581650c81298b84 SHA512 891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61
 DIST libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b SHA512 45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
@@ -89,7 +93,9 @@ DIST openssl-src-111.26.0+1.1.1u.crate 5110372 BLAKE2B 34b2641303b676e2254eb9a75
 DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
 DIST os_pipe-1.1.4.crate 11436 BLAKE2B 215f548a5b16854e156f785a1cc57ff16c241b50223c75159081017889cfe718d6dbdc6567dfc751d71eebda7476c95701c8ae88b1320a0cbba66a694b471d08 SHA512 8568008e30fdc47c1c89f7368654d26407fb6594cd89e2b85786c875d9dd99e77ed2bb84d281351072670e2dfe7a952d6251c6fb4d111ebe6a63cb34942b6aa3
 DIST palette-0.7.5.crate 204746 BLAKE2B bd5bbe4bf8bdc7428834a72513901d40edd7f0027591f8c3ce46412bb42837f473a35b56a45d6a6a71cba693a301c9ad0b4eff0b59cf025f00b0031ec1b050d4 SHA512 b6cc7e9c1ff1302a6827de905450e38a1cc66d97c803add57deeca9f40c565db61b0ac59b6d627e1491b6f221878c2323af5cc6ca05cfeb9554918e9d9c89efe
+DIST palette-0.7.6.crate 230913 BLAKE2B 688eec3839b9fadf6e226a01ed063cbce1d6af9176e20d565b908351d3135a92852e76de17411238e60534895bf43cc585fb9ba1aa76a0683293b4ba6482558f SHA512 c43e39992e796799fc2044e39a8461eb528140438e40ecf64af8ee2f4854a520594be001f8aaa0f4bb8731fadb77b60b07c16592e87924b8af6c6583b0a344b5
 DIST palette_derive-0.7.5.crate 14285 BLAKE2B be50b33a675c46ae62021b4c9e3b4f413b8f9d251a1ee2bd01633877e24e4c880ee6bcc13d4385110d96a1d7c3c53edbb8c46fd0878b97a94c61359349dae96a SHA512 13fa53ae40aea409c94675c119228e39a4602ad50015d8a44b2a394c919dbbb4d719e0aa60fc3fe804d2abe54f405ed0097ff66230e73022227811b7520e49a6
+DIST palette_derive-0.7.6.crate 17073 BLAKE2B 6b225a8f93765a11e4a70c97783b6088c376cacf9c9e237996de4b123dd42dd3a8368519d5ede00323aeed5dd99142bef52c58be3907333963c7012176286ed8 SHA512 29efe90cdd53532015b4f957ed3c1018ee06f55574d4a7f871b868f77b0d9e74ef48da030c4981327abe9876a4664ad78466177fdb49034306e325d4e80baec7
 DIST partition-identity-0.3.0.crate 6711 BLAKE2B 4dbe9e11684099b4cce4e077eb0b8a7942ea166d7f7d094a76f9ef79e52bb03299f9ef52a5badfa5b168e3144dbfb446096ccd06d4b81cfaf7718dbca293901d SHA512 153843ea6c6a76fed350a24fad206304aa88f66755737c50b9f17bea3be434b7fe8940fdb8e31d43415accd4435c6b0c16f5ffcb5d5a1da72cdb8056c7b66bdb
 DIST path-clean-1.0.1.crate 4514 BLAKE2B f35919495573266fda5a68a0de68b7dd751f946b9ed670f369b6c374190fd1a4d1e392d112127b55c5b4ce30237ad7b6e099ae36f8a5393517792a23bf6a7964 SHA512 27ec9449a574d18ec4609147aceb02c0eac98600c15c5c2d5784f7de747479881a83dbc9e12ad07d497944c73d67bd946e5013c7c2cf1125c1931c3c84bb3274
 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
@@ -153,10 +159,12 @@ DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700
 DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe
+DIST unicode-width-0.1.12.crate 24062 BLAKE2B 61afd22353d46a8a77519af9b3580d75dafc7965967f7724cb740f1ee199c7742b3549ad6c67776b876dbda5b8f27c634431f68517e29a72ade1622da9fde446 SHA512 0bafd7a69bdf49c849e7c063ebf0487eca8a76244e3bc18c9a5f4609465dc0e5d482daceb6a9a6f4125b801bf7063cb8225fdb55173e5dc55e7bf278300df1b4
 DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
 DIST uutils_term_grid-0.6.0.crate 10904 BLAKE2B 9779eac591c1e9b2e60630fbd49350d171b11fabe2e0d0df64e2c46da186afa579808ea052c8bb5db02f174a8548905dbcaf3b002fc3f240a1fe469cd739c99e SHA512 9d169a6eacc368824924c49d7f4847927f633c6492d921735deedcefc02c53664b094e8d736fe45b1d9085d5c99ea3ec676f25221a2cf2e81ce4c5f261ad40ab
 DIST uzers-0.11.3.crate 22745 BLAKE2B 59a64624c1a59dff483e28f1b80499191c9a860dcb00e4f27c5c39942ba5a1ec6a4fbe98bb585fca079f4594a57fb24db41675e1aac87fb4873e6056ef13c98f SHA512 3a4eb2d2479550bb34319d2d3841f1e4a5b024dd85193ce127a90479b3d801880d9d3624caa265aaaf9908c7dea73fd7da5780c12c2984db3db04ce45668d97d
+DIST uzers-0.12.0.crate 29098 BLAKE2B 446326a3a3dbb38bf82a2a08f84665b7f1e6a349e1aa4bec44698c51a7c10cf692074c664dbd19100357a3e910f550584bec615bf14afcb1f8d0c40cd8a15030 SHA512 ad0fae66148d451860e86e1046016bf75b4788f412bae9a40bf895c2c385797f3f69e95f030c28ed50cd42fec1cfff2d66228adef393b034547d3bbcc9e7f554
 DIST vcpkg-0.2.12.crate 15530 BLAKE2B 23ee1a34064f19b67232c417a11093f01624b1ddb6aa572ac67ec125dd3f784036e68b58078607e028028e7c7e787c40a158d99cf120b8b80fd8d18c18a07a74 SHA512 33076b42cc83fa614fde2cbcfe1bc5426c99fe3707c129e6c2b7aa16afe3bbf6ada027ac35cc70bc432df25e6a4f6086d251effceae373b6efc23c6a6fb2ff46
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
@@ -192,5 +200,6 @@ DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7
 DIST winnow-0.6.2.crate 157140 BLAKE2B 2cb9e63875403fe525739e2e20d4351f51b6f52dc03928af6de4531f388ec5cd0af7e21ef2f621330f7c91b01eb644fafd0618a246ce3c3dfe61d801e8f8e0e3 SHA512 dd54d69f7ce91f7ac2503ec79bf5bc3e45d2e8b0a3fc593487af33396f819c9df145eacd5ab43ecedca592a89ef259351314335de3fe740a05af5889f24fa8a5
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
 EBUILD eza-0.18.13.ebuild 5546 BLAKE2B 08966f5ca8796a465ddfe522c1b2a5d3786a004dc643f93bf9783b0b3b221aa72bf15d71e50d57126c9e21911bd18050f26e2d43adf39bc9b81a2fee0ed3cd41 SHA512 f3a749e28abc57bc81f75048076abc385a28018cd53ff8c596910fccb16ed6bb4a50bf0b08b1a18e671eda1b10f143fe0d24013febcbc9b7e8bf953ad27c65a6
+EBUILD eza-0.18.16.ebuild 5334 BLAKE2B 550f08a5948e41b55e79aee4b4b52d8849f07dead7f7c8b9f744574bb3a92395bf4ed149b38d9746203b0efa65fd682249f091b55294dc9dbf44089dd7a0bf09 SHA512 0072f4beb855c83fafae11046aaac17a0138b5d58221c3ea766cc87d21a0527b2377e5db0f6f281f1286c3ed15cf99733b578054e484affada1f4e784c91bd16
 EBUILD eza-0.18.6.ebuild 5575 BLAKE2B 78416fbe820dee0ad5417703c5dfd38a6ec287d6c0be48d22142121938b73a8cce4151948cb0445be4ec9588d0833fe963629a71ee9439595f23fa72c0068949 SHA512 18b28e63cec999aa1104e10e18ea3662344afbca804752f7d7ae4ddec7780e9d9696e2d51e432a05110a71a1d404fb2ab5a415df76a999cb1ca100653df0c8f8
 MISC metadata.xml 495 BLAKE2B 306ca308e3132da0688cee3f358d239c0b5ab3014c01d8624344d3a68643741a3d4303c1199454589f7fbc3a22d80fcc8ac66377b02895a39c1b54e078aee787 SHA512 09872a6228f3f3884044a8d08970ca5933a2de28049b900f85a99c749b7710268f7981f7115b796dbff159c471af3a60a4326da4412e660206b9ecbb6d24d11e
diff --git a/sys-apps/eza/eza-0.18.16.ebuild b/sys-apps/eza/eza-0.18.16.ebuild
new file mode 100644
index 000000000000..5dbb8fb85bad
--- /dev/null
+++ b/sys-apps/eza/eza-0.18.16.ebuild
@@ -0,0 +1,250 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.0.5
+	android-tzdata@0.1.1
+	android_system_properties@0.1.5
+	anes@0.1.6
+	ansi-width@0.1.0
+	anstream@0.6.11
+	anstyle-parse@0.2.1
+	anstyle-query@1.0.0
+	anstyle-wincon@3.0.1
+	anstyle@1.0.3
+	approx@0.5.1
+	autocfg@1.1.0
+	base64@0.21.5
+	bitflags@1.3.2
+	bitflags@2.4.0
+	bumpalo@3.13.0
+	by_address@1.2.1
+	byteorder@1.4.3
+	cast@0.3.0
+	cc@1.0.79
+	cfg-if@1.0.0
+	chrono@0.4.34
+	ciborium-io@0.2.1
+	ciborium-ll@0.2.1
+	ciborium@0.2.1
+	clap@4.4.3
+	clap_builder@4.4.2
+	clap_lex@0.5.1
+	colorchoice@1.0.0
+	content_inspector@0.2.4
+	core-foundation-sys@0.8.4
+	criterion-plot@0.5.0
+	criterion@0.5.1
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.15
+	crossbeam-utils@0.8.16
+	datetime@0.5.2
+	deranged@0.3.9
+	dunce@1.0.4
+	either@1.9.0
+	equivalent@1.0.1
+	errno-dragonfly@0.1.2
+	errno@0.3.3
+	fast-srgb8@1.0.0
+	fastrand@2.0.0
+	filetime@0.2.22
+	form_urlencoded@1.0.1
+	git2@0.18.3
+	glob@0.3.1
+	half@1.8.2
+	hashbrown@0.14.2
+	hermit-abi@0.3.2
+	humantime-serde@1.1.1
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.2
+	iana-time-zone@0.1.57
+	idna@0.2.3
+	indexmap@2.1.0
+	is-terminal@0.4.9
+	itertools@0.10.5
+	itoa@1.0.9
+	jobserver@0.1.22
+	js-sys@0.3.64
+	libc@0.2.154
+	libgit2-sys@0.16.2+1.7.2
+	libz-sys@1.1.2
+	line-wrap@0.2.0
+	linux-raw-sys@0.4.11
+	locale@0.2.2
+	log@0.4.21
+	matches@0.1.8
+	memchr@2.6.3
+	memoffset@0.9.0
+	natord@1.0.9
+	normalize-line-endings@0.3.0
+	nu-ansi-term@0.50.0
+	num-traits@0.2.14
+	number_prefix@0.4.0
+	once_cell@1.19.0
+	oorandom@11.1.3
+	openssl-src@111.26.0+1.1.1u
+	openssl-sys@0.9.61
+	os_pipe@1.1.4
+	palette@0.7.6
+	palette_derive@0.7.6
+	partition-identity@0.3.0
+	path-clean@1.0.1
+	percent-encoding@2.3.1
+	phf@0.11.2
+	phf_generator@0.11.2
+	phf_macros@0.11.2
+	phf_shared@0.11.2
+	pkg-config@0.3.19
+	plist@1.6.1
+	plotters-backend@0.3.5
+	plotters-svg@0.3.5
+	plotters@0.3.5
+	powerfmt@0.2.0
+	proc-macro2@1.0.66
+	proc-mounts@0.3.0
+	quick-xml@0.31.0
+	quote@1.0.33
+	rand@0.8.5
+	rand_core@0.6.4
+	rayon-core@1.12.1
+	rayon@1.10.0
+	redox_syscall@0.1.57
+	redox_syscall@0.3.5
+	regex-automata@0.3.8
+	regex-syntax@0.7.5
+	regex@1.9.5
+	rustix@0.38.21
+	ryu@1.0.15
+	same-file@1.0.6
+	scopeguard@1.2.0
+	serde@1.0.188
+	serde_derive@1.0.188
+	serde_json@1.0.107
+	serde_spanned@0.6.5
+	shlex@1.3.0
+	similar@2.2.1
+	siphasher@0.3.11
+	snapbox-macros@0.3.8
+	snapbox@0.5.9
+	syn@2.0.29
+	tempfile@3.8.0
+	terminal_size@0.3.0
+	thiserror-impl@1.0.48
+	thiserror@1.0.48
+	time-core@0.1.2
+	time-macros@0.2.15
+	time@0.3.30
+	timeago@0.4.2
+	tinytemplate@1.2.1
+	tinyvec@1.2.0
+	tinyvec_macros@0.1.0
+	toml_datetime@0.6.5
+	toml_edit@0.22.6
+	trycmd@0.15.1
+	unicode-bidi@0.3.5
+	unicode-ident@1.0.11
+	unicode-normalization@0.1.17
+	unicode-width@0.1.12
+	url@2.2.1
+	utf8parse@0.2.1
+	uutils_term_grid@0.6.0
+	uzers@0.12.0
+	vcpkg@0.2.12
+	wait-timeout@0.2.0
+	walkdir@2.4.0
+	wasm-bindgen-backend@0.2.87
+	wasm-bindgen-macro-support@0.2.87
+	wasm-bindgen-macro@0.2.87
+	wasm-bindgen-shared@0.2.87
+	wasm-bindgen@0.2.87
+	web-sys@0.3.64
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.48.0
+	windows-sys@0.52.0
+	windows-targets@0.48.5
+	windows-targets@0.52.0
+	windows@0.48.0
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_gnullvm@0.52.0
+	windows_aarch64_msvc@0.48.5
+	windows_aarch64_msvc@0.52.0
+	windows_i686_gnu@0.48.5
+	windows_i686_gnu@0.52.0
+	windows_i686_msvc@0.48.5
+	windows_i686_msvc@0.52.0
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnu@0.52.0
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_gnullvm@0.52.0
+	windows_x86_64_msvc@0.48.5
+	windows_x86_64_msvc@0.52.0
+	winnow@0.6.2
+	zoneinfo_compiled@0.5.1
+"
+
+inherit cargo shell-completion
+
+# script to generate the tarball: https://raw.githubusercontent.com/sevz17/eza-manpages/main/generate-eza-manpages
+MANPAGES_BASE_URI="https://github.com/sevz17/eza-manpages/releases/download/${PV}"
+
+DESCRIPTION="A modern, maintained replacement for ls"
+HOMEPAGE="https://github.com/eza-community/eza"
+SRC_URI="https://github.com/eza-community/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${MANPAGES_BASE_URI}/${P}-manpages.tar.xz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+git"
+
+DEPEND="git? ( >=dev-libs/libgit2-1.7.0:= )"
+RDEPEND="${DEPEND}"
+BDEPEND=">=virtual/rust-1.70.0"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	# Known failing test, upstream says it could potentially be ignored for know
+	# bug #914214
+	# https://github.com/eza-community/eza/issues/393
+	rm tests/cmd/{icons,basic}_all.toml || die
+	rm tests/cmd/absolute{,_recurse}_unix.toml || die
+
+	sed -i -e 's/^strip = true$/strip = false/g' Cargo.toml || die "failed to disable stripping"
+
+	if use git; then
+		# libgit2-sys unnecessarily(?) requests <libgit2-1.8.0, bump to 2 for now
+		sed -e '/range_version/s/1\.8\.0/2/' \
+			-i "${ECARGO_VENDOR}"/libgit2-sys-0.16.2+1.7.2/build.rs || die
+	fi
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev git)
+	)
+	export LIBGIT2_NO_VENDOR=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	dobashcomp "completions/bash/${PN}"
+	dozshcomp "completions/zsh/_${PN}"
+	dofishcomp "completions/fish/${PN}.fish"
+
+	doman "${WORKDIR}"/manpages/*
+}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 93b3070be373..76d581e389ed 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -6,13 +6,13 @@ AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3
 AUX systemd-utils-254.3-add-link-kernel-install-shared-option.patch 2350 BLAKE2B b9ad80ddadea96516198b8bee351443ec155e5bdf916b6ee86ec5b6712565ddafc04fa632dd0c56bd9e18345d444a7e17d63446121e84402a85c9a828c20e670 SHA512 390fc403630a6abd5724d8939162de4f869e9b7681824a1280a769742bbcccac4126e1cbcc076b48aaf1aa07097b5eae1f5375da1702a8cc452f92996fd0d4f8
 AUX tmp.conf 48 BLAKE2B 04e0b6bd652b67e18eb96d47cc049ba89fdc28512edca4f5719f21938efbce2f59214e329f2fc3c862afa2b15156ec3fafbc696a1cc8795a8ec3c9dcd7a6b563 SHA512 45743d48ce7c3932310522fbeb7344f6d53c3cc38ca42b1b6aff7619fa91f7722dd328204432aa0fdd19c9107a44f3d0814c12f24bdbeca99b94b217e6927a72
 DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
-DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
+DIST systemd-musl-patches-255.6.tar.gz 31529 BLAKE2B 14b737968168238c62a776052bdb97a3cee87c076317f260147939051f24f9ee8f39dec5e38f9b2ce61ea4737422eece680c4d15dd1fdcc5f3e61b6e5ec5f5c4 SHA512 0ab39a653d42d7b58ad875176270aed93e03ba28b33616520548a01e7d06d170379f9206b4a2b280a588d4f7084af10a2a0ec7a6cb724902ddff149e512d789d
 DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
 DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
-DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
+DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
 EBUILD systemd-utils-254.10-r1.ebuild 13317 BLAKE2B b7694b1f3d640819a80c299ab825ebfc8b4c37d0b6b4f5dbb507af8b31534ffdcfd572132b3062ed93a146bb2173b4e04cebf0e09f9190025903d9ad11a02259 SHA512 c2bbf5f8b8b009386ae680b352c3b1ae3e16e445d21ecc84540d68ac4375b24bfbca9ffd3cc1d633c92a740b2c25b092c22221e527f64239872f122525a99441
 EBUILD systemd-utils-254.12.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
 EBUILD systemd-utils-254.13.ebuild 13318 BLAKE2B 4989c2f5490ee1e91836f626bc57221adf104fcbf0c38466a4404eab6e9fa4dd98edad7dc9e85caec7b209dc0e17837e2be9e0ed42d75ca383642c6eda952b6c SHA512 e932919621c7132a3c61dec276b06fec38d52abeeeb72a92f12219a00382d253142384eca58923bbee029f80abc7b8d1c5783ab1efb7893d42b3ea7db5d1093c
-EBUILD systemd-utils-255.4.ebuild 13741 BLAKE2B b4ae33f57c5edcbba98c274ac65af9314f3eb10bc994377bf30bfff36acd7fb88cde52acd1e1e70f496852b98cf5890d6fad9cfb4d555074eb154e95d8a57334 SHA512 dc4468c9265b1c501fc708529ffcf770843e72b3a65545ff9618fb95712fad1d3fc953a2c03581e00e9ca7d95f88c9f4d1e4c89bb0814cf77988f34beab24222
+EBUILD systemd-utils-255.7.ebuild 13745 BLAKE2B d9a857db560c2dacf50efc7739a848acc3529ee3b268d640d7aecdb4015a7aa8ee0172e7c2fd30713e3f94c086b0313b750458bf57f763c15eff604253e7b743 SHA512 212cf05ed7ac9cb206dfb6f3783ff4080f553e4e4691986de32dc5855da140cb192b99d795b51d51fff778d363777c60c3276d442433e5c7db4e918e5dcf5103
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index ea1032f738dc..767e5a8b7ec6 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 fi
 
-MUSL_PATCHSET="systemd-musl-patches-255.4"
+MUSL_PATCHSET="systemd-musl-patches-255.6"
 SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
@@ -108,8 +108,10 @@ BDEPEND="
 	$(python_gen_cond_dep "
 		dev-python/jinja[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
-		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
-		ukify? ( test? ( ${PEFILE_DEPEND} ) )
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
 	")
 "
 
@@ -302,7 +304,6 @@ multilib_src_compile() {
 			if use test; then
 				targets+=(
 					systemd-runtest.env
-					test-offline-passwd
 				)
 			fi
 		fi
@@ -314,7 +315,10 @@ multilib_src_compile() {
 				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
 			)
 			if use test; then
-				targets+=( test-tmpfile-util )
+				targets+=(
+					test-offline-passwd
+					test-tmpfile-util
+				)
 			fi
 		fi
 		if use udev; then
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 5322edcfd7c3..b056d806fa36 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 5cc1c2dd4f98..002a94c13d87 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -4,8 +4,8 @@ AUX sssd-2.9.1-certmap-fix-partial-string-comparison.patch 3182 BLAKE2B 1e4a41d8
 AUX sssd-2.9.1-conditional-python-install.patch 533 BLAKE2B ce076e4e00bd1b3e8a18427fde385b6a65fbbc65f28a542f575d3b77b8e7d277ebc829a7d43fdbced51475b69553de4fd6e564d52d06c6a83edcae7fa8a2a53a SHA512 4348577c16ab96717e0b92dcae00e955e76e9be6c58a6f6c4435f2315c8393336396e7a0ccdd05f50b97233a956ef674fd64589780500159748ac47c65edb623
 AUX sssd-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch 2137 BLAKE2B 58207d28ab800ae880aa7df1ac90055a9750bef31dcdef2a1152c0108797f82419aa3d26b6ab645e52449cff507f946e750ed261cf767b7181217dd979160bec SHA512 ca2794f7484b1b845184acbcb68dfa09dc582e0f6bd9a15b6c9929027414eb6a7fac7b77ba83585c12924dc9c70c3875e43dd6a71d4f83bc7aabef2506685f54
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
-DIST sssd-2.9.1.tar.gz 7943540 BLAKE2B 9113b63d54beb40ba85c5b5c75068197317b3b8088119cf6557c6b4aed113d2d67f0bc64fc68fb34f4dbef54cccdb8b32ef44112115930751fdec5ec92e0a09b SHA512 eb7345dcfbbd51f005f67ee5032364d369d24589111ded60701e2dbe09563f0b862d343f231dd2e9d548acd8c560a036c8b88a0601f9aa048a7202da8202cd9b
 DIST sssd-2.9.4.tar.gz 7982544 BLAKE2B 6ed23787f1c029abc89f2bbe516787ddbe2fa39f052b75b965972b0a3532c66076f16b775258c5ee6f4ac9ef63bd6ab5bad1a3b660bcac135b3af460d0f14748 SHA512 9546cf074628f32137b16ca0c763988785271124244b645d1e786762e8578f10d983793a29bffcc004b064452fe8d465476a3041688d2f3c11c2751fb5bec3e2
-EBUILD sssd-2.9.1-r1.ebuild 8596 BLAKE2B 21a3409023f9f7d96f6aaada2799f9f4aef85f207502d7452448dcf6467f215fc3948af29e15eb012ade772e4e3ad960b100107f1c4f1b24be012b11372f28d4 SHA512 54c07e3943613a0c5247afe593868061a62e9f3701e6f26c2790ca8f73a46a81287fe25f10b9553363934f14a9dec7ef6e037a73337bf0c2510ad2d88999bc6e
+DIST sssd-2.9.5.tar.gz 8001964 BLAKE2B e9c839e58fbeac9e8cba83b726f075c5db6ce85059546d745672c222b594f4aa26ad103f0eb3a8ff9e2b364c3502fb93c639fe9e621fefd6fecd2319f5cb499a SHA512 d219f12ffc75af233f0e4ffc62c0442acc6da3cd94ed4eab7102a78821af5257c8e4ba0d06b2c99c08e06502f8d0d0bcc80540d63823dbe0f52eb0432ae7e14d
 EBUILD sssd-2.9.4.ebuild 8231 BLAKE2B 9d8340e7c1d68df7ea67f4ee022e9da401f7d3e9632c84b9092e98fc4cfba420cad67b6ece7ac97d7be25ffa12dc25222a4de6ac5e1ced8c9b601788f2c3ea37 SHA512 9df1f15c0e6b75e2e5df4e07ede5f130fd8e11747aeb1619cc6d25fefcfc5564cabcd926e86e0071e98387abc773fc0897ca7b8261eb5892370d91dde4b76d43
-MISC metadata.xml 1382 BLAKE2B 858581b958e6b5fed53b36447b8b91455e44d097694d4e940292274070e2e8a14a77f8f002db96359145c80502a8e1461e7c5124caa3956dfaf3ede959d2ae51 SHA512 218e910742da465683987e0d6941bdcdb234e3f3d59be4fb7765e2e28c1724c585f55f8fc4398ad0d0ae06a84ec6a29b8ae5190ac044a9bd22c6d50f914547a7
+EBUILD sssd-2.9.5.ebuild 8233 BLAKE2B 58e625aef587d9c100779c638d4fc4b730d2ee9b8ce55a49f2818e069dff8f988227d65fb831365d254c6daf6df499aeb418a26c91b4fe512d5f43a6a3583dd8 SHA512 4ef708184606f072bc54549b71eea8d6586eb472e0e8d06e0c26fca38b4aaba6485794bd61f0386ee3272761702a28b20e63dc4307f978d0c166ce4eeca32446
+MISC metadata.xml 1267 BLAKE2B 847adab267e38c20cf971df0613afbc7fce8c062dd29ce67df7f95fa5c631da010bfb9031bfbf300400359db6dc11a5a9a3b38cdaef01f48a8c8f47747bede68 SHA512 d088e62bf9365810693a46d765c4f951bdf96a6569ad52c161a7ea70adfe6e183f57894cb2e8aa45f2f9ebd3227b521e11fb5d2314783274bc2536ed393ec0e6
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index a4f6c50a3f9e..e719d6e332fd 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -15,7 +15,6 @@
 	</maintainer>
 	<use>
 		<flag name="acl"> Build and use the cifsidmap plugin</flag>
-		<flag name="keyutils">Controls whether the kernel keyring should be used via <pkg>sys-apps/keyutils</pkg></flag>
 		<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-fs/nfs-utils</pkg></flag>
 		<flag name="samba">Add Privileged Attribute Certificate Support for Kerberos</flag>
diff --git a/sys-auth/sssd/sssd-2.9.1-r1.ebuild b/sys-auth/sssd/sssd-2.9.5.ebuild
index af43a0ad6b5a..ab3b9e2d270b 100644
--- a/sys-auth/sssd/sssd-2.9.1-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.9.5.ebuild
@@ -15,6 +15,7 @@ DESCRIPTION="System Security Services Daemon provides access to identity and aut
 HOMEPAGE="https://github.com/SSSD/sssd"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SSSD/sssd.git"
@@ -23,8 +24,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="acl doc keyutils +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
+IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( sudo )"
@@ -44,6 +44,7 @@ DEPEND="
 	>=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.30:=[sasl,experimental]
 	>=sys-apps/dbus-1.6
+	>=sys-apps/keyutils-1.5:=
 	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
 	>=sys-libs/talloc-2.0.7
 	>=sys-libs/tdb-1.2.9
@@ -51,7 +52,6 @@ DEPEND="
 	>=sys-libs/ldb-1.1.17-r1:=
 	virtual/libintl
 	acl? ( net-fs/cifs-utils[acl] )
-	keyutils? ( >=sys-apps/keyutils-1.5:= )
 	netlink? ( dev-libs/libnl:3 )
 	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
@@ -102,9 +102,6 @@ CONFIG_CHECK="~KEYS"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.8.2-krb5_pw_locked.patch"
-	"${FILESDIR}/${PN}-2.9.1-BUILD-Accept-krb5-1.21-for-building-the-PAC-plugin.patch"
-	"${FILESDIR}/${PN}-2.9.1-certmap-fix-partial-string-comparison.patch"
-	"${FILESDIR}/${PN}-2.9.1-sssct-allow-cert-show-and-cert-eval-rule-as-non-root.patch"
 	"${FILESDIR}/${PN}-2.9.1-conditional-python-install.patch"
 )
 
@@ -172,9 +169,6 @@ src_configure() {
 multilib_src_configure() {
 	local myconf=()
 
-	export ac_cv_header_keyutils_h=$(usex keyutils)
-	export ac_cv_lib_keyutils_add_key=$(usex keyutils)
-
 	myconf+=(
 		--libexecdir="${EPREFIX}"/usr/libexec
 		--localstatedir="${EPREFIX}"/var
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index c8091bdf945f..f67703c6cfa5 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 6c5d148fbcc1..9cdd0e62465f 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,11 +1,6 @@
 AUX refind-0.13.2-gnuefi-3.0.14.patch 2031 BLAKE2B f70d92f26eab16baaa58ffeee1294eae5833243c26ca4b22f69d41d03fcab0a11b820de6e63c3b43171e16cd5b03688b9056ecddbb89305b0d9ce69a0abca02a SHA512 9bf3fe0413fc8d9a6a3878f786cc477127fb83e8abc306c91ea26437816e662ff46d0af363296d47596e1af82b3570b070c863d57a292941da41ca31a58dca0a
 AUX refind-0.14.0.2-clang.patch 1346 BLAKE2B 09221bd26f2add12831faba093e3704174be4e1ebe42eac4d55d4e2d8181798ecfa8bf4eb17e1cc68e90096896e1ea5cc56f7b86bd391e5839788ac7e1934f40 SHA512 b04d721667500a17d35702454d4f0597a6fb8a89734533598aed31d3c69edbfec0ceb3a1a1f9a510c499ff74d95ed9a4e56d86979d65cc671f4a7f49df733a68
 AUX refind-sbat-gentoo-0.14.0.2.csv 246 BLAKE2B 8a16eb928f587aaaa680098c660de4e0930a6cc3b5719eb5085f843933c7e3863e8ff0517a596574ffff7bc2d8a2f89f1fa3606c7c618e9ff303edac5f0f5673 SHA512 b8e1a49ed408c6e57f4c8c5a012857b6a5024463eeba33070665dcf95f310cf30d62e2767409ad19d3a41b6ab346804bc7f5d34b92d2dd35aa44406df016bb91
-DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
-DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9 SHA512 7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
 DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a SHA512 41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e
-EBUILD refind-0.13.2.ebuild 3745 BLAKE2B 9243432755ba50d61e33ce13b0ff8d877d9861fbb8964a7063cda1286530f41b48e00fb122dc9b73167ad8be886c6146839b32be175abf54c1e8b86bdaf9a7c6 SHA512 0ef544965dbdde15a3e79ef0d51beb7c3240d56bb957b29966afdc996c4ac614bc48f653bf3ad10035c29d8f8b5c99af7f9953a2e9e9c0eaf14b5213b81c627f
-EBUILD refind-0.13.3.1.ebuild 3745 BLAKE2B 720b8e706f4c72d1c96c98a476fb3ba08889cf2b12ae7c728f46ae980c18d2fa33374527e65e32335f5fb39a925895fabc056296a2e8e35b629aab01a29a1631 SHA512 857370e7466b00cccfa2930f0d1b0b370337bae8db8dd9da220f01017dc8e586fa74026e194a09123aaf83dab70ef5226fca4f19b54ce99927b6f67e09b2818e
 EBUILD refind-0.14.0.2-r1.ebuild 4222 BLAKE2B 2fad3a4199461d7becc79196cbdc034d58286e6f6cb6a201cd67310efd0426fd9946e26ef046917fc93066bef5b423ef258448a229af33d118148455d8083bb2 SHA512 3cadb89d43bb2893b6d340bfebc9eb98e7431f07f0b5224c936dfd49602d1ded92b312b1d14d46678551922d202a128b7ad6d5a05289159760eaf21dfe9b2f76
-EBUILD refind-0.14.0.2.ebuild 3864 BLAKE2B 488a080f260eba55ab56f34d704ea316b75731bc3e486f9ef4ad66e5972c8af20c2444538c6e232d257d36b21db563273057b07431a53eb9e63c8803765cb720 SHA512 ffbf137e5ed0ba263aeb2331041a8f16bae8c5b8f545a6f3bf6df547b540c6bed72c0febef6ec06160e47fbcf6851dc41a180d8ec910453a4f4dc93fae040116
 MISC metadata.xml 3809 BLAKE2B a2cf074c3c572fff3bdb1679b505cf3a9de4489acacdbc2b015fed91e7f37157fa7e3124438ad8af0788cc90f464b217c4fe05294c2c69ef637648cc68825885 SHA512 4b289982bbfda2697dd13b4c1fc020842a0fa06672e5d7f4b48cd39ef4348b1a17989686c55c96d220f682c8c95a340901fb3968d051aef8c8e5cf944bbcb4e4
diff --git a/sys-boot/refind/refind-0.13.2.ebuild b/sys-boot/refind/refind-0.13.2.ebuild
deleted file mode 100644
index 43811be7c0ff..000000000000
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc"
-
-DEPEND="sys-boot/gnu-efi"
-
-DOCS=( README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gnuefi-3.0.14.patch
-)
-
-pkg_pretend() {
-	if use custom-cflags; then
-		ewarn
-		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
-		ewarn "using this can result in EFI binaries that fail to run and may"
-		ewarn "fail to build at all. This is strongly advised against by upstream."
-		ewarn
-		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use x86; then
-		export EFIARCH=ia32
-		export BUILDARCH=ia32
-	elif use amd64; then
-		export EFIARCH=x64
-		export BUILDARCH=x86_64
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
-	sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
-}
-
-src_compile() {
-	# Update fs targets depending on uses
-	local fs fs_names=()
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			fs_names+=(${fs})
-		fi
-	done
-	fs_names=("${fs_names[@]/%/_gnuefi}")
-
-	# Prepare flags
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		FILESYSTEMS="${fs_names[*]}"
-		FILESYSTEMS_GNUEFI="${fs_names[*]}"
-	)
-	if use custom-cflags; then
-		make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}")
-	fi
-
-	emake "${make_flags[@]}" all_gnuefi
-}
-
-src_install() {
-	exeinto "/usr/$(get_libdir)/${PN}"
-	doexe refind-install
-	dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
-
-	if use doc; then
-		doman "docs/man/"*
-		DOCS+=(NEWS.txt docs/refind docs/Styles)
-	fi
-	einstalldocs
-
-	insinto "/usr/$(get_libdir)/${PN}/refind"
-	doins "refind/refind_${EFIARCH}.efi"
-	doins "refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "drivers_${EFIARCH}" ]]; then
-		doins -r "drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
-	doins "gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "keys"
-
-	dosbin "mkrlconf"
-	dosbin "mvrefind"
-	dosbin "refind-mkdefault"
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}"
-	elog "You will need to use the command 'refind-install' to install"
-	elog "the binaries into your EFI System Partition"
-	elog ""
-	elog "refind-install requires additional packages to be fully functional:"
-	elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
-	elog " sys-boot/efibootmgr for writing to NVRAM"
-	elog " sys-apps/gptfdisk for ESP management"
-	elog ""
-	elog "refind-mkdefault requires >=dev-lang/python-3"
-	elog ""
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A sample configuration can be found at"
-		elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample"
-	else
-		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
-			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
-			ewarn "to manage ESP"
-			ewarn ""
-		fi
-		ewarn "Note that this installation will not update any EFI binaries"
-		ewarn "on your EFI System Partition - this needs to be done manually"
-	fi
-}
diff --git a/sys-boot/refind/refind-0.13.3.1.ebuild b/sys-boot/refind/refind-0.13.3.1.ebuild
deleted file mode 100644
index 1622d6196851..000000000000
--- a/sys-boot/refind/refind-0.13.3.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs secureboot
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc"
-
-DEPEND="sys-boot/gnu-efi"
-
-DOCS=( README.txt )
-
-pkg_pretend() {
-	if use custom-cflags; then
-		ewarn
-		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
-		ewarn "using this can result in EFI binaries that fail to run and may"
-		ewarn "fail to build at all. This is strongly advised against by upstream."
-		ewarn
-		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use x86; then
-		export EFIARCH=ia32
-		export BUILDARCH=ia32
-	elif use amd64; then
-		export EFIARCH=x64
-		export BUILDARCH=x86_64
-	fi
-	secureboot_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
-	sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
-}
-
-src_compile() {
-	# Update fs targets depending on uses
-	local fs fs_names=()
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			fs_names+=(${fs})
-		fi
-	done
-	fs_names=("${fs_names[@]/%/_gnuefi}")
-
-	# Prepare flags
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		FILESYSTEMS="${fs_names[*]}"
-		FILESYSTEMS_GNUEFI="${fs_names[*]}"
-	)
-	if use custom-cflags; then
-		make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}")
-	fi
-
-	emake "${make_flags[@]}" all_gnuefi
-}
-
-src_install() {
-	exeinto "/usr/$(get_libdir)/${PN}"
-	doexe refind-install
-	dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
-
-	if use doc; then
-		doman "docs/man/"*
-		DOCS+=(NEWS.txt docs/refind docs/Styles)
-	fi
-	einstalldocs
-
-	insinto "/usr/$(get_libdir)/${PN}/refind"
-	doins "refind/refind_${EFIARCH}.efi"
-	doins "refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "drivers_${EFIARCH}" ]]; then
-		doins -r "drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
-	doins "gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "keys"
-
-	dosbin "mkrlconf"
-	dosbin "mvrefind"
-	dosbin "refind-mkdefault"
-
-	secureboot_auto_sign --in-place
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}"
-	elog "You will need to use the command 'refind-install' to install"
-	elog "the binaries into your EFI System Partition"
-	elog ""
-	elog "refind-install requires additional packages to be fully functional:"
-	elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
-	elog " sys-boot/efibootmgr for writing to NVRAM"
-	elog " sys-apps/gptfdisk for ESP management"
-	elog ""
-	elog "refind-mkdefault requires >=dev-lang/python-3"
-	elog ""
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A sample configuration can be found at"
-		elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample"
-	else
-		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
-			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
-			ewarn "to manage ESP"
-			ewarn ""
-		fi
-		ewarn "Note that this installation will not update any EFI binaries"
-		ewarn "on your EFI System Partition - this needs to be done manually"
-	fi
-}
diff --git a/sys-boot/refind/refind-0.14.0.2.ebuild b/sys-boot/refind/refind-0.14.0.2.ebuild
deleted file mode 100644
index d019f31c4acb..000000000000
--- a/sys-boot/refind/refind-0.14.0.2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs secureboot
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc"
-
-DEPEND="sys-boot/gnu-efi"
-
-DOCS=( README.txt )
-
-pkg_pretend() {
-	if use custom-cflags; then
-		ewarn
-		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
-		ewarn "using this can result in EFI binaries that fail to run and may"
-		ewarn "fail to build at all. This is strongly advised against by upstream."
-		ewarn
-		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use x86; then
-		export EFIARCH=ia32
-		export BUILDARCH=ia32
-	elif use amd64; then
-		export EFIARCH=x64
-		export BUILDARCH=x86_64
-	fi
-	secureboot_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
-	sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
-
-	cp "${FILESDIR}"/refind-sbat-gentoo-${PV}.csv refind-sbat-gentoo.csv || die
-}
-
-src_compile() {
-	# Update fs targets depending on uses
-	local fs fs_names=()
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			fs_names+=(${fs})
-		fi
-	done
-	fs_names=("${fs_names[@]/%/_gnuefi}")
-
-	# Prepare flags
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		FILESYSTEMS="${fs_names[*]}"
-		FILESYSTEMS_GNUEFI="${fs_names[*]}"
-		REFIND_SBAT_CSV=refind-sbat-gentoo.csv
-	)
-	if use custom-cflags; then
-		make_flags=(CFLAGS="${CFLAGS} -fno-tree-loop-distribute-patterns" "${make_flags[@]}")
-	fi
-
-	emake "${make_flags[@]}" all_gnuefi
-}
-
-src_install() {
-	exeinto "/usr/$(get_libdir)/${PN}"
-	doexe refind-install
-	dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
-
-	if use doc; then
-		doman "docs/man/"*
-		DOCS+=(NEWS.txt docs/refind docs/Styles)
-	fi
-	einstalldocs
-
-	insinto "/usr/$(get_libdir)/${PN}/refind"
-	doins "refind/refind_${EFIARCH}.efi"
-	doins "refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "drivers_${EFIARCH}" ]]; then
-		doins -r "drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
-	doins "gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "keys"
-
-	dosbin "mkrlconf"
-	dosbin "mvrefind"
-	dosbin "refind-mkdefault"
-
-	secureboot_auto_sign --in-place
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}"
-	elog "You will need to use the command 'refind-install' to install"
-	elog "the binaries into your EFI System Partition"
-	elog ""
-	elog "refind-install requires additional packages to be fully functional:"
-	elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
-	elog " sys-boot/efibootmgr for writing to NVRAM"
-	elog " sys-apps/gptfdisk for ESP management"
-	elog ""
-	elog "refind-mkdefault requires >=dev-lang/python-3"
-	elog ""
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "A sample configuration can be found at"
-		elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample"
-	else
-		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
-			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
-			ewarn "to manage ESP"
-			ewarn ""
-		fi
-		ewarn "Note that this installation will not update any EFI binaries"
-		ewarn "on your EFI System Partition - this needs to be done manually"
-	fi
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8de9be169112..b4a0243e2a20 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 78f85e1a3860..9947462f2a7c 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -37,6 +37,6 @@ EBUILD binutils-2.38-r2.ebuild 13134 BLAKE2B e2e1805917cb6a6ee19c30ad3b9bec5daaa
 EBUILD binutils-2.39-r5.ebuild 13655 BLAKE2B 28c078a099015b084637aae637a2c346eab4156f8b94842fff790dbc7004049cbcf7a71ec9ad2b892d4d89d1377a7f3876514e6de167adab9f98639cf17e4763 SHA512 b7f3aa7252f6803afabef0d2434151cc381023ac41ab0a0771dd2480333c4ff5ae59d0211603261ab5c5071f4281fbaa9190a172fcefdf3eb37c70ced3f737f6
 EBUILD binutils-2.40-r9.ebuild 14132 BLAKE2B ea7d8298ab644f3c4d1c2ca620949cef1f2e146243052eaa50545ccf46bd63858265c00169e0440e90cbefb8d4e16cceb64d709074dcdfc1c257a4760baa2196 SHA512 0396cf41ca211169afc106efe15c8a009e354d675c21a42b73aa7c1feab785e9c927c034ef86b92aba57b4a422189838b9c51a3e864be82901eb535da331a7a9
 EBUILD binutils-2.41-r5.ebuild 14654 BLAKE2B 2049e8618a6aa4385bf036726a027cc2e58ce1e5e00d35d1d9926846f0209fcfe958d42e7ad4de6ea474bc8dd728c6f8d706121867e2c39e1404621deb15a1af SHA512 feeb65fc8ed360235fddc9d287d4aa28109ea60504283332940133eb40bcc0be5799a400c1da8aa7cf0e4038ebc8619ee225d6baf83ddc9f1d923c2ba2ded675
-EBUILD binutils-2.42-r1.ebuild 15527 BLAKE2B b32d127722cf8f14594b965d68c818c5436a43bc64ce3335070e6efcac545e35e2c0ae04aa439c95be402eba66f3036d667ffafb3036de96251c0c54945509cc SHA512 e99b0a1c6b82de4ec5a967660451c98363c2cbcb4889b37ee6b57ce6e69daf073408e8716cb89199e29774c1772fd97cf388e77a8341705a8727c2192db13547
-EBUILD binutils-9999.ebuild 15444 BLAKE2B d3f00248815bd1c36bccc423e893d19cd54e6cce393e62c4289a019dc9cabce6deeb467ab0ea1485b2a07adc677b420c457b15a5d9ee20ebfbee437eea353738 SHA512 06b998873f96f045975973500610001507592ba298f6e8807666942cc02897cbbec047376f895d3b91417a1f4938ddee85826755bf8c5aacd85d25802876a943
+EBUILD binutils-2.42-r1.ebuild 15579 BLAKE2B 073f19b62d0851f6909119a36dae63ef1b2e84758fcbbf747e55b0428ea07af5dc6bf5848aa1ac0c1561987446025e481488430e466bdaff35466c144d93e7fe SHA512 be021ff68ac3e6a9441d97fd563e9bab9f55521d4399981985d4e25232cda11f4fc4b3b4f60ebe15980a4a83bd287165f4ca404ea27a7882af795c6b5b791d8e
+EBUILD binutils-9999.ebuild 15496 BLAKE2B 4708c1507b3e6819c103d11d92878dc75598775b5b21649dc6542bad29e637e2eb6ad825ae8ba226c5544bfc92dda06fa979bc9867963bad67678641b9916561 SHA512 af38c91493feec27fc9bea56990480ec090946f55a6f1bcdef7ed2e80b44205518032798abec0451c7f8e829612c1c59302e920ec64ce97f94b66ad8a5f461bb
 MISC metadata.xml 995 BLAKE2B 85ccdd924f8c459a4cd7e608dff59c7281523da0d9457b0094b97e140cd07a300cb38383d9402808859100ca0bf219ce86e367bb5282216121bd81f68d588c17 SHA512 3ee538640e5d8c0efe6b8cf1de299e0d78965dece1ad814384844e8e24db72b11ca30d5fb68dfae2e71046d35aee0e71ee3ecbda3730ca49446dd0b2cd0f817c
diff --git a/sys-devel/binutils/binutils-2.42-r1.ebuild b/sys-devel/binutils/binutils-2.42-r1.ebuild
index 4857ba622360..1089082dacd8 100644
--- a/sys-devel/binutils/binutils-2.42-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.42-r1.ebuild
@@ -60,6 +60,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? ( sys-apps/texinfo )
+	pgo? (
+		dev-util/dejagnu
+		app-alternatives/bc
+	)
 	test? (
 		dev-util/dejagnu
 		app-alternatives/bc
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 57de6c0b9975..6b3ec2c68fb7 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -60,6 +60,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? ( sys-apps/texinfo )
+	pgo? (
+		dev-util/dejagnu
+		app-alternatives/bc
+	)
 	test? (
 		dev-util/dejagnu
 		app-alternatives/bc
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f5cf657207b7..210fbe4b0d19 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 7f46b51ecf81..5dbe5124350b 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,7 +1,7 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
 DIST wordpress-6.4.4.tar.gz 24480617 BLAKE2B 60856beddbbb2ba25e56eb9aaa5af0b857b4f318309d87ff5ffecee909ceec6fee0a6df0e10d2c8580af670c8b7132d4e64d6756083ecd2d16736dcf3afc01be SHA512 c369567ecdde465e063127b21de55136d37f35d959944708b2fdf05ac9fa876bbf30395783ce0435ecb68f0662bedfb83900463ebe0b442c57ac02491b5e87a4
-DIST wordpress-6.5.3.tar.gz 24696379 BLAKE2B dbc2246ba23c03d194bf9feee18880feefe6b34f6b6d907b6d3ae302cdb6cfe61ca9c050e51899fe280a56728ac52555b61f14f0f607b619aacb165551f9740e SHA512 904be348fbb416f94a3cfc770e126f920b9dce3b4c8486e50ccbe3e3d37429949c1d385d2a75a70db8632049bd6c482d695e4565372df291403c90a261fe135b
+DIST wordpress-6.5.4.tar.gz 24695517 BLAKE2B 4d5b7557ff6a2e81c9193aff3a6be97c43f1852a24d24b1bf07fa59288dcdb17fa142224e5bd0ac98c42101e395ee70356ae886a01ade39ca97c6c5ac5ac4ce3 SHA512 b10834609f313164e29d40cc8c435bb0b78659832f4fae80ad52aa4ceb9fb8bcadb860c769808115ff958a49dadfdbf27ad24c33ff45f1f3681e3c23976d6008
 EBUILD wordpress-6.4.4.ebuild 1408 BLAKE2B 23189f597c744b8c0371cc4aee32bf5d77106e82c43b9a1d6f570acdd5911eb5dc2d9e603c9222a366cc5ceea03dcc4bef89c88b26f16b6236a491ea4691ea56 SHA512 ba6a76ddfb479d4d7dc5a8f035065f54030fcbc2a42b3cfc39559188f744a52d177cc547b39617f3986de3194ed656cfae1815fd7579aebbee1b594893856e74
-EBUILD wordpress-6.5.3.ebuild 1408 BLAKE2B 23189f597c744b8c0371cc4aee32bf5d77106e82c43b9a1d6f570acdd5911eb5dc2d9e603c9222a366cc5ceea03dcc4bef89c88b26f16b6236a491ea4691ea56 SHA512 ba6a76ddfb479d4d7dc5a8f035065f54030fcbc2a42b3cfc39559188f744a52d177cc547b39617f3986de3194ed656cfae1815fd7579aebbee1b594893856e74
+EBUILD wordpress-6.5.4.ebuild 1408 BLAKE2B 23189f597c744b8c0371cc4aee32bf5d77106e82c43b9a1d6f570acdd5911eb5dc2d9e603c9222a366cc5ceea03dcc4bef89c88b26f16b6236a491ea4691ea56 SHA512 ba6a76ddfb479d4d7dc5a8f035065f54030fcbc2a42b3cfc39559188f744a52d177cc547b39617f3986de3194ed656cfae1815fd7579aebbee1b594893856e74
 MISC metadata.xml 429 BLAKE2B ece54e1ebae950843d98b414ca862ebcbf410230587eab84031e4afa00a9e6f0305b025a79fd5f8ce3cb70b2528adb8c5eee05e6855f0b2f55aa4680fd9a4b83 SHA512 acc7151db82ee83a7ad9b6eff62918afdc44436cd18aa4f5fe0b562257ed34ac7ca28582cfb5196b1049cb9e0db0a94c51faa8cd7c3bb081a5a0a2333391388c
diff --git a/www-apps/wordpress/wordpress-6.5.3.ebuild b/www-apps/wordpress/wordpress-6.5.4.ebuild
index aedc91ade73a..aedc91ade73a 100644
--- a/www-apps/wordpress/wordpress-6.5.3.ebuild
+++ b/www-apps/wordpress/wordpress-6.5.4.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d952e4a106fd..a8652d574ac0 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index dd7c272c274f..f1943558fce5 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -9,6 +9,6 @@ AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068
 AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
 EBUILD h2o-2.2.6-r1.ebuild 2263 BLAKE2B 005c6542d0187ce53da0d9f4e54a2e3b8a0917ed0cc7a01baaed11f50eb93ba564e0184c83563ed9c3c7fefb98a5fa95ed15bd0ab7d9ffc02b562f9048081596 SHA512 6469baaa4cdc0b3ef074c7147f1a010d547028bae913cbc8ac3edd4416a721075edc12a904db22b4138ad90196fed4cbb83a7809cb4b319197db2bdef77d8e47
-EBUILD h2o-2.2.6-r2.ebuild 2304 BLAKE2B 15591e7a33e4827e34d71616f249fcf4c33b30ebc78367ee5824de8fe9474e8f4139c3215075063b44b755eb43221cd19eb615aa015c7026e445aced935cca14 SHA512 6aa6c9183101c55b7feb48db0437149028073398bf4014fd62c48bddabc38e0f46ec8df485578d4eb8fb32ca00a0a3cf521c1f05e01f4b08752cfb0d71049c8e
+EBUILD h2o-2.2.6-r2.ebuild 2302 BLAKE2B a8278b2a88bddffb1b364673b5c01cbf842b3eec5f5c3c11cd453537bb1e0995858f97c436a41a9661655fae62d804d2d99d6d403651f3edd1b901a0d7f54d2b SHA512 4654d98e8827aecb84b48fb5278640292f34b2d82406bb21cc55a26d6936aa0b166b2405aee3c817e4362b0fc1c7a3ffd1d7ec1a45eb583a32f086377c73c377
 EBUILD h2o-9999.ebuild 2121 BLAKE2B e1733a69fc5bd2eefb52c17d17eaa66a4f6238e8b49c29289b618192b7f9fc4a16f62c20b4a482644f3b3e83fff0448a3c0c801ea45b0ced1d05ffce26cb4e2f SHA512 51d00792bbc4e421c9b16e438ee847af86426020d7063b37969ce0dd6e6fe2e6faed9c51fffc866f525fb392d1acb3bf6922497af882470ec81f08a4dc2d782c
 MISC metadata.xml 665 BLAKE2B 8f3b7754ea54384656357283be7c0e35516579a4f0c8c9e727bef5189390d20de61c43d2c42bc1bcdc311c2670dee5c20a50b2f9354cb1986f8681f3acf86d02 SHA512 10abcf052f63ceba53b5c95a8ff79970c19fc8a094345806cd7fc461a10b1d94ec7b48925709e2fc9980fcd3630731b577e2d879981c240d9dd96cd840bb376c
diff --git a/www-servers/h2o/h2o-2.2.6-r2.ebuild b/www-servers/h2o/h2o-2.2.6-r2.ebuild
index c4e26fb1736d..45ad42c87a40 100644
--- a/www-servers/h2o/h2o-2.2.6-r2.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
 RDEPEND="acct-group/h2o
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index e4aa70db38e8..9a92761f85ca 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index 02692e51ea5b..53821f771a43 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,5 +1,5 @@
 DIST xconsole-1.0.8.tar.xz 129336 BLAKE2B 3c00072944594b02d5cbc88e8243198502a1a418e4f0c3e86badf659a62bada126323af1b21517368fd6a6204397714cb8769b7a1702fe9b8d884c057cc429ee SHA512 93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa
 DIST xconsole-1.1.0.tar.xz 131900 BLAKE2B 2dacabbfb7b55b6dc2cae255a4a8c58dc8cd0130cc07ce1c2b5e6c68cdff270fad31487e0491ba670e126582359c033cbefe30c71639f8b2b2ce32e7d1e995d7 SHA512 1b5b1e1e15e3b988c159e924ac5c51734c4e37ed112815fc6bf6e36f80e840ccd904a4f0b0f27191e0dbf656d367a38873fd493a266887daa111e5266eebf37e
 EBUILD xconsole-1.0.8.ebuild 419 BLAKE2B fd63c1006a342cc8522cf0dba9b36c5dd0b8309e46f0d4b225b764385605bf3ee7f06520a2e70715240b122d25a6239175f9e647c030499970b26b74ad198894 SHA512 b0590750503fc57970966019ba65d8cef3d45697e1044dd7c6f09f47fc9a54cf9a6cc119e64f19953d4d3b80a3946080dddc78d5d88e48f922903fe15035d254
-EBUILD xconsole-1.1.0.ebuild 423 BLAKE2B 8043420072794d9d7e11eed600d2df13eb048b4ccbdb07482b8dd508177369bacd3daa388000ba60568fab0ff1a11f0ee0c87fcb77a439e1f337ee6eb16e21dd SHA512 663c36d948e2bebad36ee04d29a893db91dd703204e71ca60cc363a114d4930a592ea61a4edcdd1965d5e2fa75489628d9c957f109c953adf3df8a979845949e
+EBUILD xconsole-1.1.0.ebuild 420 BLAKE2B 5704f7c98bccfda5a7fda2bc7107d10bf1b0d8ea9ec693f8a7442c57cf300dfd30f22119dfd1180a4bf8f7aefa0193487b58824dadce33d05a2a76a56c179c57 SHA512 b47c6b388514eb6d3fd611fa3da7230ff88561398e0c67796c76b80a461e7d0ef41ff60b49f941a646a1f8bde6de3c2492217b5e5820ba82979ca5d26a98e539
 MISC metadata.xml 339 BLAKE2B 5b8a1e9ab2831e15172c695cf2f8d1769da23d2ef64cd3b893c660aff6cad9ab562867ea90b2e037e69e4f8fdc5a3c2696188f717dcba6406f105e3931f90b23 SHA512 c51a4c1be44028e27e091db12ff7f24d5f04b61c8af34e5a865fcbd7659730609830dd08e3b4ada803b9224ca0941e4bfd277f4865186775ed892776a6449078
diff --git a/x11-apps/xconsole/xconsole-1.1.0.ebuild b/x11-apps/xconsole/xconsole-1.1.0.ebuild
index b4347ebf33d3..a96c41f2d9ee 100644
--- a/x11-apps/xconsole/xconsole-1.1.0.ebuild
+++ b/x11-apps/xconsole/xconsole-1.1.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="monitor system console messages with X"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 2786526302c3..cb34d4bbae30 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9562ee08cde8..ed1d1e6fd7c5 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -26,6 +26,7 @@ DIST NVIDIA-Linux-aarch64-535.183.01.run 269908911 BLAKE2B 93665bfd2c66391b232c0
 DIST NVIDIA-Linux-aarch64-550.78.run 236152931 BLAKE2B 1ae4edd55f762a18243501acbe9ce82c77aa4ce86e30a30d36499279d6672f0840c134707a6638529e3d496e48f8ef82139615fe79f54686b9c113c8aadc05cb SHA512 b823c031b5adbe6a19c1bb69bd990d0d4dbcb371628f7933843fb935547d9a749a359db54ab252bf7fa54797da21357d9eb6c020b1fe947cc2aeece3302fde70
 DIST NVIDIA-Linux-aarch64-550.90.07.run 236478345 BLAKE2B dba3321c10e14afcf95a7d97173635b066881e56bcbaff3e9ba1ef4dafa132342f3ad39f4ffe0359259f9f3e1b2fd95746a84be09f6d30de5effde1c7fcd4731 SHA512 79b956ad890a096bfb00c9dd996cba0673200b1d61f702ea6c5c64ca3fe2cefdd61e2bc844fdb7b4668c2796af5399be51e6f511565c3799cf731de2a7e9efaa
 DIST NVIDIA-Linux-aarch64-555.42.02.run 234097043 BLAKE2B 82664f7ef7ed9c38dfbb21498174d24f2a6d44cc2ff7d00dceb16019d1d8f24861b4db5c1ff3dc265a4d3fd8c50ac1abafa8dd8df272242f2b67a1395c87bf7c SHA512 44fa733b593ebb90992224b4d174b2101714ce8503961756ef4525547d7daf3abbdda896637f9f204e10dfffdc3eda7739c5c7747740726ca59eb122d6e4c243
+DIST NVIDIA-Linux-aarch64-555.52.04.run 234131612 BLAKE2B 9dd9d2e5c161c2dbf7afef8f38b746ec87b48821ff889ecb5fa801f708321bb9fca16a2fda4c0a191fbcfaa19049bec2ab16aeae6cbe27bf850ae9a396c6db11 SHA512 2b80791be01b95adc24b291ff9864ece3aea351a739353feffd124a7c996cd940f1306b4a28d624f1b96259f1e2152ef9200ca64a4afe8a765de8a7759abf0db
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.239.06.run 272849102 BLAKE2B 556c8f7058b83d8c4c7ccb2f62619ac001f7c3868b80ee091e2949fb7b35e136fec83c15efcf4dd4c99d312f8c36f83c76e250d18d091e053355396b8347af11 SHA512 92bdfb11db405071cd58deed2a0853448932657e256258e0a0bda5069f00485e2b6e49b4a0eeff499a4991be4f884273f3564c164110b1ed1f5d924506f13e2d
@@ -37,11 +38,13 @@ DIST NVIDIA-Linux-x86_64-550.40.63.run 311906744 BLAKE2B f1cae98e5d5e6cdcc0837f4
 DIST NVIDIA-Linux-x86_64-550.78.run 306886562 BLAKE2B acc9e787d0cbaee86fc568010a67314a6d3a133f23ebc8aa622f253f92b27df9969a197084a3eb71442c51b5a599361fab4a38c93e3f85898ed6a68bb965aa6e SHA512 02c69e2699cd20c99bf147139920ce4708c0e4224b7234c499481996e45a879f29ebe1e5eb0e94f756bf8290d2a019050dd92add9ad375ea3bd5e21704823249
 DIST NVIDIA-Linux-x86_64-550.90.07.run 307583808 BLAKE2B 2bb4c03d4df42c0f6847bb0b088e9f0094382acac4a87204721dfe09a4b555373b4a9f0e6984ad65bdf98ade7cc70b316222413a94824bdc89926bb9b46db0a4 SHA512 b8c2cdc918ec74b44517fc181f9eb08ea44d0d9a53f221c0aa243e34872203721a9a7fb27628d35e3028a6aa68917abd2962cc13d5d4b09e92866e14678567a4
 DIST NVIDIA-Linux-x86_64-555.42.02.run 304024834 BLAKE2B 41a87750da7d67cb48e7ca1fde805b36a2707e6f04582dcd356cb2756490daa484a7efcc9efeb989b0e58a4132ab1652c3c76a1903aff9997b3c2eb25d708a84 SHA512 d19208896d0c0415fad5148999d08ef4e89e27c75b6b81a295345b349839e51a04a50428177d900300be9629c43a192ee4774f99d30fc5a98084a6725cf2a251
+DIST NVIDIA-Linux-x86_64-555.52.04.run 304165755 BLAKE2B 1390526c0687931624c11cf8cc800d51a24f0d5a0dd684f1046ddea9c95353a9410c573c147fad64e9dd32c65d75a18b6be4266967b6b9bc80fe5c9b34438e45 SHA512 4b0b082105013e17d67976e12fc88607f4c7d89880ca1b13e0fb79f90f0173e472dda17b28cc1d3bbdfb80062c91ee237ad0f0f5ae8a894bc3f3f680bbf0c5ee
 DIST NVIDIA-kernel-module-source-525.147.05.tar.xz 10140684 BLAKE2B a8ce7c1d1047be9154fd67366c5bfa13a19f03c883f24ee35043d17d517e83303420449750f9e7adc7142f61564dd5d8e5a19884dbe540514979df6381ff7f1f SHA512 58920b26081a68e05178176edb0ce8ac4a5d365492adf51d6ffe57102385ff08abc5e14741e0500419e62a752441c97051d60939245eea64b039cc7efca15b7d
 DIST NVIDIA-kernel-module-source-535.179.tar.xz 12509824 BLAKE2B 5380e5d06fbe372cccb5fca4b53980ba08baf0daf5f00aa72ae7995d0fdb0b9cdf4400a950ddd428a684153c59a000b99f5deffc409127b2869af5a541c1beac SHA512 ef70dc527fca2d0ffdc2c6052e0eafeb1c5520663cbc983a374c6741208260605ff689ff3b8383e2d9563311f3f156c5e43a083433ac22933424116f5a0953b5
 DIST NVIDIA-kernel-module-source-535.183.01.tar.xz 12521824 BLAKE2B 5ae8c2c0d9d019b99c947f1581712989325815cfe88ee308df0b710b64c4bc5c501c9741c67e25c47eaf7a114c521a595aabc85d0f05854c0692216f320378c4 SHA512 1c255eeafc79d228b3d76d1d20d1a2dc4583cbbb77db6af48b389694b0daaabd7c1962cf73e1a489e0ab07cf57751770ff8ce5f2489f2489a211e39bd7436637
 DIST NVIDIA-kernel-module-source-550.78.tar.xz 13468756 BLAKE2B 3f8786d1ca1aa84fa4cf68cdc4044332df19de40688eee280ab04da4fb7eb2d6be4e198b4315db8125f4c9f4351730dfd1631ff7adc0cee8c82898de9c8d7f2e SHA512 ac636712b3be56d29ed6f0dc91f5591a43c499f971b45e606104d47b93667a866314f178ddf752bdfe9b79357ab59dcaf644a64de3a35fba74228b56a5993895
 DIST NVIDIA-kernel-module-source-550.90.07.tar.xz 13504752 BLAKE2B 0bc4e882cba6408db0a62323764b4302d77ce5dae801ec46bd1c08946358624776c2e36ee3dbc070c40ee1b77a4fa6b303c5a73ef311ba1f8d1454f48ace58eb SHA512 f2f0deabce609fbd5125110e7e0bb3b758491d365a6e8d975bb4893f588403faa9f25b7e03218a4ada54dc916a8fbe955f042dd2e8d53bcc69e81f5e22aece82
+DIST NVIDIA-kernel-module-source-555.52.04.tar.xz 13673476 BLAKE2B e30287bb46132a0d1dae9086ee9af8df279106c71072ae92eb3eb6ae8b9259f0cea3f84f6c238c60f62fec7ac586e33de14e37e59e7b009224a02f017a68550a SHA512 e75107a19c119eb64ad92793009eafccc719d8b5a16b243d7735a246558b3def3a06da5250060816a2aefbad50ccc263ac787359fa4d291280b071691b148780
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.239.06.tar.bz2 146286 BLAKE2B c288c0455e6426d0e18ab7b9f5c0437af50420bdf86cebd798dd3aca463341e831808ecb297d9c3233d50a4e9dac435f8114d6eb2ed2fcb6c39be7824c3dc95c SHA512 e60f6d295649557c3c316174fb37ca0ae6e57604bc3880a3b5929b33ff6d7cc8ef74a118f9075795b81d36b6a4107a02fbad0acbca18b78d05e5d9e7998c82a8
 DIST nvidia-installer-470.256.02.tar.bz2 146269 BLAKE2B 4402e725c8fd0157eb84d4ec140a33f97e873014577487ef1e32fb8921cabe79c60ff46532e5bfaabb2b6ac894f7c80086dbab19e61906e2e27346fb85f98829 SHA512 c962dc17d9696256d1ebedcaeb3010994f2ce3895aedc47987599ebfec132a9b9a249d2ece6502b15bd4a93f9b0106aa13487a7da5f64199c274ce11eba27cfd
@@ -51,6 +54,7 @@ DIST nvidia-installer-535.183.01.tar.bz2 148412 BLAKE2B 6eff47169ab5b2b4bfec5917
 DIST nvidia-installer-550.78.tar.bz2 155771 BLAKE2B 8834c210e35485548a63c42d976cc85cb8e41f9f2fb171dce179a28041a664d750239c55cf87522852efd63710a21fac2274829feac886a61d2da2e700f6927b SHA512 42617f36213a7b566da72d8ed71fbdd5470a2aed50142759882fd72875e011ad5a269eea23f71c91b23061845db82f07ef811be6017d177ac54cb170a1722473
 DIST nvidia-installer-550.90.07.tar.bz2 155441 BLAKE2B 16a22549ac3b188933d2a0ed875aefcff01a195741d309641b343cafca4d62c7c269f5864dab94a231d23f323986b9c28c2f4472a922548f411aa569e04eb47a SHA512 7d902e2e26b752ab10945e12864624b809b48236499eeee50c838129b843ecb3ac263579ef0cfcd87cbe3292c5f3b39e3e6e33b98bb6f9ff5a2aa5c05363f20c
 DIST nvidia-installer-555.42.02.tar.gz 219438 BLAKE2B 82d0c35e4ace7130992c3a1a4dcb79bd200bc61a9215a73b33a0e4383083708acbb3b0ecd164929cb2cd14b96e99ed2119deecc6aafaf99b77aae453bd15e287 SHA512 37cd1b42b3bda830c3eff7b9e7a124dcb5a35883e769ebdef8f4b62e70b3139eafeb8bc42e1b10fb0a37a2723caf7354d5b2a30056fc87388b88a1ea406214e9
+DIST nvidia-installer-555.52.04.tar.bz2 158441 BLAKE2B 4b5df4ab47d5f92f3823c36a54a7394b9751330a8bbf2525e6f93ad84c71314a29efd2e0b88a73f3cbb9f3ed638efa03b54cb2624f8f18edd8bd6b80a9d5595e SHA512 db13ac390e54957ea51dea2448c71e075db541ac3cbfbe709cbd8780ee7d028e7a2449fe00c12597a61413cb0279d9f68c07f0af932501b185ac521b3afbc1b3
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.239.06.tar.bz2 38783 BLAKE2B d572bfb18b0ff99606a5ca909c0f4e45709d69dbcbba43ce37e570d4dfa2dae11fab352129879418af2af26d8ad20eb976e9c2e4d181895bdbec00beb61a9fc6 SHA512 9293b33b4c14e5f873846fba3526059b6605d70a4d7e35c7032c3ed89cc7a6a71e04b344695093d97ed3280ec2094988105144e8c66dc037ed5eb8292022eec0
 DIST nvidia-modprobe-470.256.02.tar.bz2 38769 BLAKE2B 0db444b09b0b6d24c04877fae95249e781d82b3141f90eb05d869b64d2b6e65ad00bf44c4e427c64dbd4765fa99a8699f80a1d95b00c66137a54dc878d7ea298 SHA512 c1cbfa6c8e188e5a5eb5d390b9a903406cbff103d212fc30e611e4023be3fde896ad84e8bb45b030beb5d1bcd8155c9e55a8f9636c45ce1e2a5c03f672989a31
@@ -60,6 +64,7 @@ DIST nvidia-modprobe-535.183.01.tar.bz2 40623 BLAKE2B 52c6f6758b6881ef61a41a7e24
 DIST nvidia-modprobe-550.78.tar.bz2 41538 BLAKE2B 6cac94baccb3cd402d42140803317856feb659cde43613e8b59c37f6f0b8e5697cfd9583002ab40d0ab53757a64d902f8fb3a7e302a2ca11022b6fbd9188fac3 SHA512 e97501946ec6250a0778c99fe5ba2698cc0d4a49c19bbcedf60a20aedfc722cf56b31a75dccaf19a3a44852b52451fcacb7b84b6529a84a8313fc6afe8a99439
 DIST nvidia-modprobe-550.90.07.tar.bz2 41494 BLAKE2B c76ca53c8461af8a19b41f1e167785ad3db0c97df6e5b860300793facd5db8f3dfa1053e8e96b98eb1261850c5aefce4be77e2c8f26787eff1584c07a10114fd SHA512 40d8d1ed0a230ffa8f63b6f4dfbcecd0712347b326371552b29d5d00f3def72e145056a896bb04389095f06ffb0b4bb51b24ee226cd3ea638ff479dfd40c1139
 DIST nvidia-modprobe-555.42.02.tar.gz 47294 BLAKE2B 07a29c7e8d36d69ffd9544396cc2660a405c1b42f67928e23c19e95802fd5a2ad99580f75f8aef4849f89714dcc1413b069a70d661873bdcc61a8fc8e23720a1 SHA512 e6a8d6be5e7f73b3fc000bb932e1ce54c0a6917c982c78ed0522041b76fd6453f5c0240fdf9c50e132ee09aef59f8f834f3e2708d5390412354fa9b5a1e1833d
+DIST nvidia-modprobe-555.52.04.tar.bz2 41687 BLAKE2B 1b6722fcc72ca0149d0b0186c89685e0fe5e95ffda8c94b0962de70382a2307e6aa3627deea1ad9f3740a65840a6260806827b3f30f66e2e2b0899865662de9c SHA512 9137eb69577e9c1eb81b34e3ada7beb235b6571d5069b82dca0acc4190699af66aee42224ab71081329f08685ed4f7ba795b0fb734d7a4fcdbffe9e72d42d296
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.239.06.tar.bz2 46554 BLAKE2B 41d8ba35f68dd4609cd215249913790b150c22410c3c6b3675d7003136b660f427e14d48abb9495851d18028042ecbd1cf0557bad877fe5b0e5e6cf15d90b77c SHA512 69ff1cf92e90e5ef87d44764abf165cf3540d321264962dc09e093bb9c1e767f468e9d1e989f43a14d1ba47fc24f1e34252bf478743a80f51373d4bd20baf6fa
 DIST nvidia-persistenced-470.256.02.tar.bz2 46567 BLAKE2B 8f837322a3b88412fd2f6acf38721b49a6cb444fbd842d652519e5596f2e545d8f06bbdf017f46a22301ce87455f96147fab2829ca5fbf26131ec3e4a772e282 SHA512 4fd19258649b7d39945fb5c8578bf11ab118617dd14f3d11cdf15cb3fe77daf7b4719e4ae57af59031b1b809d02f4e8e8afed0ec60b9d0aed4d2488bd3013cd9
@@ -69,6 +74,7 @@ DIST nvidia-persistenced-535.183.01.tar.bz2 48585 BLAKE2B 8f000f85ff959b86e7e0a4
 DIST nvidia-persistenced-550.78.tar.bz2 49682 BLAKE2B 860785b94f35affa85fc6fa4f68508cc63e841168534be9bb762f82e72fe89434a32e265722a3f37cb3ffc2f41c57fae354a5b6679a68b40269efeecc81b37f9 SHA512 86dbe155a8270a292dc68b2ad8e9ab751d0e06fbcbd906085cafdbd3a681449159dcd1842ee5e2c9b09c157f035e2759e32b8fb8b654c36fb48f1de789e97118
 DIST nvidia-persistenced-550.90.07.tar.bz2 49680 BLAKE2B 0055472f692f8bc0d94a0b758d63c1e3197d88ecf6bec8418e47ee354b4d9f9c367a88e9859cafa0eaebfc622927c4208fa9d6b33493e40f9ecbddaa89637b52 SHA512 60fed926b2d8778345899ea15d455ac59677f7e8b0ce0416d404403ca51269217d55a0c67c0a180d9ee08e9160899e10a28b59c48e76e9a4d3521ab422778061
 DIST nvidia-persistenced-555.42.02.tar.gz 57896 BLAKE2B 57d5af52f90bf58e508e3887e0173cb06ba698f80c7ecc3aa40aa95f58d1a4e8df6debc2919163915dbfb5a1e261ca907cddb82ed5b0e9bb6a034f4e3fb6389c SHA512 a55af8d16c5c0bf586319b57af589862fe0d00806f18042537095c4fbfcbc22fbadfb3d39bae0b80508cc458eb9b0be871d48a141f20fa6563459125382db072
+DIST nvidia-persistenced-555.52.04.tar.bz2 49892 BLAKE2B 7a8063361ccb7daceb4502f9caa3f84d30e489e46031cdf862170f28429cb5249ce3b5da89a6927c03eae17e48b7617d3a8a0b015845574fb15f73e1f4ce9d60 SHA512 5525316e33363b6ce6f4a6885e36659b17b948efeb5ffd509cd3206c586ee723d5e10c2e10b03375d8db0d06cd1408d2e02329441c20a1da74907ae7cdd49462
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.239.06.tar.bz2 1062310 BLAKE2B 1154421feafe40a0ce0e980374a60f325801f52a03af9f96ea9411c61de6c7bf8049dd2750204ae53a570ebe600c7972cdefcee84886fb2a6c170affd00d51bc SHA512 a1f70491bb8bb06a802c3db36858c8956fb93db463b46c13bd8dc4fa81ff4aea01bb53ebbc9b4d18da241c4442e8d17cb4204fdcbb5a8ad3e23275b7205bf3c1
 DIST nvidia-settings-470.256.02.tar.bz2 1062273 BLAKE2B 8e66201e7861469b12932595ef8f9fd29d4cfd570c2576ae7fbb7383f61c55ac71fe721cc431e79d6d69f86d998b5b4c3cafe531b573f439e6b499b0fc047a19 SHA512 626e66118ae2e62eacfdf44e37529c409b945a6f33637b9690d74abd87a2afb581aaca5f90328d280da99ceb659959d0e5dc5c22ef8013b2205b2b1c72e08007
@@ -78,6 +84,7 @@ DIST nvidia-settings-535.183.01.tar.bz2 1094944 BLAKE2B 70d8deff3b587f54fcc6eb9b
 DIST nvidia-settings-550.78.tar.bz2 1099746 BLAKE2B a57b4731109072c9bf2accdffebf3ac4e12c964f85e4a70b6058f2e78843caa1cc46d468de87ecb01965787323af9bcbcecde1d72f5ecf5a18d9d122391af52a SHA512 f7e1a82f86cadb78b5c5b6482893fd949cc5017ca052ce083aec4ad0e48d83c35330ed9e2d970fd49c4907bec8cda8231d34b66f47cf0187a25735159989d42e
 DIST nvidia-settings-550.90.07.tar.bz2 1099159 BLAKE2B de06cdc13bf6fe1f20cb9173928b6931bbd92fdb410b3914fa0425397024fe5da34493c4534b1650745082ea4deeb77db0c17d21692ce17717e022158a3e361f SHA512 b4a8d9f57c8067af78293e2522de137569dced0b23013f8bd8fcebe1558ee1bad3838eb52a792044f31cd0d380cf2bd630d2b36968c71a602b7b0889ebad0696
 DIST nvidia-settings-555.42.02.tar.gz 1280477 BLAKE2B af1bf7433dc376959637412ea4b10b5fb77beb3e0ad7a82a1146e133a5cbd924edbe394d0b93f76b93022da13f723ce32df301bea73c0a634ee1a7d0f20bf12f SHA512 2807ce9ae077c979f38e22aa7da75f0afcb588d776c6ee8d84158076da1933fef7f86adfed52c29159823fa60ebefe5a5fb0c1591ead36c72ab73fd4376359e8
+DIST nvidia-settings-555.52.04.tar.bz2 1100172 BLAKE2B 0a464a5ac5a79256c4b29e063f68ba77eb34dcded2da5e343d1c4ef2779c650c5f853d4d1c3b0dc09af433604d53e0dbd55a458331e30dcd3130b6068333b927 SHA512 cb760b712e15424afe7e5241dddbf06d56756178c02320d974cf0b3eaaa946f35b1a485fef975ea826319613c6316d529426d52ab50f305212707c849da8bdb7
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.239.06.tar.bz2 108687 BLAKE2B e400a59b4626b37abd12893438774737f18500771c8fd8d63e7060e80463a8599f7248fda542096a5e9bcac700595cec151494695e68dc7667c89509eeb14646 SHA512 aec235f65c9f568c6717a37fe0f16b8100ffbba7731975bac5c17802b70f1ec1ff235e08c09a0bc9de0c63a705018ce76acc8252a39f56c300b9e2a556f3612a
 DIST nvidia-xconfig-470.256.02.tar.bz2 108698 BLAKE2B e468574e4bc57e7279d4120e2b08a201671b50d408be0c530eabe5da7d45daaf21cbf5c7fa31410d0d732fe8ea1551cbfb21d1ae193c1b3f5b5c50c764c9e236 SHA512 9dcec1e0c2b56b4d38a5f2c76086302f8bc0860cc15012cce29c3a5062f801a48b6a2bb78344361b07a2717b58502783441a2daf402d9973a17526175b1f15ca
@@ -87,6 +94,7 @@ DIST nvidia-xconfig-535.183.01.tar.bz2 110994 BLAKE2B 154f0e3885fdc2a30373daad07
 DIST nvidia-xconfig-550.78.tar.bz2 111190 BLAKE2B d4c7418554765d278458dcc664d37a5d641baa047312920787717c09aceaad13a2d99a0eb97f0d8d7b4b960013a02183eb3a1ee31fca40918e5f4c0fda024e43 SHA512 513733a80ec5a4e5fc60c3a1a0f787a6f1b64ffefd72d69208833626cd096a09957ad8f66568711c4059178879c3ce6167acefee6f23e4dd99cc226eecadf080
 DIST nvidia-xconfig-550.90.07.tar.bz2 111144 BLAKE2B 730986cafd56798a8cd51c06870d596ec812dc807e168b80857b323d353119c8ff28f08a7584434c5f7ff9e2eea1a754c51c680fe61f3b88c2aa527eaf9ecda4 SHA512 106c6735444f321f429e8a30ff6d1c3cfa2dca08237a6cc8e4619735895ac42e041f7bd97fc1d498a4db151b1020d88f5a506dea80a6a3325e706884c56a1feb
 DIST nvidia-xconfig-555.42.02.tar.gz 145634 BLAKE2B 55b020b60f1f68a8e643ceb2cf26c19cded97e987d33d38c87f1a06d5f96a2ee9327550e9400b7505cee68a62b34aac32d34be730425594a76737dd86c3c75e0 SHA512 3c9cccb9ab06c295369c109075898d6c0ff1f206257e05d54a9df5bae7e1b6c53157cf58056c19c017000ca79e308cf5a6f1347c7b0f30e078d3d63463283fe8
+DIST nvidia-xconfig-555.52.04.tar.bz2 111211 BLAKE2B a42c8f45b1c17fd50803210e32540c41f076dac5da0822c490a9c92e4c874bc99c287b3293d297e3b1731d85ffc771edf3917d6dcfbbb48236e3b473f2992adf SHA512 19fff2f07ca5f30aacf44b633ac5a9969e5b40ebe54416feef37c349ea7b9305837d2dcbc28122d3a45d2b75bd2c293227f19da8938325a03c31add6145cb3c5
 DIST open-gpu-kernel-modules-550.40.63.tar.gz 13764093 BLAKE2B be201222e19fef570968592ef8ee6dc7386cbc86a099ed7e28cc2d4da3278ac5d4c339665369f3346ad10d4af9bd2b6faf3d7fc4612802cecbfa70b95b9f53ea SHA512 5612f1a081b4ffd1d096b67b36a2b5b34d3e6016ea09e19da49ea08bde8fd2a9d2c54e9242a50a124cf3c662642558815cd17889191f5e1c2ca2f99ca4315208
 DIST open-gpu-kernel-modules-555.42.02.tar.gz 14031192 BLAKE2B caac5380718d0369390f7948769a50302bd7f3835c665a7123cbd9dbf341868d7403a092d6a3643aa740417885ca2d2b69722593bd75b671c430ff0703be4523 SHA512 2fd2e9b36c4d5c1ef10099e05625898bfec461e1b818f5d4ea5f8b4d01dd2dbaf014bccc0621fcd4295d5dc7fbe303f15c2ed8e975687e71a6ea1dae29d7ff3f
 EBUILD nvidia-drivers-390.157.ebuild 14786 BLAKE2B 0aa98cd61987bbcd67e2c117e0acee43d28b54787f1d4dbafa3e871902dc6d066873b8b6cfb57a83b1a17e49b8701925924e4b5f2d2abb22f12494c852a65c8a SHA512 2e85077a050a546a5b6a8f4ec38c27d7269a5993ff04b6f49e6b7a96e2e27ecd84e61730e286470af63e87a314258eb5e6a64a3c93aa7347d27541d9ea30ade7
@@ -99,4 +107,5 @@ EBUILD nvidia-drivers-550.40.63.ebuild 16637 BLAKE2B c2abf908a46b278823df2bc7e9d
 EBUILD nvidia-drivers-550.78.ebuild 16588 BLAKE2B 6cebe5de291b90b518e590bf29a7dded93cd57767d41c47899aec0f70251f7013c86e3b3291f3849bab943cac1e285454de6b1ef36e7d3bba91460aa16be3fa3 SHA512 515acafda6faadc2d1cddb891e00f50f9fa369389f672ebca8b256c4093ce0aa11d777aeb21f33a74acebd119f9aacf61cc7e9db4ebfb7a03ebcfe179ad37219
 EBUILD nvidia-drivers-550.90.07.ebuild 16589 BLAKE2B e5d06fb49a038c72ef020b2d072e46717b0729b0f7e1c47a7b2d3cf8161e7ca5111b1221013c63183776ff82146f555be5baf42df1e80d5a77011e15cbe4b589 SHA512 3a0eb56a43417e6f861efffa87065eefa31d10b942acd5a8be0b70ff6a0f4930ab78994fb0922857b812eed4aef933bb13f35550c257532082f04a3acca1d8c4
 EBUILD nvidia-drivers-555.42.02.ebuild 16783 BLAKE2B 46fe5aa4aba10ebd86ce6ca3eab09e0c9474e9ecd75e933661bee88bb3750befeb07de76f554e8944a4554f0dfdc2ba86a8fa9195d1d917704b79a136029e8f7 SHA512 2a02d1ccea7b0a05efa13239322609b55751428c7ecda7be6d4d05484c0a4fab52d2001fdc3eb9636ba2cc4f25a31c62a8eff523f27cfeed68cc9c501030e91d
+EBUILD nvidia-drivers-555.52.04.ebuild 16682 BLAKE2B 16a8cac4fb6d9e95cdf6088e7feb35015bebe14d4a553b37f9511c2b5865b3577e8019d30a5c0ab98fa54df9792e5d574934f92b66da8e0bf3985b1a79dafc24 SHA512 298a8bc2ef966392351019197ce01da49fbc9042784f976210f87a92a2f8039cb2ac51f143d8c6b10486948758cb197c6330ed71ec16b0cd3f79b551d3c7714d
 MISC metadata.xml 1397 BLAKE2B b39a2ca7389d6086a5344ee5afe276387bbb784ad52504a3d1e36ab387e18174b8d1eabf6c97a94815ce24ef4daf31e64664da387b3148b455de1074131d783f SHA512 b6389b117ac27de432477d0ed0c9e29deb41a3f4d115266d547d4e2babe531251eedfc0a65e4bbf0089242b562c79ac9d1b3fafd72e571584ceb6fd2f8f28192
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
new file mode 100644
index 000000000000..bd5205a9ad26
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-555.52.04.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=+modules
+inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1
+inherit systemd toolchain-funcs unpacker user-info
+
+MODULES_KERNEL_MAX=6.9
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
+"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S=${WORKDIR}
+
+LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
+SLOT="0/${PV%%.*}"
+# kept unkeyworded due to being a beta
+#KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced powerd +static-libs +tools wayland"
+REQUIRED_USE="kernel-open? ( modules )"
+
+COMMON_DEPEND="
+	acct-group/video
+	X? ( x11-libs/libpciaccess )
+	persistenced? (
+		acct-user/nvpd
+		net-libs/libtirpc:=
+	)
+	tools? (
+		>=app-accessibility/at-spi2-core-2.46:2
+		dev-libs/glib:2
+		dev-libs/jansson:=
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-libs/openssl:0/3
+	sys-libs/glibc
+	X? (
+		media-libs/libglvnd[X,abi_x86_32(-)?]
+		x11-libs/libX11[abi_x86_32(-)?]
+		x11-libs/libXext[abi_x86_32(-)?]
+	)
+	powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
+	wayland? (
+		gui-libs/egl-gbm
+		>=gui-libs/egl-wayland-1.1.10
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)
+"
+BDEPEND="
+	sys-devel/m4
+	virtual/pkgconfig
+"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
+)
+
+pkg_setup() {
+	use modules && [[ ${MERGE_TYPE} != binary ]] || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES
+		$(usev powerd '~CPU_FREQ')
+	"
+
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
+	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
+	Cannot be directly selected in the kernel's menuconfig, and may need
+	selection of another option that requires it such as CONFIG_KVM."
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	# make patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+		-i kernel{,-module-source/kernel-open}/conftest.sh || die
+
+	# adjust service files
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> "${T}"/nvidia-persistenced.service || die
+	sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
+
+	# use alternative vulkan icd option if USE=-X (bug #909181)
+	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-545.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	# makefile attempts to install wayland library even if not built
+	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
+		nvidia-settings/src/Makefile || die
+}
+
+src_compile() {
+	tc-export AR CC CXX LD OBJCOPY OBJDUMP PKG_CONFIG
+
+	local xnvflags=-fPIC #840389
+	# lto static libraries tend to cause problems without fat objects
+	tc-is-lto && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
+
+	NV_ARGS=(
+		PREFIX="${EPREFIX}"/usr
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_LD="$(tc-getBUILD_LD)"
+		BUILD_GTK2LIB=
+		NV_USE_BUNDLED_LIBJANSSON=0
+		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+		WAYLAND_AVAILABLE=$(usex wayland 1 0)
+		XNVCTRL_CFLAGS="${xnvflags}"
+	)
+
+	if use modules; then
+		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
+
+		local modlistargs=video:kernel
+		if use kernel-open; then
+			modlistargs+=-module-source:kernel-module-source/kernel-open
+
+			# environment flags are normally unused for modules, but nvidia
+			# uses it for building the "blob" and it is a bit fragile
+			filter-flags -fno-plt #912949
+			filter-lto
+			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
+		fi
+
+		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
+		local modargs=(
+			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
+			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
+		)
+
+		# temporary workaround for bug #914468
+		CPP="${KERNEL_CC} -E" tc-is-clang && addpredict "${KV_OUT_DIR}"
+
+		linux-mod-r1_src_compile
+		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe
+	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+	if use tools; then
+		# avoid noisy *very* noisy logs with deprecation warnings
+		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+			emake "${NV_ARGS[@]}" -C nvidia-settings
+	elif use static-libs; then
+		# pretend GTK+3 is available, not actually used (bug #880879)
+		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
+			-C nvidia-settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+	local -A paths=(
+		[APPLICATION_PROFILE]=/usr/share/nvidia
+		[CUDA_ICD]=/etc/OpenCL/vendors
+		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+		[FIRMWARE]=/lib/firmware/nvidia/${PV}
+		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
+		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+		[OPENGL_DATA]=/usr/share/nvidia
+		[VULKAN_ICD_JSON]=/usr/share/vulkan
+		[WINE_LIB]=/usr/${libdir}/nvidia/wine
+		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+	)
+
+	local skip_files=(
+		$(usev !X "libGLX_nvidia libglxserver_nvidia")
+		libGLX_indirect # non-glvnd unused fallback
+		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
+		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
+		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+		libnvidia-pkcs11.so # using the openssl3 version instead
+	)
+	local skip_modules=(
+		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !modules gsp)
+		$(usev !powerd powerd)
+		installer nvpd # handled separately / built from source
+	)
+	local skip_types=(
+		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
+		OPENCL_WRAPPER.\* # virtual/opencl
+		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
+	)
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev modules "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")
+
+For additional information or for troubleshooting issues, please see
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
+documentation that is installed alongside this README."
+	readme.gentoo_create_doc
+
+	if use modules; then
+		linux-mod-r1_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+	fowners :video /usr/bin/nvidia-modprobe #505092
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	if use persistenced; then
+		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+		systemd_dounit "${T}"/nvidia-persistenced.service
+	fi
+
+	if use tools; then
+		emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+	# mimic nvidia-installer by reading .manifest to install files
+	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
+	local m into
+	while IFS=' ' read -ra m; do
+		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
+			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+		case ${m[2]} in
+			MANPAGE)
+				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+				continue
+			;;
+			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
+			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
+		esac
+
+		if [[ -v 'paths[${m[2]}]' ]]; then
+			into=${paths[${m[2]}]}
+		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
+			into=${m[3]}
+		elif [[ ${m[2]} == *_BINARY ]]; then
+			into=/opt/bin
+		elif [[ ${m[3]} == COMPAT32 ]]; then
+			use abi_x86_32 || continue
+			into=/usr/${libdir32}
+		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
+			into=/usr/${libdir}
+		else
+			die "No known installation path for ${m[0]}"
+		fi
+		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
+			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+			dosym ${m[4]} ${into}/${m[0]}
+			continue
+		fi
+		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
+			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+
+		printf -v m[1] %o $((m[1] | 0200)) # 444->644
+		insopts -m${m[1]}
+		insinto ${into}
+		doins ${m[0]}
+	done < .manifest || die
+	insopts -m0644 # reset
+
+	# MODULE:installer non-skipped extras
+	: "$(systemd_get_sleepdir)"
+	exeinto "${_#"${EPREFIX}"}"
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	dobin nvidia-bug-report.sh
+
+	# MODULE:powerd extras
+	if use powerd; then
+		newinitd "${FILESDIR}"/nvidia-powerd.initd nvidia-powerd #923117
+		systemd_dounit systemd/system/nvidia-powerd.service
+
+		insinto /usr/share/dbus-1/system.d
+		doins nvidia-dbus.conf
+	fi
+
+	# symlink non-versioned so nvidia-settings can use it even if misdetected
+	dosym nvidia-application-profiles-${PV}-key-documentation \
+		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+
+	# don't attempt to strip firmware files (silences errors)
+	dostrip -x ${paths[FIRMWARE]}
+
+	# sandbox issues with /dev/nvidiactl others (bug #904292,#921578)
+	# are widespread and sometime affect revdeps of packages built with
+	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
+	# ebuilds should handle manually if need others or addwrite)
+	insinto /etc/sandbox.d
+	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
+}
+
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}[kernel-open]" && NV_HAD_KERNEL_OPEN=
+	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
+
+	use modules || return
+
+	# set video group id based on live system (bug #491414)
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	# TODO?: automatically check "kernelopen" bit for USE=kernel-open compat
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and may prevent launching GPU-accelerated applications."
+		if use modules; then
+			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
+			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
+			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
+			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
+		fi
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ -v NV_LEGACY_MASK ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of ${PN} known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
+	fi
+
+	if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
+		ewarn
+		ewarn "Open source variant of ${PN} was selected, note that it requires"
+		ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
+		ewarn "Also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
+	fi
+
+	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for wayland."
+		elog
+		elog "If you experience issues, either disable wayland or edit nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index e5e153a2742d..f5d8fd66e209 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-intel-2.99.917_p20230201.tar.bz2 1250201 BLAKE2B f41aa429079b60b06a4f78289c5d94de9203c55756bcc3f1ff016a9226e7fa01b3559305ea3328acbc88063c8a5a96289a0ba9954e011c4eaeb7ac5d8fc3e240 SHA512 5f37bfead71ca5a671640919c357912d15b809fe8f55f572119927b218e58bbd75f3ec4370a80d74d454debb09c678105b3120f8d7eced3f9ed858878ba9128c
-EBUILD xf86-video-intel-2.99.917_p20230201.ebuild 2181 BLAKE2B c7dcde3cf74c5a0220bf6f18a95e14f6f501e0627c8a79d08b6fd512d1d3188a5abd5709182147024425d8f4e5b679299d609850aecfa4ef7f5ec8e3e92ad25e SHA512 332895284f8e0175c96ce9972dc1fd45754aba10f846ccdd07d31ac2b4533e290ec54aacc19512fab3194b4fbb91b637031f6d3fdcc7a0fa12e1025b1a413b2c
-EBUILD xf86-video-intel-9999.ebuild 2143 BLAKE2B 1a69744a12a8b7f22ec127fff5a089933853b575ae9e7e2a49044ebd8373670ba2d3136310666c792d60b1f57c6e741c50e40df0f56ffaf14f18dcd3ab3362b8 SHA512 bd50ad22d2bb49ba5f2ab41b0004ab58920ee5c430541770fff181818a0c8a776c74f2d181361c8b5cdcc024a2821957bf3ee6a3331f1230c7eacd1e4fc90ba8
+EBUILD xf86-video-intel-2.99.917_p20230201.ebuild 2181 BLAKE2B cfee3b22bbc781eed5e513125b86b826b795ecd9c71aa9d87c60cbede3b718309f185832cec85d1689c79d41cf32bc2a012b00046ee890715cb4125fe2e3a178 SHA512 f7f995c0f16797807fc240c9d13cd807baa5f8dd0294a2b93054f6021b1a3109089776183e2270bf81145e46d2d0c3fe05ed21dad24e3d8cec21a4963a4ff2ac
+EBUILD xf86-video-intel-9999.ebuild 2143 BLAKE2B 026737826c5227fba5359efcdf297810cfca86093ad3965f3621d0fe1cd93d49d34cabef3465b0e666c1462c49fc5c8ccf8a4ed7b741406bb77cadbd1329971f SHA512 395e79437d2a3f0de869a0d3945da61a5489ae97a0f5e4f351270c3ab6cb7e74b1674ebb6e3a8cdcc5d16d82e317f7778309e0861794745ec93c62369d3ec8f4
 MISC metadata.xml 684 BLAKE2B 38aa4bdc4d0cef985f16a1580083839a7866b6a423ca0046f12142f187ac32009ce4163bf86f0688e6c9566f5822c9e8dd801224ba06a1ea39f08ebfce97f077 SHA512 fa9a5cf8cfa205f89019c298a6064efc2800b265a60f55c461d7e34faa0129978404507e4ce96ac629a6ea20a9e9b6eb29103b565f9758ce7b0f9e7656794fba
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild
index c27907f22772..284517e9312b 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild
@@ -7,9 +7,7 @@ XORG_DRI=dri
 XORG_EAUTORECONF=yes
 inherit linux-info xorg-3 flag-o-matic
 
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="amd64 x86"
 	COMMIT_ID="b74b67f0f321875492968f7097b9d6e82a66d7df"
 	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
@@ -22,6 +20,7 @@ IUSE="debug +sna tools +udev uxa valgrind xvmc"
 
 REQUIRED_USE="
 	|| ( sna uxa )
+	uxa? ( dri )
 "
 RDEPEND="
 	x11-libs/libXext
@@ -72,7 +71,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable dri)
 		$(use_enable dri dri3)
-		$(usex dri "--with-default-dri=3")
+		$(usex dri "--with-default-dri=3" "")
 		$(use_enable sna)
 		$(use_enable tools)
 		$(use_enable udev)
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index 309d1c7f4272..0fde7595ecff 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -7,9 +7,7 @@ XORG_DRI=dri
 XORG_EAUTORECONF=yes
 inherit linux-info xorg-3 flag-o-matic
 
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 	COMMIT_ID=""
 	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
@@ -22,6 +20,7 @@ IUSE="debug +sna tools +udev uxa valgrind xvmc"
 
 REQUIRED_USE="
 	|| ( sna uxa )
+	uxa? ( dri )
 "
 RDEPEND="
 	x11-libs/libXext
@@ -72,7 +71,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable dri)
 		$(use_enable dri dri3)
-		$(usex dri "--with-default-dri=3")
+		$(usex dri "--with-default-dri=3" "")
 		$(use_enable sna)
 		$(use_enable tools)
 		$(use_enable udev)
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 998321dfcff3..d04c3e9dab00 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 5519db205d45..53c280103717 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,6 @@
 DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19
 DIST xwallpaper-0.7.4.tar.xz 86432 BLAKE2B c10a69ab5734e43e99a746872bff427797e1d8f9de06d241fa81435036527b029031bb49733cf2119e8725883f20b9253b779ef9113d32d1b4f77bd73511a76a SHA512 f6eaf41befe724ad55d14f607bdfe9d05c79139054deb6590198ce767cf42173f068459dd894b284f3e8dbc95fc482d8ed7ed1c615f7b72b249897a6a01d51ba
 EBUILD xwallpaper-0.7.3.ebuild 972 BLAKE2B 464e9e3c716845f13654c2c33d0f99500d8e380746f54258d469904006817d93549f0aeb6b4b1711ad3ecf47b6a8d66e0d97c89b5bdfdda21e57c5e5ea5f5428 SHA512 0eeda67a5eee6cb81fd7e5b886cfdddca0fae217ae60354975c34bf9041a833b097c3b270dd1f4384dac6656fd2bedd55801e61e587ed732ce9f0f64c162d1b0
-EBUILD xwallpaper-0.7.4.ebuild 976 BLAKE2B e8bc05e1398bca6b9dcf484551075e3dfcac7493180c59fe9cf1adfd67048af6fac554671c2c2a1925d4409d5e181050822b4d5d49b7cb2e05543881de24aed8 SHA512 5bbb213c662454b79d5c82e994d46af87249cf6cad87dacfb4e73db16d2eb96b8eb9def051c0dd86e149317fea252452b022584f05df33e5df926603044f7a92
+EBUILD xwallpaper-0.7.4.ebuild 974 BLAKE2B 33d33e99a675ec9d93a7be50e0c121d9aadaf3f310d2f8eb6b900576cbbfa058caf67c5e4f8fdadcabc57ef963a046d1626082bdf284f2fcabc81f1552654501 SHA512 b99a38d0f3acce75d52abba08831e09122a3a9ec1b48117b1a2de887bc934ec038cf29e2ac51cb6ec8510ee7efbb8abb61e67c1e5c357d1150e954b77be12244
 EBUILD xwallpaper-9999.ebuild 976 BLAKE2B e8bc05e1398bca6b9dcf484551075e3dfcac7493180c59fe9cf1adfd67048af6fac554671c2c2a1925d4409d5e181050822b4d5d49b7cb2e05543881de24aed8 SHA512 5bbb213c662454b79d5c82e994d46af87249cf6cad87dacfb4e73db16d2eb96b8eb9def051c0dd86e149317fea252452b022584f05df33e5df926603044f7a92
 MISC metadata.xml 721 BLAKE2B 617ebf75fe3702201bd91b37d2f38ca80425b4b8efe548f60039996a3979a7c01606513cf7ee8560cd7172fdb6bc14d29e9e62103df2f80cb8c738abc6efebaf SHA512 3bd069e7b5b31807ff41f67dc9bd943c116a5408b61c6a0eee6bfbe41b2c712c258e393dc78c527d7990403171be0da5b6da6d35ccc5485b06bc3eae969be127
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild
index 70132cc575a5..044a297dd658 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3dd677b7f7eb..bc7a80009d3b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 787c8ef5bbc0..263255f30d2f 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -8,5 +8,5 @@ AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f
 DIST rxvt-unicode-9.31.tar.bz2 880148 BLAKE2B 439a8c33b7260e0f2fd68b8a4409773c06c3bb7623b5dfbbb0742cc198c9fd25e8a247907878639db5fac3dcd3b6be3d839347787bcf08ca602ae246607f750b SHA512 4d14ecbbb62de1b1c717277f5aae5cfb536e11392f2d4b82c884c1713f437fce8e9dd69a328fa353a55d068d8ee4121a31900f45191acec172d5dc76652b6255
 DIST rxvt-unicode-9.31_24-bit-color_aur-9.31-20239117.patch.xz 7776 BLAKE2B 88c12e2db38991fc6c7909950aade09a8c089d93980535af5a602d40cb4712aaa97f659c67e49b52abb71e6d0e2b8279f3d9a6d66654cdf68dde68bf64279873 SHA512 dfc0388138f35345c0c80df0a392c28a52a03d008ca336999369522031898813046c314c1e4ec9a81fea41b81d3230f5ca09d47b84ef04c0f6da98c559812a16
 EBUILD rxvt-unicode-9.31-r2.ebuild 3487 BLAKE2B 15c796d5ab0a153d5b3683b8aa2c1dd5c3d141c3e37492a72e59a096e645abe7a541b07359264aa7f95d516507c67aebf0307e2cce83ec2b639ce3e8c0c2a432 SHA512 999d6409f4ae2725e15682829cfe24bd48ca75357a026d6ed09b349bbbe2557d5f951d52d839f0226950223ba72ff2617d6489bea874c64ac35d218506330079
-EBUILD rxvt-unicode-9.31-r3.ebuild 3552 BLAKE2B d6c93aafcf9aec38d1924d168366dd1fbf3d6615d528b81fec681f42462de7bd64e6081bed32447bbd21599e38d8d0e6367227ce9703807b63967bf8ff99ffac SHA512 27fa56fc6daf8e463bed2ec8a081c2383078018c56c0431d2412379ad2de58898337188101648c6bfdb514dabad3197d0bfe085b934be4bacff77c5f88724fd4
+EBUILD rxvt-unicode-9.31-r3.ebuild 3551 BLAKE2B 29d98d2b63641b3f30515fee979ecbc704c9385594eb4a376d80c3bb74dcbd0334d917cf136b1874c8d38fa73202fb686a8eaae24189844779aba753f8c0443c SHA512 9ab8fe79bd573023ffbd78e702435b5d213bcf85520a692d45cab5ace6181aad721f8fb28d2e0f5611b204afd9c8bfafe732dc2ada81807f40ee7a427d1115a5
 MISC metadata.xml 1719 BLAKE2B 9ded0b5e709dbcf085f1011fbc3a7138b5df7318c02106e492988bf0c1046f79b01876e96c9d55d79e1c4be4e854bca15744de5ced4507756a188328d55b7488 SHA512 bf8395517dccbb0185345e8bd0ee912f9ddb04beacaacd7e69edc6e40287928a51604a4e3cef06164b094b2e303b4faa52adf4630eabf24b3e9e351a034473a5
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
index f1c56405b079..8cb229a8e4c8 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
 IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	perl startup-notification unicode3 wide-glyphs xft"
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0e35fbd9c1d0..7ad28f18bef7 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 3886f1d35871..1f2205747444 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -5,6 +5,6 @@ AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aec
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
 EBUILD openbox-3.6.1-r8.ebuild 2860 BLAKE2B 64de05b63836238d89b35abc1a17c970ad98d6b50e335e168685ee09c28bb75b14d50e86c0b90ea12edb1864e97dfb3e36b720fe08335ed8fea178db41176f48 SHA512 48859b5b3967c59a0a32532f2b014eb330a3fd812644d5b630f9cc9a8c25520ee14c7cb61b529d0a6438b17cd66795ab0e0a23c69417c137d2e9c8e34e14996b
-EBUILD openbox-3.6.1-r9.ebuild 2867 BLAKE2B 7e5bc7d3fa89336dc8856765373248add99034f472bea52425f1087db317443c5d4b1b6b83adb764eac2bbbe050d7b4305a04954faab5cfb81e8da46df47b12d SHA512 08d6cca668b631c8de5a31e0611288dd2135ce35a66c3239f6f51691b42a803fa374c13586780f0c10e007f4640518155bfae7190f7e43ee3c772953e9384cd9
+EBUILD openbox-3.6.1-r9.ebuild 2862 BLAKE2B fe4f5f1422b7de79b0a9a3e8514fb54b83bb09c1c2b1507062bab674ff3e7de2171a6acbc849e1d844bab18bdae9e7727226db62237085a2900c46394149b539 SHA512 5f885f8c73d9c38d9104fda486e7266b21dc18311437b1cc169581126f6ec2e088da067b3583eb90a903d68c26a6ad9448e43a4810eb8c811abfebbdeb846b27
 EBUILD openbox-9999.ebuild 2867 BLAKE2B 7e5bc7d3fa89336dc8856765373248add99034f472bea52425f1087db317443c5d4b1b6b83adb764eac2bbbe050d7b4305a04954faab5cfb81e8da46df47b12d SHA512 08d6cca668b631c8de5a31e0611288dd2135ce35a66c3239f6f51691b42a803fa374c13586780f0c10e007f4640518155bfae7190f7e43ee3c772953e9384cd9
 MISC metadata.xml 705 BLAKE2B 0df8e542b8837fb94e5f6fd289b0d5172c1d4d01bc88c550b6afd5307619a0dfdf5de2c2ba8838d63f8a8c29a378e6545a8932c77d6f0bef7cc898a4fd400206 SHA512 acf171ad8ccc7d07b533e4f5aef895b485050fa8fa39d8a6db798a15d9c5924d4f825573b77ddd8b755b8c0b34e8c3ab49cd0f56592854ae36462c3de448f4dc
diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index aba60e39ae11..6a2a2fb25256 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Mikachu/openbox.git"
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
author	V3n3RiX <venerix@koprulu.sector>	2024-06-06 00:07:58 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-06-06 00:07:58 +0100
commit	44cec61076bf2bbb3cea1fc89943dd6818a5acc5 (patch)
tree	68f1cddcf97a0d746c1e9c186171b7bd603efccf
parent	9d1e33edaf09cde926d589461f40e378d4124be9 (diff)