gentoo auto-resync : 15:09:2024 - 12:11:38

801 files changed, 3246 insertions, 12865 deletions

diff --git a/Manifest b/Manifest
index 4c2fc2070984..182c5abc0f61 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29786 BLAKE2B e42a9c6eca46d57917fce5af1099382bdda6ec805897c75e167951767a416b2193d5e349d0ec386aac84d64251f641040fa98a2ef64e9690853daa41801694db SHA512 b78424ecbe070229ea47cb4a43f4021f8bc6f41f28eaae6c83321ba1fe6202d53ef892c047faf659bc856e4d0d36341bd4a8e3e9a9e2fd673daa3ddc313584e2
-TIMESTAMP 2024-09-14T11:12:23Z
+MANIFEST Manifest.files.gz 29788 BLAKE2B 13f46c1e2a852a7e5c8e4073421642b71a660e97ba94aa12a8d86a14bac2bc94387462fce4f00b4e73dbddd7d2d4ee2bfbf4c1f9a14dad78ae7ece73d73a714e SHA512 09fe64697f3e96a1591bc48f7dde364a2eb9535ed663ae06dadce8155e4e4c526015a8490b40b01b28a6480b761c56c9384471e637db8ce080ef7f4bcb6bf7d4
+TIMESTAMP 2024-09-15T10:10:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmblb5dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmbmspxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDY5g//UkYeenFVz15HCZd7z4IweG/IeUAd0PPr7RmP3pBKmQcNVP/tP4gT0618
-UY5isnwly2UuJlDiIw/KrYuD3zV9rYfrbyziqqbk8SJ9kYxwsnjTUJI+9FXdB78r
-wyi59isylTs6/Pi1Su3av1PEQ1b/tDkTnCoMcvfguxjvXSoSbk0MYGd5TddBhhpD
-jVnTxGVO52n2GVUiN04gkmlnpwJdiiT2A81Gda3XCuCjJO83wT59/jQhYFGadN2j
-Z+lwtNQq5OW/zoiLfsH9g4zwrZvykcOx3s820lyP0KiC5U8/HUMaP8uR2BScR5xC
-A9PWBfs7pN0IZAwc14NuOxmWooo1D6zO4TP6rIqjzLC2/KZig3G91UBMAUJGxbJl
-SAOulA4jS8q5ljm94tzo16Mdx7+kRenMLoa4IKvGxRQZ0DgrpwRkJ1AcbtqQvqLD
-6Z9C499ECyiuG3w+tdLTZb8WSoii4dnfKfa8cEBbT+03gl8yBLu2oNjWo8nLLe9y
-k5l+L8ApIcP5eOeCa+9YW+EheV/sSXzoeZXYe4oAKP2LnrkUe+DnfPiAgO4DJZ1G
-K19KQN3tB0WKNbsVTmR/y3Ga+vbqtB+b18KzMGaxfaMo5r3Xc/gICZtqE1VmjO3y
-i85LdQsfuGyUGBfznr1bpV2QveyinXYnC5+cggiEnA/z+kGt7Ro=
-=CfiJ
+klDf1hAAovZycDV0lunN4s3Eq6l/edPZwH7y0b2fgAj7TqydBf8lo/POFcFZv4GY
+Tak6niKuV4iyDy6cPEIibZHC0zZNpa9ygNlddh9mEc2q5R1KKQ5NrnHVQAA6XJbq
+MU1Y+JI2pDbD7yVJXbxMR7FWZIemL28pp8HmZpm/K5Krq+1G24cnlMFWtGsF2bTb
+VDK0G+FFEWl0glGc7mrg5pl4dplDdJHt76U6K+IA1T5iWMCVl12ZjvelznnGu7AQ
+OgZNMSCQHg/b5sFQJQqyHXqEQ24gHyTVX0wc6petAbzckpMRM9Z/ol1ps87wV30b
+Wr8jmxtAIb1yK8TGI8eEOF70v4tElAHkilwBpXeVpVVEXqqx91ijmbDEp/PFSBm/
+B+qpdK5WTo9nkWoQkpAdd0fvUUZxvUNY6SpTNrOShv4n2DXS+L5GE3/CWd5jUomt
+Ug0JcbXHzY5Euczf5ru04qq8uSeZ7adN8JTunu2aRs9qAlVWJQ7wZWebc2zM5Ucz
+HyTeWUmAm86d0wa3C6MLoexzXiz2SBtMRgN42dUesXOG13sL35UIURa0JIN1JGFi
+wYCvDWktLrDdw4I1Y8xK7gwl6+UtynmpKs1iKnqCDH7RVOOZB/kouuraNW9hJ4C1
+E0vGj4OsaNcMB1RmKggj12oqoA6FZuoY/xIT4+sHyVjr6lz326E=
+=NFKk
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 606cca3736f0..1e1672b765c6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d74da50fd060..5fb85e812767 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a9d4f2c37c9c..646423ce5011 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,17 +1,7 @@
 DIST aws-cli-1.34.10.gh.tar.gz 2788517 BLAKE2B 8b110119087836435f3e0ef29a6cfe35dd3a387bff4051cc94b9beb4e8a2d929460ac14c659ef0c3a37cb6378e7910eca7c92975f04ac2d1b2140e2aedd0eb60 SHA512 46844c919a3998040897ccdf48cf4ed616a9debc125d03386f53bce66597a8cc077f9be7735b133085c3225c9402acd94da85fffbd1205e732ad5cd5b56bf9a2
 DIST aws-cli-1.34.14.gh.tar.gz 2790437 BLAKE2B df3355ac11561ac7f6e2a7c707d08de0b3335b4321ef3f5730a9abd6a23dfa909e0ba27367e705c56ce7223bbb7d1d436759457f0f92a0d7b4da21e6392a0c6b SHA512 be707816a1f6a53ab32870eaed498bfd47782b07c146af79d6f5cc1153e0b180788be1cc48cbf21f8850d04a79b3255bcfa2456079c57585e4779083bc5353e1
-DIST aws-cli-1.34.15.gh.tar.gz 2790865 BLAKE2B e9c89028942df21d880997c61ee261110271402223869b740bbb51bd8b787c26b2b7aa4b335968665260549bde8571c97350ccaf0c32df1c28267ae454b99001 SHA512 f7628e664b515f46b85978d5662165a889db5db004aa6d32be9fa0ee6b9b9a4fd46281df5c8f3e6218a9adc81d365e4251d0e5ce3601c2b6da9dd4ac567c24d9
-DIST aws-cli-1.34.16.gh.tar.gz 2790321 BLAKE2B 31e51d95ed3479f5c4a768d98dbd0190fe1a9f55bfdc116a9778140a10c44e14cc4684f11a3480fc05c26606ea8239f4bf7e2266b02b47ac456d25249e992c53 SHA512 4898e32d328c5dd1f80655696ec1225538ce58e5958dbb3a156dad4c865ed1e560c1a5823903a9fa9caf44af8bd618a6a6f1868a3b1fde8ee5daa4f0bdf94875
-DIST aws-cli-1.34.17.gh.tar.gz 2791693 BLAKE2B 25ea69e1bfa09d69502ded0aa37c639b209a94ade70dcef6edc4dd3470dc180c5f3bf105a712eab69cc38560461cdcfdc50b9c6c0a26bcea4907d6180e95d4bf SHA512 c59c0a5d20212a64eabdd22ec9071f4e5d8aa4c4dc172f89123f5b2ccc6868c10486171aa489b2002bccb9b1014ffdbf2f642bd5514c971a010c40b077a7e1ef
-DIST aws-cli-1.34.18.gh.tar.gz 2795166 BLAKE2B 3ea4b81e53a03a478779c053a82c046e07905b8c24c6ef9051c136383fbdb27305cf2f211a2b0137215d7faa21ba391b99c9880c3031c4379a8b22fe197a0e65 SHA512 7fa3e03bd7917bc0758cf3475e4870d1fe9be92ce666e25d72827f7f8905f16240ac2be0fb3e87bffdd69137796314daac6bf22b714226d035e7eaa79734b1e1
 DIST aws-cli-1.34.19.gh.tar.gz 2795240 BLAKE2B ede95bb83dffdef1cbc6896f35e6926e3f7fe1cf27a091c019a4edadc57c24a88d06900fc6542fcf78c21f57de6651759a8ebd44952b21864313269c1cbfb289 SHA512 a82299d7f2d2fbb4600c91739b38e22e83eb95ffae0e70ef62e95ba039de6a47ba1d4e2423190a5e8ee59bf768a85181153c60329b9bbfc1a3e794d07d50dc75
-DIST aws-cli-1.34.5.gh.tar.gz 2774000 BLAKE2B 34368cc257a99a9c7212972bcff91c46352db8659c5fe98101c9192cb674663b9090b3608d88875875d24488869fcb571e8602532219cf0a25bc3159f3bf285c SHA512 4dc305e4e659fbbd17a265b6c9589e20c63eec671114a67687c225081f8095a8627499441f78d76e6fa0da59b03ae078833227db0434c97572a7f5f7c4a43e5a
-EBUILD awscli-1.34.10.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
+EBUILD awscli-1.34.10.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1
 EBUILD awscli-1.34.14.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.15.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.16.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.17.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.18.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
 EBUILD awscli-1.34.19.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.5.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.34.10.ebuild b/app-admin/awscli/awscli-1.34.10.ebuild
index 599b9bd389b9..96357b5055a1 100644
--- a/app-admin/awscli/awscli-1.34.10.ebuild
+++ b/app-admin/awscli/awscli-1.34.10.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.34.15.ebuild b/app-admin/awscli/awscli-1.34.15.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.15.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.34.16.ebuild b/app-admin/awscli/awscli-1.34.16.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.16.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.34.17.ebuild b/app-admin/awscli/awscli-1.34.17.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.17.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.34.18.ebuild b/app-admin/awscli/awscli-1.34.18.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.18.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.34.5.ebuild b/app-admin/awscli/awscli-1.34.5.ebuild
deleted file mode 100644
index 96357b5055a1..000000000000
--- a/app-admin/awscli/awscli-1.34.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0e1a9b3aee17..e554bf1647f1 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-pushrm/Manifest b/app-containers/docker-pushrm/Manifest
new file mode 100644
index 000000000000..8ab8d4f3ab99
--- /dev/null
+++ b/app-containers/docker-pushrm/Manifest
@@ -0,0 +1,4 @@
+DIST docker-pushrm-1.9.0-deps.tar.xz 121551972 BLAKE2B 2798ea5c23cfe300719ec99d1f76746dae379d9ea041e791f6b227c97678c2f0a017c3e4880a62cb6f40511c482997b1da4c4692c7ebad82435edbad30eaea2c SHA512 496f9d059951057f4a3f8d97ef7d50574e9634e29082dae471ce9f7139da40b730db744cbf420ae8da88592d62f4d52b1a24c30b877f1de639f7b5b52f2f6217
+DIST docker-pushrm-1.9.0.tar.gz 211628 BLAKE2B b8b470a97a0580596cfc90ce65ee289e32f49b2cb8a216138f534aac23c21f6007ef5b6d0bc2e9513a6800c7bda22e44ec0bb56ee3e7abe59961f4385928c98a SHA512 c9f3258b9d8660808a55f53ae30eca05d7725cb313a6c46018d7bbfd1feea28a2bfea2153700dfd43a7d4239683eb126f5daa2b29c88467d66620701b0244726
+EBUILD docker-pushrm-1.9.0.ebuild 694 BLAKE2B 82844c7228eb044ad1390ee57556fe5af07471a02ab67d0ec90c3d1a7b4fa49071f8936f6a84abd0255523ab561badd81ffa3e2d54ac49b650c57880e90cbddd SHA512 3004f48b2859c18b08a7841a011588f76cd21ff7137da6c86f7dd4b621474696d500fd881aa33b40bc3e7c38c21d00317e0fce491594e714e94f476aa05a0f98
+MISC metadata.xml 998 BLAKE2B 4e394ee397f4059fa25f405ea9e40ba3f707cbfb641dd680e872d0a2f8b5773e28e23a527d6ecf0f54c7ddf339b3c8fce157d852dc23b8d207cee48afc45dcd5 SHA512 8fe634c6b5c1703843da4e4d3e0f046956e0e58424129f86e5b1bea4aa9aaf850bbafbae737ed955349f9a2981f17ff58a58562e722037f83d405bacce445268
diff --git a/app-containers/docker-pushrm/docker-pushrm-1.9.0.ebuild b/app-containers/docker-pushrm/docker-pushrm-1.9.0.ebuild
new file mode 100644
index 000000000000..76bccc9ef6fc
--- /dev/null
+++ b/app-containers/docker-pushrm/docker-pushrm-1.9.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Docker CLI plugin to update container repository documentation"
+HOMEPAGE="https://github.com/docker/buildx"
+SRC_URI="
+	https://github.com/christian-korneck/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-containers/docker-cli
+"
+
+src_compile() {
+	local -a go_build_opts=(
+		-o ./bin/
+	)
+	ego build "${go_build_opts[@]}"
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe "bin/${PN}"
+
+	einstalldocs
+}
diff --git a/app-containers/docker-pushrm/metadata.xml b/app-containers/docker-pushrm/metadata.xml
new file mode 100644
index 000000000000..2ee012065b84
--- /dev/null
+++ b/app-containers/docker-pushrm/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">christian-korneck/docker-pushrm</remote-id>
+    <bugs-to>https://github.com/christian-korneck/docker-pushrm/issues/</bugs-to>
+  </upstream>
+  <longdescription lang="en">
+    docker-pushrm is a Docker CLI plugin that adds a new docker pushrm
+    command to Docker.  It pushes the README file from the current working
+    directory to a container registry server where it appears as repo
+    description in the web interface.  It currently supports Docker Hub, Red
+    Hat Quay and Harbor v2.  For most registry types docker-pushrm uses
+    authentication info from the Docker credentials store - so it "just
+    works" for registry servers that you're already logged into with Docker.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index 99985d42981e..d08f72b19c8f 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -1,10 +1,4 @@
-DIST earthly-0.8.13-deps.tar.xz 163750220 BLAKE2B 995ed748f99b7d4c4ca90cdd1964c295270963e55462bfa3bdd830209a90303d67c91fed66e7d52984993ef58b1d060e140694fdc8931ca2181dd88701d8f6dd SHA512 ab3ee4fef9a87dab9009ffd4e31d00a256c8ad88096c8573a5a2fb782079392415752024821240da60549d260c9dcfe3d6f1457fb3fbc8cc8a1f2602bb875aee
-DIST earthly-0.8.13.tar.gz 8082676 BLAKE2B cf6d5c6d397951a60302e5492ad219d3d673cce9bf2e06696a3cd8719dcf1d755644413171c7db1b27c60d6cbe0d85facf2d6a5d150c26dc5530c07d1255b742 SHA512 f3abd814c0c57f485a37c83e322d9a8478236ae4220baf455330a6a28d98a8cb7806fb4cee9525c9b27c51bc0ed8780872f51ece7194059658defd54cce1a6b5
-DIST earthly-0.8.14-deps.tar.xz 163777848 BLAKE2B 0615db6d874a0d490666df6517581763315c44a67662d1c8c630d59983849c3a1c10bdee4d626f9ded02a58f7eb037e24cca6b22dfc7eadf79d4e735a33306c5 SHA512 ac062ae77e98ec36f9bba1a73430080d2f2c7bed3ad8c48af8bb1da4a6f006a4285fca8f4d85363652ec3db9df78e76befdfc838971684d704512d795d672414
-DIST earthly-0.8.14.tar.gz 8079338 BLAKE2B c3da74c39b77f671656ba51f7e8a82b77476650e986e5665e1df86fd1674e808b79edcc0b8f616891b6749ec034de45268fb48df519c5fdf54c1e3e583eab5a6 SHA512 566e6bdd6f026baa99bad33128e3a843ef20dacc15efdccaf19af648440c8ee7b445bed80f33102b9fc419d211dc6dea38a66655247549f1eaf17837c6687105
 DIST earthly-0.8.15-deps.tar.xz 163782812 BLAKE2B 09a9cb196206e787a48c2c2082a066a31c0bd8dba8785e379bfb86ac56ccf4f8eb34195c8577b866bc1153657008e4fae142eb7a6e21d2791fe92e9cdfa76e2d SHA512 65afc0bd89b6a54bb3e4cc4d7f39522eddbb79266b25afb33ffc3c6571b57952bc2ceafe00ce196098d1c4185ab2672f8a80d9ecd4d6d07dc06a18ba39da3941
 DIST earthly-0.8.15.tar.gz 8102499 BLAKE2B 92793722206ab8c2d5bb097f7da40392d1ed1f3399797bc217dab7fcc0f305cc91f5e9f8b997b6e5e187f25c0f1109d8aba2294fb79d4b3f26d6660d36827d5c SHA512 0d98f716a2e2a6cb522abb42894f6356c12ac2e398382207db08d204dc951f65c7be04be7473e060c30a052768c4b2b7e9273d206b4252fec26975e6e166ae2a
-EBUILD earthly-0.8.13.ebuild 1795 BLAKE2B 666b52a938305a2750189d2cfaa8b0bd5fc6cc7c6ef2b512bd905a68b3b4f512a7c8d1fe52c96c0be07af52a89aba9560d393671be807dba8ddf948822e1cf49 SHA512 730a049d3d9f7f01c64aec83e01fc59ad5dff18007ecea8598f7ba6583e183560b59c8d707b8577ebab0dd2661469623dac9a8a8b09bc5b7933b65151cfdfb72
-EBUILD earthly-0.8.14.ebuild 1795 BLAKE2B d040294440bbe07e05885f3bd681ec4b1cd2163336d16092355cbfcaf990b15a631ca71ebf7e0270b1912ffccf2072449fdce47fb1696a851668eaadc0484550 SHA512 c614ff1459d58cce2fcccd1aef9c4bcda798b6f91ab57d5534e232056beeb29c55616c934d434f3fc173d3442956523a6b9531a54546c9a31ad5bcd5aa123060
 EBUILD earthly-0.8.15.ebuild 1795 BLAKE2B 3f9084aa29c884c9cf531eb50e66b32e46761d3fc0703b1b42d0e2aec684900df505ba5c0f4b391ef9bf44ea84e9b760386eadd6f92bafc14ab197cb3e9fc72f SHA512 4066a92575c91ca96214da2cd94d017aaede0d010490c4b4285990380930cc232f45484acdc7a40bd7e42aa99bf87beb1748345ca2b6e06ee0e2c0b91cddf839
 MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
diff --git a/app-containers/earthly/earthly-0.8.13.ebuild b/app-containers/earthly/earthly-0.8.13.ebuild
deleted file mode 100644
index ebee46234ccf..000000000000
--- a/app-containers/earthly/earthly-0.8.13.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
-if [[ "${PV}" == "0.8.13" ]] ; then
-	COMMIT_SHA="251e0eada58646e71c562b803bc4b9adbcf07637"
-else
-	die 'Could not detect "COMMIT_SHA", please update the ebuild.'
-fi
-
-inherit go-module
-
-DESCRIPTION="Build automation tool that executes in containers"
-HOMEPAGE="https://earthly.dev/
-	https://github.com/earthly/earthly/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	|| (
-		app-containers/docker
-		app-containers/podman
-	)
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-src_compile() {
-	local -r go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
-	local -r go_ldflags="
-		-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
-		-X main.GitSha=${COMMIT_SHA}
-		-X main.Version=v${PV}
-	"
-	local -a -r go_buildargs=(
-		-tags "${go_tags}"
-		-ldflags "${go_ldflags}"
-		-o ./bin/
-	)
-	ego build "${go_buildargs[@]}" ./cmd/...
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bin/earthly
-	newexe bin/debugger earthly-debugger
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if has_version "app-containers/podman" ; then
-		ewarn "Podman is supported but not recommended."
-		ewarn "If issues arise, then please try running earthly with docker."
-	fi
-
-	if has_version "app-containers/podman[rootless]" ; then
-		ewarn "Running podman in rootless mode is not supported because"
-		ewarn "earthly/dind and earthly/buildkit require privileged access."
-		ewarn "For more info see: https://docs.earthly.dev/docs/guides/podman/"
-	fi
-}
diff --git a/app-containers/earthly/earthly-0.8.14.ebuild b/app-containers/earthly/earthly-0.8.14.ebuild
deleted file mode 100644
index c133e768eee1..000000000000
--- a/app-containers/earthly/earthly-0.8.14.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
-if [[ "${PV}" == "0.8.14" ]] ; then
-	COMMIT_SHA="6b41f8409d7ffef0d25072c2c04250074b6e3c72"
-else
-	die 'Could not detect "COMMIT_SHA", please update the ebuild.'
-fi
-
-inherit go-module
-
-DESCRIPTION="Build automation tool that executes in containers"
-HOMEPAGE="https://earthly.dev/
-	https://github.com/earthly/earthly/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	|| (
-		app-containers/docker
-		app-containers/podman
-	)
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-src_compile() {
-	local -r go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
-	local -r go_ldflags="
-		-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
-		-X main.GitSha=${COMMIT_SHA}
-		-X main.Version=v${PV}
-	"
-	local -a -r go_buildargs=(
-		-tags "${go_tags}"
-		-ldflags "${go_ldflags}"
-		-o ./bin/
-	)
-	ego build "${go_buildargs[@]}" ./cmd/...
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bin/earthly
-	newexe bin/debugger earthly-debugger
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if has_version "app-containers/podman" ; then
-		ewarn "Podman is supported but not recommended."
-		ewarn "If issues arise, then please try running earthly with docker."
-	fi
-
-	if has_version "app-containers/podman[rootless]" ; then
-		ewarn "Running podman in rootless mode is not supported because"
-		ewarn "earthly/dind and earthly/buildkit require privileged access."
-		ewarn "For more info see: https://docs.earthly.dev/docs/guides/podman/"
-	fi
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f18e0c5ef151..4255fb9f04df 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 1a1a735832da..d10de2400690 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -2,5 +2,5 @@ AUX okteta-0.26.13-doctools-optional.patch 1002 BLAKE2B c56d0c5de30895f2de11b09a
 DIST okteta-0.26.15.tar.xz 1090764 BLAKE2B 3e96aca3bc1ec1aceb22de23f7aa954c7a41b1b074207bf59acb3be27ababb7a368044b231f587604c42dba16c002fd8f0df488b1828f564b0eb79cd64622fec SHA512 8e63b20ad3e1d238a6006fca834b355825015088a3dff82866e1197c2802e4a3cc57644d50b44407203bea2c2d4a132c89d402e52e4525d257de9a8cde87f1db
 DIST okteta-0.26.17.tar.xz 1090720 BLAKE2B f062e2fe2be54d4895fdc27e545885621e6e31932e23f8f098e88bb4b1dc01d08e2376621bfbed7e729e0b264a2a46ded8819ce0041e86e0f17e150ac875137f SHA512 0ef8c43802596e124dfeaff1edfc1f77d239fbbe6daaa70eda6f48e77ae3d09ea730da8757a9a52986efc822d8e9692587636fd9ecbf1ce7689362a48079d6b9
 EBUILD okteta-0.26.15.ebuild 1806 BLAKE2B 0cb330e140e5a19f2ac4835bd6306d590cfab69512eaf9f4aa38406e56046be4919e4a756fe3b3c093bab7bba5667099602e8a52ff67d20d65b3aa1a6eec289b SHA512 acf4b732ba645846e93cf554b749959e1b18d56ebf75c94685e415ac65e0c58f63a6c848bab07b57dea092fc35f7f2fa56a07ad46227bc2970a38794e92018de
-EBUILD okteta-0.26.17.ebuild 1809 BLAKE2B 9f6368d41d53554051e591ee8d5e1898638e565612ca4b8bdc12d7ff5e7bfb9be39b9a6e5b9b8480d1c5d98b19e62509e86b94144bcdf72b1205666a4df1ea51 SHA512 262c6742588efa7262e2af392617ca3bb7e169eee84384ba866437252ebdebe5e5d9ecca8046d168277a6454ab14c35db94b4370eb90830604b731c7226ba08b
+EBUILD okteta-0.26.17.ebuild 1806 BLAKE2B 0cb330e140e5a19f2ac4835bd6306d590cfab69512eaf9f4aa38406e56046be4919e4a756fe3b3c093bab7bba5667099602e8a52ff67d20d65b3aa1a6eec289b SHA512 acf4b732ba645846e93cf554b749959e1b18d56ebf75c94685e415ac65e0c58f63a6c848bab07b57dea092fc35f7f2fa56a07ad46227bc2970a38794e92018de
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.17.ebuild b/app-editors/okteta/okteta-0.26.17.ebuild
index efad0b46cf69..d7827f1dbd5b 100644
--- a/app-editors/okteta/okteta-0.26.17.ebuild
+++ b/app-editors/okteta/okteta-0.26.17.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/okteta/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2e7582e750c7..7a0d12e6548b 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/orderless/Manifest b/app-emacs/orderless/Manifest
index 07e4c33a77f7..4cf353899267 100644
--- a/app-emacs/orderless/Manifest
+++ b/app-emacs/orderless/Manifest
@@ -2,5 +2,5 @@ AUX 50orderless-gentoo.el 84 BLAKE2B 663573f2689256eb1de3111304494fa84a0e136af0a
 DIST orderless-1.1.tar.gz 36066 BLAKE2B 5b40e662df6bcff0a69e560bcf164c7729877b7c5e46843ede48e1cd7cc52dadc8e5d1d9757809b412a21a6671e0a2b9a2bbbd4195b8d69b465bfa6b9c97709c SHA512 0de959a9a6da16922fa8ad55016d33a937fcdf1cba8359ad90bcb222cb23272f31ccc9e1f68ef2c074d257c692fc5d597248d9fb7f1d3e51d1958912a42c6b16
 DIST orderless-1.2.tar.gz 36260 BLAKE2B 8d8ad75fd46f2063f0361b8d669d940ba01349bdd66ee2b5ae2b2351d9a78b3a454d466fc3ac0fe077bee34537629729d3f57ead5f19949f8ac5a80103037601 SHA512 0af2b5e7ddd6c29bc5322cb26a1e02cc69edbe138f14e8b416466d6f9ee6b17fc0a9f0586fafdb584ece3f48469c72fb029cbbbb7e10832a14d441bc0f50f41f
 EBUILD orderless-1.1.ebuild 695 BLAKE2B a24668a94f19036d1ffd24a750e84d272c4c6ec98b7767ea54f12b8b126b6bf9432eb4888724fa12b4b2654384c5540a5afa072caf874388aca8170067cfc9b2 SHA512 a739cedd06d59ee71f84d3a6016544bb3fc603767a0477742563488c8610876a6415693acf56cc4053b7cb38384883066fc8d8af661f807b1861ad746e0258a5
-EBUILD orderless-1.2.ebuild 695 BLAKE2B a24668a94f19036d1ffd24a750e84d272c4c6ec98b7767ea54f12b8b126b6bf9432eb4888724fa12b4b2654384c5540a5afa072caf874388aca8170067cfc9b2 SHA512 a739cedd06d59ee71f84d3a6016544bb3fc603767a0477742563488c8610876a6415693acf56cc4053b7cb38384883066fc8d8af661f807b1861ad746e0258a5
+EBUILD orderless-1.2.ebuild 753 BLAKE2B 22a3fd036fbd71a20adb2f9e10eecf9ff6e5914aa7495515957185104f1b8a309991866c240eb10896728e249f184f054f361b5388e68b09c068e8483ea82da2 SHA512 ce1b714b1d8d3553c62d812377e1ddc49e777ceb7f8e7c287bf2b480e2e238f218d28e0c5b2424638dfd3e2e994bda790cf49651fa04f15645a45adf2c416c57
 MISC metadata.xml 364 BLAKE2B 3866465d96c2508dcaed43f67f6bdd861cce2c8b2d98d9bcaccf28a566a868051861c10aaf43479fc0228054a86ceeca7da1e0bec7e7ffe87e6eb6f858628c52 SHA512 a8490a67c98d10206bbd5bac7c960ff0d216a29731d73d6570d0300153b40f2de85d09556ef39d0db9f7a0d24c0c643452e3bbd2dfb4973941fe73236c3206f9
diff --git a/app-emacs/orderless/orderless-1.2.ebuild b/app-emacs/orderless/orderless-1.2.ebuild
index b83d5229ca69..c346385b374b 100644
--- a/app-emacs/orderless/orderless-1.2.ebuild
+++ b/app-emacs/orderless/orderless-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-NEED_EMACS=26
+NEED_EMACS="27.1"
 
 inherit readme.gentoo-r1 elisp
 
@@ -16,14 +16,19 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+"
 BDEPEND="
+	${RDEPEND}
 	sys-apps/texinfo
 "
 
+ELISP_TEXTINFO="${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
+
 DOC_CONTENTS="Enable orderless completion by placing
 	\"(setq completion-styles '(orderless))\" in your .emacs file."
-ELISP_TEXTINFO="${PN}.texi"
 
 src_compile() {
 	elisp_src_compile
diff --git a/app-emacs/plz/Manifest b/app-emacs/plz/Manifest
index 65803b1992fc..a6275acaaa85 100644
--- a/app-emacs/plz/Manifest
+++ b/app-emacs/plz/Manifest
@@ -1,5 +1,5 @@
 DIST plz-0.7.2.tar.gz 105864 BLAKE2B b876f69a61452ca932c70e87d35e4442f1ddae4c74c3e124056ff0adae9923d0a374c047a1c1dade705713a9b2aaa5bbfbb73368fde9564b53ce638f90f08ff0 SHA512 01951bbb0e59d6196338a806b4bab030538c411d185acf5462bc1eb4d3130b1da5d78a436e84163dd8167b3705edb6dcafdeef8d4611973521566d34f2ca5654
 DIST plz-0.9.1.tar.gz 102132 BLAKE2B 5680f08c4fb65fa8251b11aaaeacbe5c084731f1c90e27c5bd135da24943b6a1d2c7a0c4590d871f7b9cfb1c97a0fac6e453f707cdd96fca4d2e7f3dec257b9c SHA512 6e35e34accfba52428176345bfd07e1146587aed662c5df4443ba16ca02558a1137dc17ce7906d6e3ff296eb628ecca702d0f1595e504f0e102d4fb411ed295c
 EBUILD plz-0.7.2.ebuild 775 BLAKE2B 15994a45e3cf233a545c1cbce8dffd60c95b814110258105340df7929413d6cbdb867dbdfcb44441336f78ce9eea998407cd15451c0360c85c930090795a5d7b SHA512 e83267edc5b11e189f8ff4f5ba30c92de491eaa5a6d07341b935db617248f62dd3ab7f438a5bdee7e30a96586d2f7b170877bd5dc749b69defa8be827865f3bb
-EBUILD plz-0.9.1.ebuild 784 BLAKE2B eb50a6afee8b0439cc30ff5b2b201e64568df2d16d798854fadbce2fa124d6743783c9effd6e2ea4f2c28977f4839000e08fd32a9964e9463b6182c03c2d4de9 SHA512 dbab3cd9b29879b198dded71dcd75e6bf180ccebc2c22a3e0fc4dafba29e34f2ab5051000d3d805989299363678e4513428d5b839c8b0ed6e1161931d74843fb
+EBUILD plz-0.9.1.ebuild 829 BLAKE2B 7ea6a13d61c9ede598919954f8c67a1d326c8cb9019e1760f93610f0e6f6d2f0f0498b7b14e03a90e2da6f6d3675b444d12c4f4bb82bb42f5261afbda0d02e28 SHA512 d686486c8500b4bb53cc0fe4222c8f25486004699a11ac98affe84e9b273d3d83bbd0e01c712d47e402db1aeec3fac59393aae2b35b775ac9b359517d90a853b
 MISC metadata.xml 826 BLAKE2B 2c26aa08682b905ec5f450f20a4b77b2ee2108f172deeda1bb95ddb80d1a6d53a76b091350126171c2b9dfda6161ba61958bbbf53fa94f4dd883b1eccd9f6125 SHA512 b48b5766222e784021656410b1467bbcab2646133d3a4af58601ace46ff68ee87df2a156329b19b72b1f42f77ad8f00c2fceca1210f8aca0db864ed044ffb0d6
diff --git a/app-emacs/plz/plz-0.9.1.ebuild b/app-emacs/plz/plz-0.9.1.ebuild
index 59d90c291da1..ea9edda1493a 100644
--- a/app-emacs/plz/plz-0.9.1.ebuild
+++ b/app-emacs/plz/plz-0.9.1.ebuild
@@ -30,12 +30,12 @@ RDEPEND="
 "
 
 DOCS=( README.org )
+ELISP_TEXINFO="${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 elisp-enable-tests ert tests -l tests/test-plz.el
 
-src_install() {
-	elisp_src_install
-
-	doinfo "${PN}.info"
+src_compile() {
+	elisp-org-export-to texinfo README.org
+	elisp_src_compile
 }
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 50f8069d58d0..e0a38110d47d 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 8e51afd91a95..a9675fd91d71 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-m17n-1.4.31.tar.gz 649211 BLAKE2B 6c6f8a12b474dd14553c5214d420bebec60c5d09eccf8b848d24277d6a20c369446431860db8c1e9d51c0a4c1a6e3db5cc7e57a2754d6ce8042ffa76e6c9f42c SHA512 06f6d412d36b13628cb2ce9d7b3a1827a19c7e7213a0579f685f791bfbe101d5e8fc80162bde1ba46ac931f3f689492d02da8c02a8e2155cddc39181416f2269
+DIST ibus-m17n-1.4.32.tar.gz 650662 BLAKE2B 33222f99f9b290028838bbb4d7247fe623591cafa9d39461141481aaa6c118756dc7988b9e0ae851da473eed0cc1817ab896ccdafcc899dfec16c1f9fd668ef2 SHA512 00e657dc0120de12d637f0be0ee6b3af9af3a4783d5c3827fdcacf78c534f0dcbb454052c17886b3ffd554797011c345a948b684c5768a085717de1117b84932
 EBUILD ibus-m17n-1.4.31.ebuild 801 BLAKE2B fdc992a2ba08901dd204d6557fa2c09b683a59c5e8a4c1e40a337a93e00aa079330dfdee691019deb7e2cf393018a3c103503fe4d82152f87e334489d9e5fcd9 SHA512 ec431ea523893e8d9854f5940321094604c7c6ad934dd76f2be586af7223f914a1000745a7583e8dcc53c6185bcff0caed588cd501a204985cce92cadc7c7040
+EBUILD ibus-m17n-1.4.32.ebuild 803 BLAKE2B c1e43d07ebc3ef3a98e8bb6f6789b5211be67d427485d8b27d10d23b1b3d48243c276a33817e3414843dddd189ba960115c114f958460a10c13c7d2c718068fa SHA512 830958bd88f92b9b6aa53eb842f2b282b873677cf95b373373ced5f837debd8863faf91de36e55637b8b41c846d87e0f6d0d2fed6c805c4a2e515ce6233123ad
 MISC metadata.xml 555 BLAKE2B b9dd5e7d4f230dde589a7e73333d14d52dae05d0e549dbde75332807434fc7c73ee7fe468dd919762527ac65f16c7a484b8d8b5c629c24dbe695c19c96b9abba SHA512 311891667bea4f2d4797440920ba2779a7f54766d3967edb25cb65b30800164a33192babdf7aadaa9adfeade385852d7d8d2a9a039b7c4ecbd2e9ed0a553fe89
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.32.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.32.ebuild
new file mode 100644
index 000000000000..d17cb13bd689
--- /dev/null
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.32.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="M17N engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk nls"
+
+DEPEND="app-i18n/ibus
+	dev-libs/m17n-lib
+	gtk? ( x11-libs/gtk+:3 )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtk 3.0)
+}
+
+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-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 3f72123c1155..f16c06424626 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,7 @@
 DIST ibus-table-1.17.6.tar.gz 1563218 BLAKE2B 45ad1f8f489f8df0ca1108df9fda910d0f144c10cff29d047f0e345efd1be9e5a6d6cd2b47ba59904769ba3f0c207d2d641c9e7299b0d1ca4b77ff59bffb5d4c SHA512 0c3f23595bf1ecc2c3e34962fca3e2317771ba0837c1a04fbcbaae089196994764307184dd482f0a9efcae2106e013ca51cf9530bd1c7cfb29070f54b16a276e
 DIST ibus-table-1.17.7.tar.gz 1564577 BLAKE2B 2052c082a11b87f46351bccedbb4b3dd896337af8b772a33a822a285a7685cfb68cbe3269f21790aefd3c151aa7390a095c51343ec7c461a2d15a3457abaf2d6 SHA512 938b589b16728f2a5bdfa64e06277cd2fd41719fa5033c3935a07a8350be746a75bf10702f0a17bcec2f9af591d2ccfe486486b788035c5c39cb62ca6f0cec74
+DIST ibus-table-1.17.8.tar.gz 1568671 BLAKE2B 9d918901e31814ad0058ba08d26831704cc596475fb39b00e3fff4347624e5c4684ca931508c3b264f7b796408ce8672102839483877bfcee47b6d407f68a798 SHA512 0fb7ebb376ac35b29941e821eb320454b603edfe48e1745631bc06cd464b618b12fac541151f857360ba6a46e166e3565c2a3572709208d8e0f04f07a1adae86
 EBUILD ibus-table-1.17.6.ebuild 1038 BLAKE2B 29862c784476236031f068032c125b6d4b71c63ea53896d126d6a1c5010893dc6cb51acaec86e64935317bc01e0a9de155cf881e88472a4e66c4283dc3100687 SHA512 ebd3abe1536b254c938e5e4fbb180d6b70f5b9d9031a4c421354ed0ee563194f5a4c00e1f94c7e1a9f27232773e60cd259c3a57ee7eb3751648a1ca518a4d25d
 EBUILD ibus-table-1.17.7.ebuild 1040 BLAKE2B f8892a4ccd27ba416bc5ba52a8923c16ed11dac4aa511abfb0466615eaea5d9a83f3f8e6a7cb57f2a02091a82cdc3269be5f019e1dcfdc9a33a6a014575d9f17 SHA512 a2e10f5f692f862194ad6d70527d326215c7bc0cccea7468fb933afdfc5bf9ef7d9baf66dedb4c89a4b3809e17cfa45ac6cd65f8b56244e288a9de90c90fccde
+EBUILD ibus-table-1.17.8.ebuild 1040 BLAKE2B f8892a4ccd27ba416bc5ba52a8923c16ed11dac4aa511abfb0466615eaea5d9a83f3f8e6a7cb57f2a02091a82cdc3269be5f019e1dcfdc9a33a6a014575d9f17 SHA512 a2e10f5f692f862194ad6d70527d326215c7bc0cccea7468fb933afdfc5bf9ef7d9baf66dedb4c89a4b3809e17cfa45ac6cd65f8b56244e288a9de90c90fccde
 MISC metadata.xml 315 BLAKE2B eeff056ce020201cb6e59f0f160232486fd94cc9de7cc90980155f9ef97988199d592b01190b13b013433853fbc25d9c4e5e29fe33fb74aa4239318cfac312fd SHA512 3329cc73468815ecf7f122ee8e8b81ca7295abcfeab95082841ae460c7ca76fdf2cb3d01b1548795bb525ce855052f512b8b2d77fa3afd302f41c156edf35de0
diff --git a/app-i18n/ibus-table/ibus-table-1.17.8.ebuild b/app-i18n/ibus-table/ibus-table-1.17.8.ebuild
new file mode 100644
index 000000000000..4ecd082cf0d0
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.17.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+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-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index fbc2b4e6a56f..03d258b5fce3 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -2,6 +2,9 @@ DIST unicode-data-15.0.0-UCD.zip 7059105 BLAKE2B 5615eeb9a73f9bd36986bd0d8fdc3c2
 DIST unicode-data-15.0.0-Unihan.zip 7293545 BLAKE2B 46d8b13ac6970a27d70262d45c703496dd99bff4ac7eefed2003f3f7d02b070461211eb03400f0fe0decfb65a3dccd0973c8da286f9f6fc84681dd263ea366b6 SHA512 d9cf39adebe83ed0fd8d473cf057b8aa8b2362019d9f7ee7afc041501b1bbbe4d13050350ac40ce4a020cd1d64d52548fe262c3b2893934a032e1de8075e964c
 DIST unicode-data-15.1.0-UCD.zip 8248819 BLAKE2B 6280ee4c7044bf72cfc1f04c02c06bda1052c4909b2209d41a0ddef3e1eca7d639afa293d1536d1af1ef118311327ec4ec52cdefe8eac081bc84738972993a0e SHA512 6285b78d5765092d04632f2bdf23f43fe4c3d8acc28700ff941b5a647bf86aba348ea280cee54f5761e534070439cd5628cb25cb7cd9d7dca08e05000f434f54
 DIST unicode-data-15.1.0-Unihan.zip 7999959 BLAKE2B a92e3fa3dfb765b94641596b67779385edf519b788192a2798b27107fc6860cedc00d445066dad67746b7cd04a7fd2ed5a0f2b65a864d52f043750ad37cd318d SHA512 fc1a32fc68b3e1d2d358fca91c2cd6c1103557405e91ff558585f18a2e9b1ee6f8af89e7ee922ff36cade67a5cf4f5b4042ba97d350af7b92b18f161eef5ec78
+DIST unicode-data-16.0.0-UCD.zip 9020779 BLAKE2B 33507bb358933d5df1613a38598c2383f1942948186f7a0043f8c72577a798f47bf509a20f05e5dbaf73a34e6763f602481ab3af57afb66fc9d4f2aa1b19aaa2 SHA512 0fde45accf7068d639dcf8e739c7d9595c4cb3917f2e440cd0683aec1c0eebf5f4d0a975be09e5bc6297048a7031e84b5fcd4018ab29cc275801d770628b4439
+DIST unicode-data-16.0.0-Unihan.zip 8382485 BLAKE2B 9f09fda9aa0be91ec17bc98772051450679464807d0c586b0151f1a1ccdcac5ffbc5bef6f77582b90f6696dc92b27c9518147e76b431191aa2bd522416ab6d58 SHA512 90e42cfcf442c13f29e5925aa09efa310cbbe8a691b760ca455d24f42a75ec4c04240bb9a4e0ecdfddae28b50ab0c8b0b2ec6d112f0c5fa5ba4de92f58784346
 EBUILD unicode-data-15.0.0.ebuild 757 BLAKE2B 690685852b374b4b262d1beb93118ec2da76187fa941f9161434c28a1a1b8a9d4d42cbf34e5c87813e90486d2abed8a4e1b7a3fcbab674e8b87cbe99b904bfcc SHA512 63f9dbca815336652b028ce73a9420c1ca71ff442fb60a288e00abd030c276664250822e497d2d4b8c6b91f76a003aa0b8f4bcf14eeb930e900504ca9aaf4517
 EBUILD unicode-data-15.1.0.ebuild 758 BLAKE2B 4a7745b1b26fa1694fbc430b1c835ac575a40a7ed2d8991d9c9e34e6ba5aee07b336de760ec3d0ecc52530634ff9f28afe1d31112bb89b1ea95f4b33f65faef5 SHA512 5ad80242efed9ec146ee000e7d597eec05b4729987e336f26352ca84cc8dc735cb2ab89955c2e2d5e5417dc9f77a24e0b981b87ddbb080bae7f772ee89bea76b
-MISC metadata.xml 348 BLAKE2B db346dadc3a3333cdd52371d751f814244a22770e00306f9e53b6ca4a70b6dabd107e1c8d62b2fb2b333ce60db28f4b8f8f900ffdce07aba4246e2eef16563a4 SHA512 a6b846e15f4b2903ebe245954bdee3c7c5adfedd0f6d0a05c32defc8cd6f35df804c11567af92911400626fd846320d2338175c1921821adce1db04d5c40dc6a
+EBUILD unicode-data-16.0.0.ebuild 758 BLAKE2B 4a7745b1b26fa1694fbc430b1c835ac575a40a7ed2d8991d9c9e34e6ba5aee07b336de760ec3d0ecc52530634ff9f28afe1d31112bb89b1ea95f4b33f65faef5 SHA512 5ad80242efed9ec146ee000e7d597eec05b4729987e336f26352ca84cc8dc735cb2ab89955c2e2d5e5417dc9f77a24e0b981b87ddbb080bae7f772ee89bea76b
+MISC metadata.xml 334 BLAKE2B a295aa1e9467fe05704add7a3026d025b76558ffaa7c6651bebbde4b5cecc1e8bb9048bbfaeb1eee82b97b1a2a70176a94b43058d2cd0e06cb05f4c42d3bf0a2 SHA512 4a27ee90294c5d51fe23eba660da4e34eb8d21a6306b4886d4993be547889af54573b755e2e618c8031f305b5fd63ca50f3b17ff6f627de56aedf8a9737fd009
diff --git a/app-i18n/unicode-data/metadata.xml b/app-i18n/unicode-data/metadata.xml
index 477954d6064f..2244c53d8726 100644
--- a/app-i18n/unicode-data/metadata.xml
+++ b/app-i18n/unicode-data/metadata.xml
@@ -5,8 +5,8 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hattya@gentoo.org</email>
-		<name>Akinori Hattori</name>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/unicode-data/unicode-data-16.0.0.ebuild b/app-i18n/unicode-data/unicode-data-16.0.0.ebuild
new file mode 100644
index 000000000000..4ac0b6713d27
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-16.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="https://unicode.org/ucd/"
+SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+	https://unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+DEPEND="app-arch/unzip"
+S="${WORKDIR}"
+
+src_unpack() {
+	# Unihan.zip needs to be installed as a zip for reverse deps
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
+	unpack ${P}-UCD.zip
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${S}"/*
+	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 77374beeb4e8..f0c126d5a812 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,7 +1,13 @@
 DIST unicode-emoji-data-15.1.txt 111505 BLAKE2B a5b3ccb6a22f4399dee08812a4d8d587cd7020ab83df6dcc9824b74ca690bf0a6ce9b895fba430c1a90d8b1f839d2db85703a86d1664386402af04100b1ad745 SHA512 bd8bde3d6296994ada56d336b0e31802fd1b73175e3d07b719f7629484412d4331d5e3b0585a38e4bfadca1ac26b9d5a1c69a6c6b7dffcf0edfc4edaacadf97e
+DIST unicode-emoji-data-16.0.txt 113024 BLAKE2B ad25b69ba82a76dbb232a842368215d045404d7d36b6f72c7b11b3d4bc14b7a622697a84ad423d5b543839af92d4bd8e7525e76afcd5f187cbc8415510d5bc79 SHA512 9dcca91544b039b4091f7a557d3adc8c5f844eb7f9d32ca80c1a23ce1fdaa8861d22737ff2dc8bb5f8f32e2892cd99006512a391553db86eab044f18cb46080f
 DIST unicode-emoji-sequences-15.1.txt 191562 BLAKE2B d16d7b923895d4aadba0f69ed07391b2e7df114c2eabca8a00c82c3b7ae97619e81b2c3fcc3658542fd340074fadfd4e1515613cc3233aa0c5ceede3edd34ce8 SHA512 19cf9b366a76d472d35e3e5d2adcb70e962397bce60a65e7685e9b203310dab2b63ee45fae8691c06dc6fedfac4e5c3730f9aadde119e3a7f4560c9ff325fd8a
+DIST unicode-emoji-sequences-16.0.txt 192618 BLAKE2B cc0398b172ea28d97c49728f875c8f77ae34b2a963ad892e060b3a5e11a27c4e9334c6925ce7c5494ce149a5270e890fe77c3ce1d0f20fc2fd920287644b30d5 SHA512 916b652cda652475443f4b8946be6a6996b82b1868ba0276bbfdfb2df246ad0c2da89370083c7e2bffc0624f156dc5ce7283d9aee2380ccc88ddd224323104b5
 DIST unicode-emoji-test-15.1.txt 639405 BLAKE2B e338db1b4334f9e1f86eeb357c5187f14667a10f4ea65ea1fc622230cec6d305c1c13e08233931f06f99787af0a6c7b2b5f3d09039642ea99c9b4159d2c51b2b SHA512 1e267845f2cc72aed60455a60e7cb8774433e0a1d0a9be98de6169304047184c8a7d5919117dd085dccfc4a7b507cb8938a3a6e34fd6fd9216fda27f8c126e5e
+DIST unicode-emoji-test-16.0.txt 640215 BLAKE2B e53aa1dc44ec9352ec2d4fb9fd846c4c804a8f4351497202f6ac8787b9da1317f8d1b1358f601f62a942f2b8428b41fe475b9eb0ad9a42200d8c88166d29ed30 SHA512 f755d40a35a005bad13bdd4a1a9ea801724c488cb4f56d7fdb8b33b35cd7c6527d14f208ef4b4d545343a62a12baeed480cad18995ebb12e37112f072184435d
 DIST unicode-emoji-variation-sequences-15.1.txt 38358 BLAKE2B 6d55aa432c701c419def0414a5c656f68fa0fe1dd31aed88c420449a754b5b1a104bfbc604fc4344a7e34f5feb1852b00f103113ca0067195f77cebd32b28858 SHA512 86a4843448e66488fcdcfaa9777f4be7352c679661d90318abf11e498a9d8e263e8e34aab0e49575a5e613be771541c67c28dc8b64351141ee56639106b90a17
+DIST unicode-emoji-variation-sequences-16.0.txt 38370 BLAKE2B 4abe2c24f405f7d9e897898062922ef454551fcf26c675f0216d715221315d645b0344af9e931fad5589f6f80f3edaa0984edbd8d24224d40aaf856c8584af52 SHA512 685ce53151b44ab2e53fe3f25aa22379c08b0fdccef5f45cb4b9fa2bd1c1c9d28449a51ba932abdb2aedd72ac8383eac5caab81e4fe160bbacc8b9254dd78e1d
 DIST unicode-emoji-zwj-sequences-15.1.txt 251595 BLAKE2B 84a643d46edc4428ff5379431059e386fa45dbf4252abf44bb2429fe295daf3c051e93af6d80465bdf0cb17730b955c05062f795e7f47ceccf6e2ba594bda069 SHA512 b9be3543cb44b8b394be12f06b9d3a27aa7da134cc5060d51681e2759c2aa0ce2604edf9f8782f8d3606e9765f2703b35807a932d36914b24261e59a07fffed1
+DIST unicode-emoji-zwj-sequences-16.0.txt 251607 BLAKE2B 7509bd273c315d800bbab43b43e40cba60b9f3bd2b79ce7315dfef0f0ccd5484a1b0711340c5bd5dbd494ff7be0820ed1eb03797bb77eaa33745e48905ad4cf4 SHA512 9f1f952736cea552217c81264a857b0c2d328dccbe2b110ede7e3a006c6a30f25293e2f16f185616c72db48507b1a14fcbfdeaa277df2a6ab2f89b07aa2ccfa5
 EBUILD unicode-emoji-15.1.ebuild 971 BLAKE2B a010a3f8a2d4cf2ccbe4a3df4ef0cf9bc3f7e2febc5a991624b25c65006af5e2f798ea2ef574e6a61d80ee09c14cda71a18acdb9ec2aba44c6a62810b788d7ae SHA512 1c2432423dfae2de9613bdba42db3a65a093ff6c5bfd8f42ad9f89c71cf1f84f5cfc49d1d08f830ee1552fc089a8d2bc52ccee02033b1ad0e4a1a91df8402842
+EBUILD unicode-emoji-16.0.ebuild 978 BLAKE2B d2ba59b73a07f5e66f589f47859ff574922d4bfd383c068bcc0411be6565f6dc5d94cfe3609a88ef9a9ff794ef9265d28d4908ebcbbdf6082917d4b09daf87b5 SHA512 28333cf37219fb5dcc4cfc9c3741c830d5fcb379790a88b40668d489f0aa2906347ddb0deabb8ebee5eede6267cb555402d16bb158e8fe1dee0df2123ce54f84
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/app-i18n/unicode-emoji/unicode-emoji-16.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-16.0.ebuild
new file mode 100644
index 000000000000..7c6cd765c512
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-16.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/techindex.html"
+DATA_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+UCD_URI="https://unicode.org/Public/${PV}.0/ucd/${PN#*-}"
+SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+	${DATA_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+	${DATA_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt
+	${UCD_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+	${UCD_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local a
+	insinto /usr/share/${PN/-//}
+	for a in ${A}; do
+		newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
+	done
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index cf72e784d163..6038fa0fbcd9 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index b65dae18853f..8d63d50ad295 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,4 +1,4 @@
 DIST portpeek-3.2.4.tar.gz 13655 BLAKE2B bc758a6312775458974bf0cd1218150f18b35cf0722b36829443a7df8e8aaf35b40f2d8edeaad8a21f32b9a5f46ad2eabe7a762286ad62f71f41de08553fbd1c SHA512 2a8d85c1862c3d800251aa94a9ffdee18100aa8d39b6e72dcf8d34c21ac1efb7ef100efe4a3bca5b96570604bfa4b5c4f702ab85f343476ba3081f123d65b5e5
-EBUILD portpeek-3.2.4-r1.ebuild 729 BLAKE2B b6ab45c621d30df941603cf396b69739e1ee16106faae4373baf6f40094381196e19ceb47329f7319cded90efad0fc13ef44d804961a88f73b0941eb5c7f1e21 SHA512 9d63e91e22637786d52ba4305495b2eb4c086143a4430723e5888428b6f70feb2144ed8b40d50b3e79b5d8b55964cada258148b2020ae70b95abddd00e1ad2ec
+EBUILD portpeek-3.2.4-r1.ebuild 723 BLAKE2B 73ea4e4988a66dc3ca88386ee871f2ee552420f40a1f992813c93d06ff0d4583630d08fe8878ada6dfd9b4aec9fb0fcd915d2bb5bddb22ed3043029eb7514594 SHA512 661414119c83231f13a4cfb047ddc8c5f3d488ce0caf30b05061c7a4c259488336ee4efc70065beb9b2605c59e4f6ed6ba53bdebeb83c366f87751abf24c1ef5
 EBUILD portpeek-3.2.4.ebuild 713 BLAKE2B 074cf3c79378a5ffe8f9ea6b6adbb06717658ca307329fb602342930716f98b0804b14c5269205910f5601f8716d8b95e44e824509fa6c9844f63d1608b0a8b6 SHA512 78b192f89f3653b5e8fda8cf1994f480fbd1842f99c560223861a1af629dac500c1c71be7ad2244c9ff1ac57f1365d68a401081edcb2326e7f3a708af92fbf5f
 MISC metadata.xml 333 BLAKE2B 8f862f87d0f6cb53dcbcda433a03202c648723f7b965798173fa1caaf8cb2d9d6801283b65c8a1184685e47c7cddd76e927facb3f9b014325bd5c88a2d69664f SHA512 1e16d124fe120663bb0ecb7995b6be4dc65f5d164bff681029fc6f82113926aaa875a97dcdb6f9231e170b416c6bd3e19a935aa5dfebb01969b169e7b9c89f10
diff --git a/app-portage/portpeek/portpeek-3.2.4-r1.ebuild b/app-portage/portpeek/portpeek-3.2.4-r1.ebuild
index 7e6a7b9168bb..246bf3e27966 100644
--- a/app-portage/portpeek/portpeek-3.2.4-r1.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mpagano/portpeek/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~riscv sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 6df1d723388e..de5f9631993c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index 2e05c780bfd9..a56b54fa4fd9 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,5 +1,3 @@
-DIST yash-2.56.1.tar.xz 768752 BLAKE2B 8ee4c654e85b5895096870afcb3fc4e855274f3fd1956372753a46c522430a59c8ba96e64b0b13672e0289d2a9b6492a18a0f3d9e9e5500f53144ed1d56ca750 SHA512 28e8bde5fc12e5178136b82ecdc0c52c37c98301245089b0d55c43266880e299237a5522e572883e5c51b7d9a0e9bf94fe265a9ebdbf346c28ff837b0f60cc00
 DIST yash-2.57.tar.xz 771228 BLAKE2B ea11d63c013a5b967ff32984e33b2b0113e3101b233d5923e902a15d1f1b53142f4266dd54df85776dd7ad45f4045c5cee500e7de764e92d2e2e87b7e2fbf19a SHA512 6604ce54f698740d99e4ce3e6ff93b10936353b0690871b4dd1a0ef4569fc228284f551398b4912d324c8627eccec4cd51ac58508f741eb47b315560f02bff01
-EBUILD yash-2.56.1.ebuild 842 BLAKE2B 7c6ee25b34971087b8c64e6df95f6fc917033c0394f59a956283f711b1fd10547730ebdbda7b473469de04fe680f6f83342dbe70af3e4ecac0119ffec5169283 SHA512 13645cab3a7b5ede7f9aa434c99e2432fbb59e59c1604e9094cbf5789246b7109e8f648e4e73345e11881803a16f275c6ed3ef01b60cd0c9e34faf851cb9ed40
-EBUILD yash-2.57.ebuild 844 BLAKE2B c91811fe1d24dc044ed26c2610015ef35dcb2d0ea11e58c7c0aefc09d4cf7d74336422a8238b6862bfd96f381ece8e5df0e2dd6d8ce3ffc7632a3da759a4cbfb SHA512 1b7ff8db51e0f55a47109671de85e54d341551e855ca749a503f1c0fb2b6b0b2190534c5f5a0caadfa75f57a808b7e4da9b21b8db59280302bf334dfff7322db
+EBUILD yash-2.57.ebuild 842 BLAKE2B 7c6ee25b34971087b8c64e6df95f6fc917033c0394f59a956283f711b1fd10547730ebdbda7b473469de04fe680f6f83342dbe70af3e4ecac0119ffec5169283 SHA512 13645cab3a7b5ede7f9aa434c99e2432fbb59e59c1604e9094cbf5789246b7109e8f648e4e73345e11881803a16f275c6ed3ef01b60cd0c9e34faf851cb9ed40
 MISC metadata.xml 1065 BLAKE2B ab9ec0ac6fbf2666a7e987b6a4cfd62f8520f541eb0d900602a782f895757d85ab07f61ca60cfab3cd6042a4e24cb311eb17a4fc163c2652f3c9b7ec4f3cafa2 SHA512 1bf5664d53623cc41a2509662889fe967b62068b27d36f30152fb59de29b46af03ea5baa1a778b2dca6232ffe3d564db37a6432f5f8cdc585a8c88e87fc9ab9f
diff --git a/app-shells/yash/yash-2.56.1.ebuild b/app-shells/yash/yash-2.56.1.ebuild
deleted file mode 100644
index 23ee161faf20..000000000000
--- a/app-shells/yash/yash-2.56.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="en ja"
-
-inherit flag-o-matic plocale toolchain-funcs
-
-DESCRIPTION="Yash is a POSIX-compliant command line shell"
-HOMEPAGE="https://magicant.github.io/yash/"
-SRC_URI="https://github.com/magicant/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )
-	test? ( sys-apps/ed )"
-
-src_configure() {
-	append-cflags -std=c99
-
-	sh ./configure \
-		--prefix="${EPREFIX}"/usr \
-		--exec-prefix="${EPREFIX}" \
-		$(use_enable nls) \
-		CC="$(tc-getCC)" \
-		LINGUAS="$(plocale_get_locales | sed "s/en/en@quot en@boldquot/")" \
-		|| die
-}
diff --git a/app-shells/yash/yash-2.57.ebuild b/app-shells/yash/yash-2.57.ebuild
index 9084d796b0ba..23ee161faf20 100644
--- a/app-shells/yash/yash-2.57.ebuild
+++ b/app-shells/yash/yash-2.57.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magicant/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9ff1fc74a734..d5621aa395be 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 5a5209adc806..777d9b8c5eb6 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1,6 +1,4 @@
 DIST glibc-2.39.tar.xz 18520988 BLAKE2B 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb SHA512 818f58172a52815b4338ea9f2a69ecaa3335492b9f8f64cbf8afb24c0d737982341968ecd79631cae3d3074ab0ae4bc6056fc4ba3ffe790849dc374835cd57e2
-DIST m17n-db-1.8.0.tar.gz 1977364 BLAKE2B 303afaf8eb105b8cc034be96efc7790f774870c5cbb688dc33da02847b545b42b20fc041c3842d9fbf9d17417472815e8185df37b58f4d2d72fac762a2669272 SHA512 b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5
 DIST m17n-db-1.8.5.tar.gz 2492374 BLAKE2B 306a86cb74735893f6aafb4869f785108af038c065fb2a51ee26402077d22ff23638176810b411bb23c13c4933d7536e23e48dafe07ab77700c7545d9c9ecf45 SHA512 6c3f42072b7e0a36870fd8143fb1ac7c3efc21c41869d984dfa0cbb87eb1f9958e429f1144a975b401791f0423386a03ab02531f162496531e303d9b0e049987
-EBUILD m17n-db-1.8.0.ebuild 867 BLAKE2B 00b61e1871c6ad4431d67c5ced219fac1deabb3e93e27fa08b1169cdd9dc56bea892de0069662ed5454bae0e98d18753eb36d402e6e9f299856466e5e9084b69 SHA512 0ee62414d415e6cee925336c368a1928a390b87ec7a8a4c56024fe7d02e1d9ab2eacd339f7e34584646b56fc0f43b7dafd1a767d64bcfdce5c585f5bf09a3cfc
 EBUILD m17n-db-1.8.5.ebuild 867 BLAKE2B 00b61e1871c6ad4431d67c5ced219fac1deabb3e93e27fa08b1169cdd9dc56bea892de0069662ed5454bae0e98d18753eb36d402e6e9f299856466e5e9084b69 SHA512 0ee62414d415e6cee925336c368a1928a390b87ec7a8a4c56024fe7d02e1d9ab2eacd339f7e34584646b56fc0f43b7dafd1a767d64bcfdce5c585f5bf09a3cfc
 MISC metadata.xml 313 BLAKE2B a280c675a102285022654a8b20bc06c7bf3dcd5cac118fdd95b9d453d2adba18c44adae95b4b70835e5f1d03a49dcd3a837e36ef79b2f82dbe91a478171b10d2 SHA512 76e6031dc40226735274b26085dbd3c5b7419f50c445611df406d75422769dd6c23442fc9afa446e979143d5ba3c5b99e42fba3fcf6f20cdfd7fb6e55c202a11
diff --git a/dev-db/m17n-db/m17n-db-1.8.0.ebuild b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
deleted file mode 100644
index 39c5f7fb429d..000000000000
--- a/dev-db/m17n-db/m17n-db-1.8.0.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"
-
-GLIBC_PV="2.39"
-GLIBC_P="glibc-${GLIBC_PV}"
-
-DESCRIPTION="Database for the m17n library"
-HOMEPAGE="https://www.nongnu.org/m17n/"
-SRC_URI="mirror://nongnu/m17n/${P}.tar.gz
-	elibc_musl? ( mirror://gnu/glibc/${GLIBC_P}.tar.xz )"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libintl"
-BDEPEND="sys-devel/gettext"
-
-CHARMAPS="${GLIBC_P}/localedata/charmaps"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if use elibc_musl; then
-		tar xf "${DISTDIR}"/${GLIBC_P}.tar.xz ${CHARMAPS} || die
-	fi
-}
-
-src_configure() {
-	econf $(usex elibc_musl "--with-charmaps=${WORKDIR}/${CHARMAPS}" "")
-}
-
-src_install() {
-	default
-
-	docinto FORMATS
-	dodoc FORMATS/*
-
-	docinto UNIDATA
-	dodoc UNIDATA/*
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b831953c912d..86cff80927c6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 24c6aa9a4fa2..7bd819beb616 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,7 +1,4 @@
-DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75
 DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41
-DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
 DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430
-EBUILD jdbc-mysql-8.1.0-r1.ebuild 1504 BLAKE2B 192d1ffc3619f1968e21dd8bba1c1380172bbe7eb5331a406cc5d33c14616be9b5467fc398315c17b4fca0a0aeaf3c5e1f0accd009c95c9288203ebc2b2d9021 SHA512 145d4c9a3e9f25ed784f26618c428a454ab29c26ca8e7b34896e523d12bd789167f6f718c1aad94d157229b70f3d46d83b0af88ce058e5d6e3e4e196674ba12c
 EBUILD jdbc-mysql-8.3.0.ebuild 1575 BLAKE2B 5e2ac925d850cbd027ea9eac9ac1566ed7e724c09954bb1e091ce91793efcc2afb2b88fa24342df64ca6f08aecc18ea340b453becd018b5bf75b9bb83ac19911 SHA512 af4f5da3680caeea3ca5561b69641c958b50c0cf42ace91c256f82382d1b78d3ed3b9fe52fa06c8da3e73388ab962a700bd692b21bff55cd809a65438857c1a4
 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
deleted file mode 100644
index 0cf061e42ec7..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests disabled, see bug #902723
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.mysql:mysql-connector-j:8.1.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-# Bundling a binary version of oci-java-sdk-common
-# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml
-OSC="2.47.0"
-
-DESCRIPTION="JDBC Type 4 driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz
-	https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar"
-
-S="${WORKDIR}/mysql-connector-j-${PV}"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-CP_DEPEND="
-	dev-java/c3p0:0
-	<dev-java/protobuf-java-3.26.0:0
-	dev-java/slf4j-api:0
-"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( CHANGES README )
-
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
-JAVA_JAR_FILENAME="mysql-connector-j.jar"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR=(
-	"src/generated"
-	"src/legacy/java"
-	"src/main/core-api/java"
-	"src/main/core-impl/java"
-	"src/main/protocol-impl/java"
-	"src/main/user-api/java"
-	"src/main/user-impl/java"
-)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/config"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index cc5012df71b4..972560e1e8b8 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,14 +1,7 @@
 AUX protobuf-java-3.23.0-unittest_retention.proto.patch 2122 BLAKE2B b7c7297efaf11291809c46452291419482775e9cca712e000d8a1a604c01fe1bd1df3d076c56154c37ec6d32731a9384bcce1deb23b06dcaa26e0a00b4438160 SHA512 18e9da72f5fca6f1585836c37a3040c43c1db84f617f78ad91d642e9db2811953e30e8a676011ddb5e2c273698527c89487606c0428cfdcbb7c3e7d6d782832f
-AUX protobuf-java-3.26.0-unittest.protos.patch 1828 BLAKE2B 078982186100b1d5466f705967abaa2b0ab09b14a401d406c7d5f9f342cfb4fe596d13b23061951dee8f165eda055ace57f293df12e3fa0bb710c67293ec0862 SHA512 3c2a610f74c7e6520fd781b3771b60e899bd5b94763a5c70873992feacc1e541d326b85250d2be256f9ac20df9af916e0673943533aeb45214dfdac693929b22
-DIST protobuf-23.3.tar.gz 5043803 BLAKE2B ee2edee230969555c9ef95069c7b1d6c23c3d1f8ea1b2249fb3e9f6fcf63312c6e10e9da65b80629fb08d5fb08d05a19bb9c752c25b892c1e3fd6f18b9279eb3 SHA512 646af367dbc61b42e322cf0b335f360e428b272e2b1f5361b2f17c18d3dc9dddd615e1279436028b1a42275a0beadda37c2c934fc27d6c892131cc8d526d8b3b
-DIST protobuf-23.4.tar.gz 5043507 BLAKE2B bf6a50771eb977ef92b779a32fd909693faae6394254c73e3c9b2729bce643f8cbfb5a1bd18b30abf3003b9fbfd24c074cea4085a6ccf14fdb6a3aeac9efcb89 SHA512 b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
 DIST protobuf-25.3.tar.gz 5878962 BLAKE2B 9268f9bd993a1cfd6d3937a2ad56ba4cfe3d84923756513841cbf13039d4a07acb260468745cb1294f30334cb34b45c6fde272f5c40d9de63ac6a4ce5c263077 SHA512 1f73e237c919082e5423ae9e2ea8813dccf672c059051d1531fe89ffaa45872d3cf3052b8c3af26f674296ec17d7dc861c67b8f0834ed80261ce4a6a14ed7115
-DIST protobuf-26.1.tar.gz 5957903 BLAKE2B 1a7faab2f56aa0995801a80f73a812c7fc38a00af0bf25bdd5eecf7aec27a86a575ea2fb8484787d19c9ac6e46007c9864e79464f529c446f31af732981feed1 SHA512 0363ac09f92d8e040491425d444c8dca0b9b430e02d2dff6e2b28a0c2b2bea0d33a47f50bc9e2e2d4e8e22b65a02009a20c0066fb89c75df93a7b703dda42ed4
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD protobuf-java-3.23.3.ebuild 5026 BLAKE2B 5918ff65f4a52a8c397c4e4e4f48dff195ac1eb6d396a22cfde80683e7714c88cb807fdf4d6db99eda5d00a39d25c8bd75609119f2edd68484ba44a14df3ccf0 SHA512 296165685cf050804a978a5a6e63fe8a78e367ebb433ce8256239bcc6400d4acf4a1eb3fd8c618e3ac296e024bdc6a5144781dfa5e3dfc63c29a36f258b8e6f9
-EBUILD protobuf-java-3.23.4.ebuild 5063 BLAKE2B d48f546256aed60a72ce4f27f689d70c8c9cb7f3223d4100ae4aa9fce65d1fb346945f922850434ca353cf667a680f170afe94012908e188e6608ffccf6b0ace SHA512 908cc9c7b684bd3cf8d5c322c7ba15db7e5959a3b884e459f105d0f68d51a92e8a17114e77b3d66cf03889878f1705f5c2d8ae956b5e8378f0f642e384677965
 EBUILD protobuf-java-3.25.3.ebuild 5069 BLAKE2B 6226594990ef634ffddd329d307bd609e233002a657e1511314eb5ac7f52a9f8c3d13ca69135ae6d516e86ec5bd2f773e07c4348d0bbf366e40ce83d385b06e1 SHA512 b9d3a71faa1cebee349792066cc3257d738894347ee02be440db01f9e1d85530c969f73af8e53384c0e5320f117fd2fa403c4d9b5853d1e2e8f902987b7c3e18
-EBUILD protobuf-java-4.26.1.ebuild 4758 BLAKE2B 018ffa86d9af50a96db808ee51892e930630ec0709f0effb26522e70bc8d9890a84cb67276b2aab743950b7ba53e77567615f9d1bc63e391521a22696afe1e7b SHA512 4a738022a541fc6b73a13fa7cdc461137adbcfc8f3cf95a522355991c9be2c459b10b99191fb1efa3d23efb4783e539cc5e119fa6e84096b0ed3cc2762675ced
 EBUILD protobuf-java-4.27.2.ebuild 5037 BLAKE2B 67330a0834b53ed7a950daea16be0b2cb7c8523cd6b2c0cafcc1468b39b6dd064e07a12d7e90a6b19612d6e82711c07e76cd6a2951ff6ec5709abcab042eac63 SHA512 51187de703cb88ded86536a068725eddb2692ba71150d2fcfb566058f1996edf39491c46363f31aecfb5210d7e7fbf7974da5dd4fbc90e70caa262079ad48d63
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch b/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch
deleted file mode 100644
index 76b227a4e71a..000000000000
--- a/dev-java/protobuf-java/files/protobuf-java-3.26.0-unittest.protos.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/java/core/generate-test-sources-build.xml
-+++ b/java/core/generate-test-sources-build.xml
-@@ -8,10 +8,12 @@
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_custom_options.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_enormous_descriptor.proto"/>
-+        <arg value="${protobuf.source.dir}/google/protobuf/unittest_features.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/>
-+        <arg value="${protobuf.source.dir}/google/protobuf/unittest_legacy_features.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset_wire_format.proto"/>
-@@ -19,6 +21,7 @@
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
-+        <arg value="${protobuf.source.dir}/google/protobuf/unittest_retention.proto"/>
-         <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
-         <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/>
-         <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
deleted file mode 100644
index d9f5c30a30db..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.23.3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.23.3 from the 23.3 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${PV#3.}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0  )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L43-L62
-	PROTOS=(  $(sed \
-		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
-		"${S}/java/core/pom.xml") ) || die
-	pushd src > /dev/null || die
-		cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
-	popd > /dev/null || die
-
-	# https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-sources-build.xml
-	einfo "Replace variables in generate-sources-build.xml"
-	sed \
-		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|echo\|mkdir\|exec/d' \
-		-i java/core/generate-sources-build.xml || die "sed to sources failed"
-
-	# https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v23.3/java/core/pom.xml#L63-L71
-	jar cvf testdata.jar \
-		-C src google/protobuf/testdata/golden_message_oneof_implemented \
-		-C src google/protobuf/testdata/golden_packed_fields_message || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
-	einfo "Running protoc on first part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-1 \
-		|| die "run-protoc test-sources-build-1 failed"
-
-	einfo "Running protoc on second part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-2 \
-		|| die "run-protoc test-sources-build-2 failed"
-
-	einfo "Running tests"
-	# Invalid test class 'map_test.MapInitializationOrderTest':
-	# 1. Test class should have exactly one public constructor
-	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
-	# 1. Test class should have exactly one public constructor
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-path "**/*Test.java" \
-			! -path "**/Abstract*Test.java" \
-			! -name "MapInitializationOrderTest.java" \
-			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild
deleted file mode 100644
index 4e75a53cfab4..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.23.4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:3.23.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 3.23.4 from the 23.4 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${PV#3.}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${PV#3.}:0  )
-	!system-protoc? (
-		>=dev-cpp/abseil-cpp-20230125.3
-		<dev-cpp/abseil-cpp-20240116.2
-	)
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	mkdir "${JAVA_RESOURCE_DIRS}" || die
-	# https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/pom.xml#L43-L62
-	PROTOS=(  $(sed \
-		-n '/google\/protobuf.*\.proto/s:.*<include>\(.*\)</include>:\1:p' \
-		"${S}/java/core/pom.xml") ) || die
-	pushd src > /dev/null || die
-		cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die
-	popd > /dev/null || die
-
-	# https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/generate-sources-build.xml
-	einfo "Replace variables in generate-sources-build.xml"
-	sed \
-		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|echo\|mkdir\|exec/d' \
-		-i java/core/generate-sources-build.xml || die "sed to sources failed"
-
-	# https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v23.4/java/core/pom.xml#L63-L71
-	jar cvf testdata.jar \
-		-C src google/protobuf/testdata/golden_message_oneof_implemented \
-		-C src google/protobuf/testdata/golden_packed_fields_message || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
-	einfo "Running protoc on first part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-1 \
-		|| die "run-protoc test-sources-build-1 failed"
-
-	einfo "Running protoc on second part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-2 \
-		|| die "run-protoc test-sources-build-2 failed"
-
-	einfo "Running tests"
-	# Invalid test class 'map_test.MapInitializationOrderTest':
-	# 1. Test class should have exactly one public constructor
-	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
-	# 1. Test class should have exactly one public constructor
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-path "**/*Test.java" \
-			! -path "**/Abstract*Test.java" \
-			! -name "MapInitializationOrderTest.java" \
-			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild b/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild
deleted file mode 100644
index cbf117e3173e..000000000000
--- a/dev-java/protobuf-java/protobuf-java-4.26.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple cmake
-
-DESCRIPTION="Core Protocol Buffers library"
-HOMEPAGE="https://protobuf.dev"
-# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
-# And we build artifact 4.26.1 from the 26.1 tarball in order to allow sharing the tarball with
-# dev-libs/protobuf.
-MY_PV4="${PV#4.}"
-MY_PV="${MY_PV4/_rc/-rc}"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz
-	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )"
-S="${WORKDIR}/protobuf-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="system-protoc"
-
-BDEPEND="
-	system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0 )
-	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
-"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava:0
-		dev-java/mockito:4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}/protobuf-java-3.26.0-unittest.protos.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
-JAVA_JAR_FILENAME="protobuf.jar"
-JAVA_RESOURCE_DIRS="java/core/src/main/resources"
-JAVA_SRC_DIR="java/core/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="java/core/src/test/java"
-
-run-protoc() {
-	if use system-protoc; then
-		protoc $1
-	else
-		"${BUILD_DIR}"/protoc $1
-	fi
-}
-
-src_prepare() {
-	# If the corrsponding version of system-protoc is not available we build protoc locally
-	if use system-protoc; then
-		default # apply patches
-	else
-		cmake_src_prepare
-	fi
-	java-pkg-2_src_prepare
-
-	# https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/generate-sources-build.xml
-	einfo "Replace variables in generate-sources-build.xml"
-	sed \
-		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
-		-e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|echo\|mkdir\|exec/d' \
-		-i java/core/generate-sources-build.xml || die "sed to sources failed"
-
-	# https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/generate-test-sources-build.xml
-	einfo "Replace variables in generate-test-sources-build.xml"
-	sed \
-		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
-		-e 's:${protobuf.source.dir}:src:' \
-		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
-		-e 's:^.*value="::' -e 's:\"/>::' \
-		-e '/project\|mkdir\|exec\|Also generate/d' \
-		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
-
-	# Split the file in two parts, one for each run-protoc call
-	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
-		java/core/generate-test-sources-build.xml || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dprotobuf_BUILD_TESTS=OFF
-		-Dprotobuf_ABSL_PROVIDER=package
-	)
-	if use system-protoc; then
-		:
-	else
-		cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use system-protoc; then
-		:
-	else
-		cmake_src_compile
-	fi
-
-	einfo "Run protoc to generate sources"
-	run-protoc \
-		@java/core/generate-sources-build.xml \
-		|| die "protoc sources failed"
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	# https://github.com/protocolbuffers/protobuf/blob/v26.1/java/core/pom.xml#L63-L71
-	jar cvf testdata.jar \
-		-C src google/protobuf/testdata/golden_message_oneof_implemented \
-		-C src google/protobuf/testdata/golden_packed_fields_message || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar"
-
-	einfo "Running protoc on first part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-1 \
-		|| die "run-protoc test-sources-build-1 failed"
-
-	einfo "Running protoc on second part of generate-test-sources-build.xml"
-	run-protoc @test-sources-build-2 \
-		|| die "run-protoc test-sources-build-2 failed"
-
-	einfo "Running tests"
-	# Invalid test class 'map_test.MapInitializationOrderTest':
-	# 1. Test class should have exactly one public constructor
-	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
-	# 1. Test class should have exactly one public constructor
-	pushd "${JAVA_TEST_SRC_DIR}" || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			-path "**/*Test.java" \
-			! -path "**/Abstract*Test.java" \
-			! -name "MapInitializationOrderTest.java" \
-			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 586e47434682..9677954f3ffb 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index bf8b673dd0a2..4eff5b916b03 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -210,16 +210,24 @@ DIST rust-1.81.0-i686-unknown-linux-gnu.tar.xz 224016868 BLAKE2B cbc147e42563ba1
 DIST rust-1.81.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3cfb29d5ff9f00e5f14631466a3a5bc5ae0a3dadeed3e2b22ee000ebc57bf02ca6db5f2ac01756a6fdc753bb4cd83e5e6ed8fd9e356b6325f5b7eb17e7714d7e SHA512 1fd1ca2016876f2456eb832bc9c6d1ab2be237a619d5f6fd4e1ee0f31bdad3d3c1c95d5f45069512d0c8a140115a594be3d1f888fd9b5a342ddd7cda1d5e5ce7
 DIST rust-1.81.0-loongarch64-unknown-linux-gnu.tar.xz 200885152 BLAKE2B 46b23442632d7c3368454a031643a795cf54b732d2c180960008e38be97070708a433d1094f529aa78479fbd89adf1c4ceac38af919f28577e8f766029cf40c3 SHA512 2e090423c8c5ddc1dc29d5ad19cdaebb9abad45bc7a229f911385f50cd2951b587a187ed8deb01aa41aa643465d7c7ac2b91d94c80265c03362de39b99eba82e
 DIST rust-1.81.0-loongarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 70aa0a550992b32ef666751336ebe2c81f3834d4117942cdc7f8b1eeadb1e5efa5fc63e283517e5535f406ff0e36b4577e559e24281e388a362463ed046fa340 SHA512 70c85d06e5b29968b6efb10efbece2761f81697395bf037581adf9e3aec0141266ae59644b6951e646749bcc23b038d5601b804c6d389b64c87b4be24847db42
+DIST rust-1.81.0-mips-unknown-linux-gnu.tar.xz 73640352 BLAKE2B 91f833acb8378361428112a802b1ca3a92a08ac86922161bf7d8c5f5f8c2fa13f5f8eee655363dcdcb853211e4575b3d1161f4b914d7dc8ba005f4fd681198e7 SHA512 abb641fbd5c0f895e2401045cdaba390445af5004e04f090218bb8a098e487e6844280cd162873a0664e7fbaf25227477f2ccf6da9c20568dcf332d9ad713ede
+DIST rust-1.81.0-mips64-unknown-linux-gnuabi64.tar.xz 73301608 BLAKE2B f9190465942a0b85d810e3a16f4f1850b70d29409743496b22a01621640a86213c82cbffc45d630ee604aba34fe5ee0783cf018af85b037660c4ca61a57ce9b7 SHA512 51305596f1a2462b03c74c7c0789c5d2c4f7094caef5753a1cefab8b4371ca57cd0d91528b1a6e957151b2484cff5b45f3341a48196bd095212657483ce94f6a
+DIST rust-1.81.0-mips64el-unknown-linux-gnuabi64.tar.xz 74961740 BLAKE2B 6a712c1c1485be3e7f8a2599c13c0f296c38c77771d635d1099608a3ee1fe6ed3474876f5518c6a417456ac8087b0f4b415fde371873f81d9d3bd778721bf917 SHA512 5eefdf363f13afee128745cdde805794a88bb63151b6f18598096c3ba0f826aae2519cfc61f93b458de5da1d0765d9e48beb844f226346f54dedadfc19f3840d
+DIST rust-1.81.0-mipsel-unknown-linux-gnu.tar.xz 75296988 BLAKE2B e0f030e08fe4aaeade0637e601c5c71dd49dc65ba1b9a8a9cffe48b66b6c38547b745cc2d2802232e914fa1e8d01725b57a7b92a5b5986b752fe5e6c480de080 SHA512 90bf79b7f83eeec7729b8fb4cadad33c1ce7c911457fae8d2c4d0e2ade68675e4aad484fe8f41163065e7a9096d36f0045c95aa24bb097e00122ed31a1c24544
 DIST rust-1.81.0-powerpc-unknown-linux-gnu.tar.xz 213304904 BLAKE2B b9d126cc787323ec18e978aaccbb8f92ccf753314fcc6a5d2d496400f4bc7885b543bd7ecae782a6c1dba737708358be26be68f69b47e982617e9a80af47d279 SHA512 a84bdad9877f7c8df2cd495447cca2a0e1448a8a13ee0fbcd2ca6f662317cbebf9425238edf3b5a1277b723b9c44eb4d363339c00a35e0ff86b6a568b61ec2f2
 DIST rust-1.81.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d2fba08b5be0026227e071993272a12e0d27af3b8e3b2fbd039a9c9a229317e9014d2e0f2c981387e6b46907e258e309424c2aef22d3512743d28ce035a85dc3 SHA512 156319d1904834794476d80a3b047a4099b983cb950ab3e9882ff34c0451eddff7cad8b160406abf23df40d195fdce925052177de2243ec8e8415edaac3c643c
 DIST rust-1.81.0-powerpc64-unknown-linux-gnu.tar.xz 210257620 BLAKE2B 686cb5e08befb0d4a19a7e34478c6916abd6aa7a05f09d83a7f8c4fcf59e144371a7442a1f14cd34b149dd056df119d5748ece4311d69af79725cb9b3b662126 SHA512 14f5feaeba8cb9e0a3326e5d74cba9be832fe6570308d5735f7fe7486fe240ef0f3cd2396c853bf34cc784f05fedd7a975dcb922775c59f3262a67fac1383839
 DIST rust-1.81.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d30e35436bbe3869278f4936b2b132d0a243bf0288470e837246a59239c2813025757f684f23c639517836e25895835a7ab0fd488834e2f53cfd1155e1c8a2fd SHA512 3b302c6c999df3e9aa0ab1a0638692cb6f88d44598e00bc862ecd2c384afffb259b8072738055800efc9f0c5b8de07a0fe3de1cab1bde28a9faf1951411a9bf6
+DIST rust-1.81.0-powerpc64-unknown-linux-musl.tar.xz 76312476 BLAKE2B ab03fcae936cce1f2d4890d91e2e10b21ebdde72fbfb3d766436dc2ed18946e498e90c68158182c949ab92f0be02276fdd21d33ed17439d6bcc50526db1c386c SHA512 5812da254dbffa39c6ec6d2208d5223d7a2b57adc597fff2980c9f7f40ef7b9614ea43354840acd87f8349165b7df2d79974f0acb7ef71046bbba86653c982c1
 DIST rust-1.81.0-powerpc64le-unknown-linux-gnu.tar.xz 224307656 BLAKE2B 3891f93aa2bfb62fe23b463cdbd7db50182bb175cfadf2969b32d093897f517afb7dd97ecaefe90f220998f7436d41651c32e5a46957c2114d1ebc70834dd917 SHA512 9f6fa6bf0d5ba935b9ad5661287ad8aad5fc8d6b28fdbce6cd81730539d087ea512dba7b0133de08761d12b580b8b1c5d7ca35a4f1277a8bb683c109177ce83a
 DIST rust-1.81.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e96b56de2542596db2db9030382e8d87a9fee884888b58c0050b81487eaf22c2e6d62d11dfc7763a1f647318c2bd0b29e03dcbbe1809ea8162432874758caa7c SHA512 0e568a763276ca4e9c359d6dfc32d1f369ee04e160026c7660ff5f14175022175d23589df9c03c0c8c270d7e74a5e54754d23c8a1b0545b67b6d6c3d3ee82628
+DIST rust-1.81.0-powerpc64le-unknown-linux-musl.tar.xz 78549196 BLAKE2B 09c359d64f54a6fd4a2ed2e05007bb18ac9abd5223486c8ecd3f08c4f6a0c0de5e22e5f2bd8ba7759949945045e9c84074cb9a133802f3f5a8fe10d97b3e777d SHA512 6345439d1f8e93a47b41593b3a815e23087b77d20722531f05d197e6a96e1699955aac48846a94caa6580e8fc5f30ea7f6edc45fa2e3c5308dc95728c12813e0
 DIST rust-1.81.0-riscv64gc-unknown-linux-gnu.tar.xz 223006516 BLAKE2B 5627ee83ed51726bcdb50757393f2333d76d705e18d65681c1872df6dd3e2beb9a18910b4d5e7da5c30f83b4c9f80117f2ef9c212cdd92eebc6cfce182ef579f SHA512 57cf209d364d43164402cddeed0ebe41b3e3ca69f79cec4f83055cf999493ed1cd87bc852b90707b2809cacceb39a83c4236712220105cd6a71be30250d4ae6e
 DIST rust-1.81.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0eaff43543493165dd86a2ffa30a4039b599302970e5c4380e8640c8c61881480c86b2ef98159ccf464c2fe39e23d14191aa11fccecb8ea8f56feebabfcd0d2a SHA512 4b5b7f01801692aa4087b5f010993d4b14b73be9c2dc964555ba140a939e434400cb4ed4756238725dcb2ab66e5ed67bb1d4688a92fcbc6c8af23f21fdaee568
+DIST rust-1.81.0-riscv64gc-unknown-linux-musl.tar.xz 83775176 BLAKE2B 6022f9c9ca652de040157434052dbe6079b03e1fce14880b3484599da0a217bd1da8e829e7fd1ec2f783a84873fd8b93138a5824e3628d6099ed92f47963f799 SHA512 16441a47b6cf4b7291d42d9ac07ad1e6a1cfc36d394d533517866f3ac66d240cbcd40bfde157de1b3161d55cf54b285cd36dc4758592c073cb6b8ed3e4d7cab8
 DIST rust-1.81.0-s390x-unknown-linux-gnu.tar.xz 212322092 BLAKE2B 11237159a0e70c84e296cd54ac52721a887057ad12269328cf67483d55e603df3f55381c4413871b83fe58a26a52c32ba5e77e7b3426016eb35a207275598c29 SHA512 1ca177d52cd897da497191c4ff869ad9e22047d37f4955e134d51a8ac5a5c24d9ff109a6e955e71df0ac0fa1776939ee39ae384f2fa12ac4740e2aecf92dfd61
 DIST rust-1.81.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a982e7308aca7fac8a93d299a9dcb00f5bea71e1b7061fada84fdf2cbe1cc5bf7ea65abff857a234896b950e06e1bc76c0e796a9570039b2314ac17dc4e9f4ea SHA512 cf8cfdecaeb589db64df6ff0418d68332c8b516d401f0e9bccf9651bb085f57d3bef4941fa60788ca372a9a2407a406dfb24c153a64549925a47c15196815683
+DIST rust-1.81.0-sparc64-unknown-linux-gnu.tar.xz 71498356 BLAKE2B f987c017bc779fda3d74cf8bb845ae5bb5e1ffb146a0ee58e413ce6b726f475d457d2ab95cf0342d48ba6e74aeb43ed94a200fcf8f4dda8a86d4f796d7c6a152 SHA512 7c88530c718e377c44a54399af0f1b954e86b3040eb49b2a1ae7caa08e33a43073d65b1a027147675fb81f7ae983cff5eb27230bd5da33a9c16689a924606b43
 DIST rust-1.81.0-x86_64-unknown-linux-gnu.tar.xz 170439044 BLAKE2B 5377d8972a729b0135c2461adcdc179719a0af99e8e9656b3c9eb487144c306d49dd42737d71195773e4b03e4287215955a7bab34094c19a9f07fba04a706a62 SHA512 a648b735d91348dfda6a66b4ca09f3449ff4abbd1d727fce8c91ec409a82bfc873988b06aa0907e145c486d035df12c68fa14466ccd2148ac0a99d5934335ae2
 DIST rust-1.81.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 9f39dedf33efd6fe4d66e10e3cb064851b1637a50e97d3bc19c48bf989e1e94d694df493eb437d2c2e58989933dbb05a7d25c276b26331475f44ea2d9d52909c SHA512 37908051e511cf223e92379ecf577ee1644d6aa13583b622b78d445367ca9e8a4253d77a5237831eeef15607c71e99ae3ef42451803466fad303bb523e13475c
 DIST rust-1.81.0-x86_64-unknown-linux-musl.tar.xz 251142276 BLAKE2B da30177914f8574ff896b64a60279913d48330818c6e96e10d3180964ed542697f29c6ca7e7c81fb1b814e1d9ceb8bbf6e119596b59564a64a08e30ce72ce4b8 SHA512 3b772269362556bebbff72a13abf05f745fd88128367ab1e5879ed3c0f3f5a1f7370faec1b2bce521a38662d58d94a8e4eb6b085c8e0f166979af490492e17c8
@@ -237,5 +245,5 @@ EBUILD rust-bin-1.75.0.ebuild 7319 BLAKE2B 6d651ee302620a28e8c9312af50eacb4638b5
 EBUILD rust-bin-1.77.1.ebuild 7497 BLAKE2B fb9a25879a8886086486ba5e2010021c01e16ea2c525bf3d36d23e72c7a24eb6f196fd96d3d29231070f5a1db807865e135915224d37eebdffdf485ecc4ca83f SHA512 7ae2fb17a2fcd2d76ae85d1b0420429544a005e2c5ce1cd18a5351353b840d4048d491a316a7a97197198045f4af5f98681b4fa7b5b47df060e0ea6112b3512f
 EBUILD rust-bin-1.79.0.ebuild 7604 BLAKE2B 99c532442ff6e40c70a391d777122c32deec8ba8cf45f19d1abdf8e19f75a8776c9741ef54915995e24a646ff94b6e7ed76b2d27ac6631645179109915903d90 SHA512 b64087f5de9753a1476ec0ab72151309e75f4aa847ef0556bff0848a15b473fbb0a535ef1e957d19c92f416ad159d519c97764eb55802fc0c466930002e7e671
 EBUILD rust-bin-1.80.1.ebuild 7813 BLAKE2B 188d7efcdd2e6a0b688de4520db2d179f91bd51ff2a8191b44a5d5cb8be12f668a47cff5035c22b3cab7b00f5043f622b2fa0d80bb642aa1403faa10bb362f4b SHA512 8e53e1c781196eca1b2488602b2a3f2c81ff82a7bdd0a09836783c1fa82e4c34f2d073274186eb57683741d8bc69b870bd9921aeee31a29a8717e1350e3d6e03
-EBUILD rust-bin-1.81.0.ebuild 7836 BLAKE2B f722bb9f97e1da75b605efe46f25c74be8451c4b04d3d56d4583c3a64d8acce0a989d2802d9587075e240c6df6d1d05894f525fff91de90f4a3b3830a933de39 SHA512 474f6c769e842b0636bec61618d0ffc8c10bb77dfb6d82b8b57669a3a1a413ec1c19795f7462b055c2f503b89c541ddb95d9af427de0d7dc657d18214361a7c7
+EBUILD rust-bin-1.81.0.ebuild 7800 BLAKE2B ed4acb359d0ad776db3396b41fe9d89c0d9cefba1029b29e7e11a5de9309c6b3181b0b55ff2e9097aea6d726b904d0e9c524a4febc2db2723a5e47db0897dc4f SHA512 835b53dfdaaa93d0f5e8b350614780c36b46fccde0c1d29d73624f917677206182781e25b7f1c3e34892b26b9f3edb985e3622302eb3c1d2c611d07dbfbd57ca
 MISC metadata.xml 1220 BLAKE2B 5c4d286e569c929913317d15d37de08db51655ec41c1d3b1d84aeb6982b53afd7ebf3f9adbcd4e3c76fc9b82056648b6af1507a5728388fd2d2e8d743e5225db SHA512 72d32987894268a7b3ac8e8606428cf8315fcf29ce1945c9e55527a5c696742f6f2a44dcfe01bf5abb0cad60b5881a59dedecdc07db4ef2df22ef13e3b2732a8
diff --git a/dev-lang/rust-bin/rust-bin-1.81.0.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0.ebuild
index f13ae01faf1d..e51aa66a54b1 100644
--- a/dev-lang/rust-bin/rust-bin-1.81.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.81.0.ebuild
@@ -16,24 +16,24 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
 "
 # Keep this separate to allow easy commenting out if not yet built
-# SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
-# SRC_URI+=" mips? (
-# 	abi_mips_o32? (
-# 		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips-unknown-linux-gnu.tar.xz )
-# 		!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-mipsel-unknown-linux-gnu.tar.xz )
-# 	)
-# 	abi_mips_n64? (
-# 		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips64-unknown-linux-gnuabi64.tar.xz )
-# 		!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips64el-unknown-linux-gnuabi64.tar.xz )
-# 	)
-# )"
-# SRC_URI+=" riscv? (
-# 	elibc_musl? ( ${GENTOO_BIN_BASEURI}/${MY_P}-riscv64gc-unknown-linux-musl.tar.xz )
-# )"
-# SRC_URI+=" ppc64? ( elibc_musl? (
-# 	big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64-unknown-linux-musl.tar.xz )
-# 	!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64le-unknown-linux-musl.tar.xz )
-# ) )"
+SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz ) "
+SRC_URI+=" mips? (
+	abi_mips_o32? (
+		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips-unknown-linux-gnu.tar.xz )
+		!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-mipsel-unknown-linux-gnu.tar.xz )
+	)
+	abi_mips_n64? (
+		big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips64-unknown-linux-gnuabi64.tar.xz )
+		!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-mips64el-unknown-linux-gnuabi64.tar.xz )
+	)
+)"
+SRC_URI+=" riscv? (
+	elibc_musl? ( ${GENTOO_BIN_BASEURI}/${MY_P}-riscv64gc-unknown-linux-musl.tar.xz )
+)"
+SRC_URI+=" ppc64? ( elibc_musl? (
+	big-endian?  ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64-unknown-linux-musl.tar.xz )
+	!big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64le-unknown-linux-musl.tar.xz )
+) )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4"
 SLOT="stable"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f88fbb7bdd7f..8b17b85e5433 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 48ad2eee97c7..6d05da3058e2 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -6,8 +6,6 @@ AUX m17n-lib-ftconfig.patch 1200 BLAKE2B 8aea727469596923fba54ac98cde29719a09eae
 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c
 AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1
 AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f
-DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb SHA512 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
 DIST m17n-lib-1.8.4.tar.gz 1119271 BLAKE2B 790a002e0abd66d7db0d61ab0240712b2810e698c73d507a5054ad83d4a7a7258c4407d5167ce92fc4c1f3acdfc9f8d3244634af801cde2a00762f09d5e1d823 SHA512 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6
-EBUILD m17n-lib-1.8.0-r1.ebuild 1899 BLAKE2B e36469e70b407bd650148caa378e200de750be37cea375935e73bf090dc8ee0b02318f132819ff5b2d6b1f138b7532e6730e43e056a885f725a6f3845b4f160c SHA512 06a62032765ded0efc28bb4ea0f6ce156a9bc7d387eec87d21cf2aa0c3be3bc1f44f53e920fec9f9cf34bb37909df4c5bb1386e3bd04e9a75947e6d5274e8436
 EBUILD m17n-lib-1.8.4-r1.ebuild 1753 BLAKE2B a68391595cecf928fe4d041c4017923363f9c7c86ca1373f0e2380126be1cc37be4c89cfa19b0c5de43f7c08f242a3f763e5ce59bf669f7ef10ae41ab7f9e88c SHA512 e5783bc8a3e3961b26d79810e1966c936814a1cfc4040001b7d623a5e5516bafc6ca8f34e09b0050799d090b78a70393d2f26772346df1131c2e0b426464c949
 MISC metadata.xml 889 BLAKE2B 4fdd373094410c6fac69020e36d1433b10eae0ff3530e666f1445819175e118c8266d6000145e1be27912c530162ed9a76e71014bb37998c11a1355b125d1665 SHA512 fcecdbf2fefbc637a023c3f3b03922dbb6708a6b540e5555242d415e4d70b5ef73df3f9cccc14536aa237a018b9b23e3a5a3d04141d93401fcc06984b542754b
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
deleted file mode 100644
index c8e0a53b3227..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://www.nongnu.org/m17n/"
-SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
-
-RDEPEND="~dev-db/m17n-db-${PV}
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		athena? ( x11-libs/libXaw )
-		bidi? ( dev-libs/fribidi )
-		fontconfig? ( media-libs/fontconfig )
-		gd? ( media-libs/gd[png] )
-		libotf? ( dev-libs/libotf )
-		xft? (
-			media-libs/freetype
-			x11-libs/libXft
-		)
-	)
-	anthy? ( app-i18n/anthy )
-	libxml2? ( dev-libs/libxml2 )
-	spell? ( app-text/aspell )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${PN}-clang.patch
-	"${FILESDIR}"/${PN}-freetype.patch
-	"${FILESDIR}"/${PN}-ftconfig.patch
-	"${FILESDIR}"/${PN}-ispell.patch
-	"${FILESDIR}"/${PN}-parallel-make.patch
-	"${FILESDIR}"/${PN}-pkg-config.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	# workaround for parallel install
-	sed -i "/^install-module/s/:/: install-libLTLIBRARIES/" src/Makefile.in
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with anthy)
-		$(use_with libxml2)
-		$(use_with spell ispell)
-	)
-	if use X; then
-		myconf+=(
-			$(use_with athena)
-			$(use_with bidi fribidi)
-			$(use_with fontconfig)
-			$(use_with xft freetype)
-			$(use_with gd)
-			--with-gui
-			$(use_with libotf)
-			--with-x
-			$(use_with xft)
-		)
-	else
-		myconf+=(
-			--without-athena
-			--without-fontconfig
-			--without-freetype
-			--without-fribidi
-			--without-gd
-			--without-gui
-			--without-libotf
-			--without-x
-			--without-xft
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/tree-sitter-scala/Manifest b/dev-libs/tree-sitter-scala/Manifest
index 68b978a51072..9f53b51d675a 100644
--- a/dev-libs/tree-sitter-scala/Manifest
+++ b/dev-libs/tree-sitter-scala/Manifest
@@ -1,5 +1,7 @@
 DIST tree-sitter-scala-0.21.0.tar.gz 1339069 BLAKE2B ae3406b49da3c7d349b0689b1f6d1ef037f5c6e5326016b64abef00174da0b1fe489579939150bd065fa82546a5782c04232ac144eb596855b59e263afe72ed0 SHA512 4d76e496c68993babe3c11315d6ce2c2a15cf576f55197358d718b0d16d1ee2c7e498ee45f793729b03faef7f35b8dbbe4d3692e4255f9aedb9ef69d49cdb189
 DIST tree-sitter-scala-0.23.0.tar.gz 1240380 BLAKE2B cbe0774baf0fb46a50bce4f49d0506ea8d5c1d7454c116935937a213e6e2496a56815bbadb7465d74ac8a43ace6e3d97a9b5d8d3cebcf99935083316a2e33c16 SHA512 e47263a8c77108ea348ef8d4d0d34cf37330df2c54471f98767dc085f8839836662bcbe2b9495fbce8ff21e75845c88e4c9cc8496aa016c351af00fc0607b520
+DIST tree-sitter-scala-0.23.2.tar.gz 1301039 BLAKE2B bb7f93b389e109e70391926bbe2f4fce7c63b0ce29c87cc7001eb26142251bd30cbc8e95a3182b8e7c5f1a2719df185b8a23a6c99dc58f7e1ce907006f7352cb SHA512 b9e3d3dc6c282dc058f7cc8a09467e0391b11a4cd3d4e722f3c596df46ac46ec40255e6131d322804dae129adb0c5baba83e4710f82acfb8446b7176b5e85d1a
 EBUILD tree-sitter-scala-0.21.0.ebuild 287 BLAKE2B 66ef777ec8256ef0032a6fdd4eb171eae8667d202affeffdafd6be910b5b17f9f7b40a73f2e1e6c20dc2dfc14062a7d45bcd1373bb7eefb3dfb2c918eb9ede20 SHA512 b5fdf9e35810d6189b1a68545a5c3b673360301a4edc9fd2c7e5c0d3d0f196a7db0ae4dc47b713c0871f9389800ec78bd0598d873e8238be7fe089c14913fae6
 EBUILD tree-sitter-scala-0.23.0.ebuild 399 BLAKE2B dfd43e74c9976353be76503e83a25b987941470de72187e62f09d9a393da76d040f0526690fc8bbac74e395921c846ed66ee8a5a66329ae7de5bc33540a40e4a SHA512 e1a2fc9df0ea0d17714a940114487984333e1a413f685db4a11e8bc7e9cd649a8fd9053c2794e24044a0b2397847f3ef5f8115474718960b2b83e336cd8d2fd4
+EBUILD tree-sitter-scala-0.23.2.ebuild 288 BLAKE2B f0ad6f96c5e8fbfcaa7030915855f780f5bbecca7fe5b8365b0cb68b5ad2d65adbaf14256a9a0524c1059db0d96b5d76f78950e2bbc3f61e258a9130bc415b54 SHA512 ccd4e9562cca3ddf1a3cdbd188a76c6d83cee47c594a14f677d84ccd711f3c15c5a2a3c58f969fb1ee762e43452435e16bd34dea3c84d03318f77b2467c2eeda
 MISC metadata.xml 342 BLAKE2B de444582ed5c254117430d3daff6fa94fcc4ab6c5bb1b9267524f7cc74051afd4466f4363c746d4a908ce839e6d60c762d7556cda179524b26cb58fc59cfba7c SHA512 76c0ba3d74603eb1dfa04ecbbc57fd117cc3628b0c94be2dcca8c075ef5300cf6a4d61455b3a5b5b0e0cc5777c1185750ccdba0ea95dbd040b64abd9bd11c3f3
diff --git a/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.2.ebuild b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.2.ebuild
new file mode 100644
index 000000000000..f994c3b92365
--- /dev/null
+++ b/dev-libs/tree-sitter-scala/tree-sitter-scala-0.23.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Scala grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-scala"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/Faker/Faker-27.0.0.ebuild b/dev-python/Faker/Faker-27.0.0.ebuild
deleted file mode 100644
index ce5439e552ee..000000000000
--- a/dev-python/Faker/Faker-27.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-# note: tests are flaky with xdist
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-28.1.0.ebuild b/dev-python/Faker/Faker-28.1.0.ebuild
index ba0bb04960f1..ce5439e552ee 100644
--- a/dev-python/Faker/Faker-28.1.0.ebuild
+++ b/dev-python/Faker/Faker-28.1.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"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 3c5466204e99..8fb46c217b34 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,7 +1,5 @@
-DIST faker-27.0.0.tar.gz 1764992 BLAKE2B 4ddb83d76abd29eb2281bc27122632e098d3a09bb220881df60d9b67806f58d3c356229035f5316a3fe5dbab70db667d7b8d28d828b4585fc75736ecbc9f0186 SHA512 90b1b76f94066d6d27c4e857297b55b3675f96226cdbefd1bdd99a28599343ffee2b64edd3b15c6cb893ee2b4df446f079269609787a7ef054af3c6a03cca8a1
 DIST faker-28.1.0.tar.gz 1781898 BLAKE2B 4c18e70992e89b4638815afcd2be4a409e9caeb7e32f8903964491e4f687f25b0184dd3e4e9cd605e3fd0cdc33bd3b9be6573e60f98efaf18b0ddecdbf9355b1 SHA512 a312ccce960ee01452329bdf47289f8b4fc9362b1a10a445d93583eefae7c8aa94af363733babe56dd3c7df4a1e585c8a4f84e86d811fa2e1a6d050924c9ae95
 DIST faker-28.4.1.tar.gz 1794640 BLAKE2B 96a2f16b1d1906c1ae5263f8a2e782417fa6fb8062881d3700bf31b25892f27c612ebb64be925548c848e75e2e90d5761cc20a7b7bdb74119c95dfe3e5b871e5 SHA512 376b8e97ef654477ba549f0de50ef02979bf2595051f1a41b353a44bb734aa75171afa633ea76d3f02cf72f84dd12d268e28a4baba55fcb728fb4cd988b57e6a
-EBUILD Faker-27.0.0.ebuild 939 BLAKE2B 05106a1df3b685656321e5d4b69f8df457306cfcf6aa90c72913491dd9c92150824757aa4dfc8f93a73e63f9849b060078399c4965f65db7d8495703d66fa37c SHA512 26a175124e82c368b4acfb5d20ed044890e8e09b40a031dc33f4f8c17e0245fbf30adc6185c9bc64791d383396e19679e751b1317cd0a702054654fd282a3b00
-EBUILD Faker-28.1.0.ebuild 946 BLAKE2B 1d80ecf7217123cebf6cb4aa4934d49e55197cc48b5b6d37432b7639343084b8aee7632f395e16e87fc0422bda203c7fccff1d37ec8861db461014163b8dcd07 SHA512 1e658d11befb97dca5943b005d6d4f5a3ab8aaca677e2b2fad3b30cbe08f44ef721efd15751749809d97418eb4d90af803a5c99012cae0dd2e6f420231b76536
+EBUILD Faker-28.1.0.ebuild 939 BLAKE2B 05106a1df3b685656321e5d4b69f8df457306cfcf6aa90c72913491dd9c92150824757aa4dfc8f93a73e63f9849b060078399c4965f65db7d8495703d66fa37c SHA512 26a175124e82c368b4acfb5d20ed044890e8e09b40a031dc33f4f8c17e0245fbf30adc6185c9bc64791d383396e19679e751b1317cd0a702054654fd282a3b00
 EBUILD Faker-28.4.1.ebuild 946 BLAKE2B 1d80ecf7217123cebf6cb4aa4934d49e55197cc48b5b6d37432b7639343084b8aee7632f395e16e87fc0422bda203c7fccff1d37ec8861db461014163b8dcd07 SHA512 1e658d11befb97dca5943b005d6d4f5a3ab8aaca677e2b2fad3b30cbe08f44ef721efd15751749809d97418eb4d90af803a5c99012cae0dd2e6f420231b76536
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d90b912b338c..5b30d00fb452 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 46827b2ff0b7..bfe135686479 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,3 @@
-DIST PyGithub-2.3.0.tar.gz 3455482 BLAKE2B 3638d5a101dcc41196a54f1a1e36dbc2dd53ab21fc2edd1945a036527979939da53dbf1cdd462622e851e891eae1264231b42c9f8a561740087d602a966d11b2 SHA512 7964b8ab1ad989e48b7d4cda42e7690cdd99c7f8d199e0eaa5ff5b2986592cef135e252253bef4f425cf04946ea18d8c83bcce4253914113fc9a21e83dc31166
 DIST pygithub-2.4.0.tar.gz 3476673 BLAKE2B 4f07b68c529d6eb3936768bd64ff3790f794c9c37d0aa1f34496d17f0423ac9501248874ffb954bc8a38c1fe04f43aa040e6cb151f00464effe6b98669459f04 SHA512 647ccc56d6108a5c08321c75552b59e5d7120fd3f45587579384f3a3a1cf500aceadf4e302ccf19d8655645be5d6a76263ec5f337b08b24d94c432bbe1cb5848
-EBUILD PyGithub-2.3.0.ebuild 956 BLAKE2B 43ba33698db01a0b3cf9c1e0b1422af1f65b1c97541c280a4803756762e25c9286078bc777625f960417ca7f67bb97863946bb56b97c36f97a67762bd8e9b77a SHA512 ae4e4e8bfa4e7520d4dcc0fb61fb857af70635fd9094ea4c483171f8bde9b4fe587d9bc991198bd05e4d585510a29f1aaed602fcee2806c171a9c2c48b497606
-EBUILD PyGithub-2.4.0.ebuild 1010 BLAKE2B 23bbdb75d69082e7f13eb4f8ed424692fd09090520942e7c3b9d456581bb9cedb4518328f593f4efca6c27a1cc124ecb14458e8da09a426a85d02cf0fd29d0bc SHA512 94812b318d54c697b17e8747d16eafe684723166964c8e3b149425ce024c3d76b5294a2609c58af94129a19c0cc5f54a3fd3a4e4d78536c7519785a00ec7de11
+EBUILD PyGithub-2.4.0.ebuild 1007 BLAKE2B 4c28da15519d560d28674d3cd5da00c0f840d2f89e6c63a03b0b96fe8ea562c2e2ba5477e6c89ad557d3f5660a4798c9879e7ca2da7c11cec9a69587b210ecf7 SHA512 8697a55047e02877401a981cc946f6e5ee639419cf430eea0e02f77fb532ed41b9b47bdda45383809cdd2ce9077215cf6cc4b8c6e7bc4995be07f3c22115a06a
 MISC metadata.xml 501 BLAKE2B 1692287021b81416f18386da2b1dffd1c358d4dbfa3aacf7d5f773db0889ba966408c35fdbb7ea7f741923d542ea4e825039ab124a64168ad2d5264d1718dc5b SHA512 e1f2c16e725e96e8d576ff6b87a79d39f1b8169c6f419eadcd18a8a266fd188dc08fc9efa236f2c696449a083b000086b153da559cd819fcb73ddf2518500813
diff --git a/dev-python/PyGithub/PyGithub-2.3.0.ebuild b/dev-python/PyGithub/PyGithub-2.3.0.ebuild
deleted file mode 100644
index 831cab7e7c76..000000000000
--- a/dev-python/PyGithub/PyGithub-2.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="
-	https://github.com/PyGithub/PyGithub/
-	https://pypi.org/project/PyGithub/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-# cryptography via pyjwt[crypto]
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/httpretty-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-2.4.0.ebuild b/dev-python/PyGithub/PyGithub-2.4.0.ebuild
index aa72bfba2f1b..4e3b829bf00f 100644
--- a/dev-python/PyGithub/PyGithub-2.4.0.ebuild
+++ b/dev-python/PyGithub/PyGithub-2.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 # cryptography via pyjwt[crypto]
 RDEPEND="
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index d11758ad0891..390137bcbe06 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,5 +1,7 @@
 DIST asteval-1.0.2.gh.tar.gz 45578 BLAKE2B 87bf6c9eaf4cb8f202bf78f8eb8b670fa7c4619384b8b07dd0b46fbba3f39508d16f69237a0798a705d5077fbe71930d7aa946e637668d5b41ec43d7b5802837 SHA512 6e7ae98e96c359852db46c3c2ba0fa9796375eea84b6f213fe59cf91fb3d9862effa759051e962daf6fc072579b907233166cd12ff4e9a2d04b62a519a8f9af8
 DIST asteval-1.0.3.gh.tar.gz 46346 BLAKE2B 1f0985030d9684db2fbb7f112e32e6d4434f3600a4825c50366aafd9d3a0f1c9a87143e09d6017c69e5ba0987f256162c9b516f2042f872e27469eeb82250214 SHA512 b7dcb52ebb56b114167b05dd743656b427db1bd416c7842fd5ee2ad5c81ff1c62cadcf94b29b218985e4bfbc2111f2ab0b0a6bca172b1092a50edce011fc5e31
+DIST asteval-1.0.4.gh.tar.gz 46374 BLAKE2B 4a3133457a752bc99a68fc4bffeb8aab8b4340ef21f8bae75d9131a5bcaa7eb4d081cacdfa7d9396565cc744a4d997e33516ba9cb0ae290392b06bfbcc608f27 SHA512 cf29562a2792013ed8fc7c14aaa261650b05037ee92ab75f8c79a1a235c59e8ee4768955c03ed615798666bfb62bf2ca37105dc93c1a4f56bcf446a0e4ba01f6
 EBUILD asteval-1.0.2.ebuild 685 BLAKE2B ba482d23d1399de20354f3306e126dc3c2f378e426fb40b45920bb43b9217b2bb5cbb278124d6b19987c2876202d3141bf1245372dd0c159e662cbb716342e3c SHA512 bd7859bbe4b4d6aff03e0d0107bcb4a0fcfd36242c840f08c8b363d2e2d57850ef5a5064c430dfa900cc09ef464198f9401852358df73ff485a197397886135f
 EBUILD asteval-1.0.3.ebuild 685 BLAKE2B ba482d23d1399de20354f3306e126dc3c2f378e426fb40b45920bb43b9217b2bb5cbb278124d6b19987c2876202d3141bf1245372dd0c159e662cbb716342e3c SHA512 bd7859bbe4b4d6aff03e0d0107bcb4a0fcfd36242c840f08c8b363d2e2d57850ef5a5064c430dfa900cc09ef464198f9401852358df73ff485a197397886135f
+EBUILD asteval-1.0.4.ebuild 685 BLAKE2B ba482d23d1399de20354f3306e126dc3c2f378e426fb40b45920bb43b9217b2bb5cbb278124d6b19987c2876202d3141bf1245372dd0c159e662cbb716342e3c SHA512 bd7859bbe4b4d6aff03e0d0107bcb4a0fcfd36242c840f08c8b363d2e2d57850ef5a5064c430dfa900cc09ef464198f9401852358df73ff485a197397886135f
 MISC metadata.xml 364 BLAKE2B 80f2b5eb32f8318ba159dad79e648fbb4b48b0047bd6e325206d1c33aa139861adb41c524cf6ec4105cf43406b007ffed278270b59501ee7d3c8b53677c450da SHA512 9a85a30211972755b060243b5f244a992431cde577fde0548518d2c0172be504787077acc2709e7f72d5c2918d8045496b67bd83121d297504a10e9a5a5edf5e
diff --git a/dev-python/asteval/asteval-1.0.4.ebuild b/dev-python/asteval/asteval-1.0.4.ebuild
new file mode 100644
index 000000000000..5162e3ac4666
--- /dev/null
+++ b/dev-python/asteval/asteval-1.0.4.ebuild
@@ -0,0 +1,36 @@
+# 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="Evaluator of Python expression using ast module"
+HOMEPAGE="
+	https://lmfit.github.io/asteval/
+	https://github.com/lmfit/asteval/
+	https://pypi.org/project/asteval/
+"
+SRC_URI="
+	https://github.com/lmfit/asteval/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 8ed7da226954..f1ae6d5b4974 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,17 +1,7 @@
 DIST boto3-1.35.10.gh.tar.gz 856679 BLAKE2B 03e7be74455b487a79188405796fc08bd940962ca4ef8c36398ee8f955c2677e57a528626ef31e5e54ce2c1b96c82cef857b54dcc16248178c60c14fd14de3f9 SHA512 99c0e0b67a590a06713eeb98eb485b055ee6fa1bd181f996d24bdf88698d7885efe0a5f1e9883083655b12a474112a03f8561c66c4c5b5a0e6db56d5733db77b
 DIST boto3-1.35.14.gh.tar.gz 859166 BLAKE2B eb201a319453097068b4711356ea930de739ff8874da7441fa3b931434c8a82a1692a5f67b10f06eaf7644335033e302f733fcc2267b782398e9edd28c32a613 SHA512 ade4b6bc0c816244d5335b1669090d8a5e3c8dcc8802b0aa10498ce8c5fe8e456958ff3bfd73a5c9376ce1658f9c2a90d5470c86c2b3399d7198bacd09764619
-DIST boto3-1.35.15.gh.tar.gz 859778 BLAKE2B f704c28f5510c0f495bbfd2e09ea303efedbcd96fc0d4a76ce2790c0e9e4814a678f30812d6b2c70225e0dd78ad7a38a2148aa7245d65a642409c9e693f39030 SHA512 d34ad96c6cc0e8ff29dc2b74872bf20cc69618cba72f3429425f5ad922bc669427ea709aa03642ced59b7acfd446e243067aa773930be1ff3dfe9fa8b7b9c2a4
-DIST boto3-1.35.16.gh.tar.gz 860020 BLAKE2B 2368b713cd51fd61596f50849e68f82188156a9ba80cf2b7608536f67ff9e57cb7e5cbd5529ab573d0fe1441d9572d3e8d2e6d0cd41e82237d968284c14247aa SHA512 5f5cf28b8dda8f1a136101095232346eafad886cea4ea5184295e7dd5233a18c04d51bd0398fc340d4092a916bdecfec0b7b71e009ec5e33dec86c445fcd05ac
-DIST boto3-1.35.17.gh.tar.gz 860345 BLAKE2B 7c12c48a9f72eb278ec3ab4416770a9314b6c2177329c5ed6213e19464efe8c7979f4ef7ab821085a06f6ca8b46317a08a571ba9bcf98c157ab81022a6f889e0 SHA512 bb83a4b4f5738001ca51817f7557d7e71bd214028ab509e16f9e6743d7f108b524cf994ff659ab5a9bae0285924d36eaed18ce5381da1d7aefb1dfec03588b97
-DIST boto3-1.35.18.gh.tar.gz 861400 BLAKE2B cfb106501e9c124ddd2ac286d42e811339e47db64e20bc06a97e12289df3896da60173dc13173c67bb70f6eed6506186867b6fc56bb21442cf7bdae0441a8003 SHA512 96b2cc164e37159cc175a15b96de86b43bc578711990d3048ed8e482fe17ea584a3b8fd765a328ef3ce770e832394a3dc933dee18fd7d4b52f05fbd4cf001f43
 DIST boto3-1.35.19.gh.tar.gz 861578 BLAKE2B 5011df66763e646768232a65022080ffbe3db08253f1bf3e192cf57be010ccdd08f8add78ec365e1c04d78ba1722cf6ef54fbc170f7f2419fcd370c08d48e3ce SHA512 faabd3ef8eb35a323ed64a711e0a026f8f77974516b05a93d389fb82b84932f69a2c784a1065811699dac4db016549f3756f24b879485b2dfb6ca380e6873670
-DIST boto3-1.35.5.gh.tar.gz 854016 BLAKE2B f94d738e310725cd5f9c7b405a094155f3ecf640f02045662ed94ab3689ea549fde7eee19ae2be450768560ad705b8740fda78b79ed42cf536231626d247e09a SHA512 fc1106abbb306bacb80dce825bf71303e71b0d0698d7e3bb4dcaca4ea6e4f7a97e70753367200294f334b351e764bca57f2316afec854d2e46db4644dfefc25b
-EBUILD boto3-1.35.10.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
+EBUILD boto3-1.35.10.ebuild 1198 BLAKE2B 99a7fa08055cee13f14557124398df39119bae2e4b684265d4647ad0ec83a502bb422365e3797ff5c0440c4b1c9866ede4c62b1876510178dc2e6a0b05ed8781 SHA512 c020cc5535d63c948dd456d9f4af4e97339cb36dc0bb2b2c53d3da0c8c62737e0846ff71d9f85ca9b2936a8a7bfc43b67c3114f91440e75c9870beaa8997107a
 EBUILD boto3-1.35.14.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.15.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.16.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.17.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.18.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 EBUILD boto3-1.35.19.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.5.ebuild 1198 BLAKE2B 99a7fa08055cee13f14557124398df39119bae2e4b684265d4647ad0ec83a502bb422365e3797ff5c0440c4b1c9866ede4c62b1876510178dc2e6a0b05ed8781 SHA512 c020cc5535d63c948dd456d9f4af4e97339cb36dc0bb2b2c53d3da0c8c62737e0846ff71d9f85ca9b2936a8a7bfc43b67c3114f91440e75c9870beaa8997107a
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.35.10.ebuild b/dev-python/boto3/boto3-1.35.10.ebuild
index 8cba6d95740e..54e9299b7dca 100644
--- a/dev-python/boto3/boto3-1.35.10.ebuild
+++ b/dev-python/boto3/boto3-1.35.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.15.ebuild b/dev-python/boto3/boto3-1.35.15.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.15.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.16.ebuild b/dev-python/boto3/boto3-1.35.16.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.16.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.17.ebuild b/dev-python/boto3/boto3-1.35.17.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.17.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.18.ebuild b/dev-python/boto3/boto3-1.35.18.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.18.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.5.ebuild b/dev-python/boto3/boto3-1.35.5.ebuild
deleted file mode 100644
index 54e9299b7dca..000000000000
--- a/dev-python/boto3/boto3-1.35.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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 fbfa430aa4a2..533e212d5ceb 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,7 @@
 DIST botocore-1.35.10.gh.tar.gz 13328544 BLAKE2B cecad54696210597a09f4316a88b8335bc441a6429ddbc7f3c6e539a1aaee4312b855ec93b99971c8241b2431a920085f4f3b38545d607609a8d6a94d36676d8 SHA512 cf6bb103aea0af9ed2e43762848438eef89ab5bf8eec856cb8cd70204dd36f143ab9b8defd6ecd849a542332351feb499d8c34e7382bde558eac3ad19b1c5757
 DIST botocore-1.35.14.gh.tar.gz 13340768 BLAKE2B 4ba023dbfc9e632d86028100910544e192a5b2d70ec76a21dfc5003c767a6043a144385561c35f4d7b4bfefbf4a1f3a38ef2845e323f93868e1f5ad86ae1f12b SHA512 c0dfdec80a45cf11796496bc2bef575a567368be3f29267b4d411d0615e6c8536036e47a5de11fb8f4626590dca051e891bb9430ed1ea80dfab2f43f070209d2
-DIST botocore-1.35.15.gh.tar.gz 13343518 BLAKE2B 7eef64c875cc175aa94271b72a300908dc0f1c19504b0088acd5cf97224a4793bdc1bb5adc38e763359eb54892636feb2833726d217eb0a5f998c451e8de484e SHA512 305d16f4aad9832a6b405d2aa44805a89d70b57c74d0b4a25068801615cbdd9e6e223e804f1fd2c057ae3cc6515f0a20cab8adfda421e8c29ba911707fef0820
-DIST botocore-1.35.16.gh.tar.gz 13347546 BLAKE2B c6acfbab36b849ac0dcac177b4c6edf0acade33eac6c2215eea66df2d63307bdc9c130fee42f4e62385eb52fde6578d8a185a9be30dc3fde378242182636eb76 SHA512 e5c016a0107db1977f72497361f0b5f4755c4a8c25a9e715b556c17ac93af7a5d88c2a771814a80eda634b9b551d07da187f6d2a3107c53aed44fbcbe459a041
-DIST botocore-1.35.17.gh.tar.gz 13365877 BLAKE2B d442565f443cff97387e82bd68ad18dc437f46e733bd43996e10e0df5afb48c50fa0adc3f51a30df2d991844c69d1625c3bf1c6bd46dd7864e2bca1dc9f483c7 SHA512 ffd155a63bdf669af505db1f3e8f9dd23bde5772c14f2b9f4a6801395f6714cce059b996bd8aff62c7cdbb14e244eed86a69174a9f60e26c9d680a0943a8ac26
-DIST botocore-1.35.18.gh.tar.gz 13374217 BLAKE2B abc19403bcbb09d7074decf895ee65770262abe1425380e42434dadbdb556c2ac634755642ec358611cba84cf9a0fd28e21ae1d5d0a75f939ba60b3487870d6f SHA512 8875ca2464134a7f688796ee8bda4f491ebb67bda208c37615d55f55f4bb056c3889147461c218a3f079afff67f6de7eb471fa0c216c514f5c134cd9d38d9944
 DIST botocore-1.35.19.gh.tar.gz 13376459 BLAKE2B ba64ff0dc221782ce23592a6d6a146a680e2b86aa734673d4b16d6fd83355958b32af0e86a6769d2237e6234d80fb7fb23d52e3bcd2187cfe7d3646307fdea38 SHA512 6988f442b573e951766f1978325937a29141436d976baedb9c29959d5ff64014520c1bee4a8ce9b0d4226f62a6efb081a0532b2a825811e8cb2de3217ed311ae
-DIST botocore-1.35.5.gh.tar.gz 13303437 BLAKE2B 0a95351fbc93074bb0398871773120a194fe581a26f9a74c1101a5ea57bb3acb9a33937fc2d5a39a065988cdcc6dbe253bd2227cf93e670602ccc67ab82d8845 SHA512 5527420017a4a23d5593f5b3a0eb8caf15357642ed90cd73e0fe22774cc8f9f3637028286063e3e2810e5dafe52e882928269e5c82f6369be9af99bef18fb365
-EBUILD botocore-1.35.10.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
+EBUILD botocore-1.35.10.ebuild 1665 BLAKE2B 1171f3bdcbe2eada97adf58c2011691cb51300028737903ec51e9fea4d80943dc3e199f4a1671be350ca2cf921e5dbdd4e7c8ca4658261143646cf9c0c82f522 SHA512 db8027472dcb87b167d63ed89910783e104513361b9191f5e2e2928a2904493c22d9629aa206f61206c4f29c6a9c43e8208c57a9b9bf99b031101b915d326674
 EBUILD botocore-1.35.14.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.15.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.16.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.17.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.18.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
 EBUILD botocore-1.35.19.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.5.ebuild 1665 BLAKE2B 1171f3bdcbe2eada97adf58c2011691cb51300028737903ec51e9fea4d80943dc3e199f4a1671be350ca2cf921e5dbdd4e7c8ca4658261143646cf9c0c82f522 SHA512 db8027472dcb87b167d63ed89910783e104513361b9191f5e2e2928a2904493c22d9629aa206f61206c4f29c6a9c43e8208c57a9b9bf99b031101b915d326674
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.35.10.ebuild b/dev-python/botocore/botocore-1.35.10.ebuild
index 4f1ad852bdc1..e3f2c4490826 100644
--- a/dev-python/botocore/botocore-1.35.10.ebuild
+++ b/dev-python/botocore/botocore-1.35.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.15.ebuild b/dev-python/botocore/botocore-1.35.15.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.15.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.16.ebuild b/dev-python/botocore/botocore-1.35.16.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.16.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.17.ebuild b/dev-python/botocore/botocore-1.35.17.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.17.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.18.ebuild b/dev-python/botocore/botocore-1.35.18.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.18.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.5.ebuild b/dev-python/botocore/botocore-1.35.5.ebuild
deleted file mode 100644
index e3f2c4490826..000000000000
--- a/dev-python/botocore/botocore-1.35.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 0b3eaf17d38b..34970ebc9081 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,9 +1,7 @@
-DIST cfn_lint-1.10.3.tar.gz 2418034 BLAKE2B f889112d5572401dd5333d1a9edcb277c6150bc58ba8d6e64322d4eb732be706386b795cb4abb4ec7a03855394b7c95f1f7048d2cd499fd2717f5cbe4458ee32 SHA512 b81a8afef2c2b5fcc3e9e5557908bd6510714421cae9e0a1319019ca23ba41b904e69888b9f84dcc5f612dfacf745071a79251c773b816b9e7d7b347e4e26586
 DIST cfn_lint-1.11.1.tar.gz 2415408 BLAKE2B c164f6cd520e4106ff9cfaaffdcb66860c3e66060aad484a488f22a304c56c5a365389e63f948d647e37e10ead5f6c8e5bb435c842377e4db122805d7bab218c SHA512 c8295874345b2a561e521b732031558ff4d1de11fcd912940955301f0c4d1923d11d7d8f2cf5a90c3c540d3b28dbcd9f18fb01778fa9678e3fe6722d732d4014
 DIST cfn_lint-1.12.4.tar.gz 2870663 BLAKE2B 90b1c2682a143108f077b1239171cb410657a33f1970e1f9fbc06774d1301ad0c28e364d7cf60163cb1d62a3c24221595e722db1fda5b79aebfd4fb321008396 SHA512 04092142a5de5da4cf2e94fe425c696cee3fd438fb569faa16bd390f3f3b8bfee63397a2aeedca99950eb656916b04456d59f2069c8479ce4c8acdffae01018a
 DIST cfn_lint-1.13.0.tar.gz 2378100 BLAKE2B a1fa12fe13df1f3f8c5e533c138036df7e2eae325641e7fd66a050a3bb81718caf353d867bf7bbc765942a93bb9025a97bd9691a5759f59118296c23daf7466e SHA512 eeec69657907cc145e533c390987f25374e9019a4c493d3a8ad98123f8db9445bac4890cbaef59b15af752d5a3437f75ea1687bc167198aec81ebb0a3c1ab097
-EBUILD cfn-lint-1.10.3.ebuild 2173 BLAKE2B e5d36838ac6fdbef143deed68652896c380d7d3a143a0c6f9b5e4efd38283f98a50f8169bbedba9fe826c1c306b56efc0f7f28c1a911cb85305748f996127c1a SHA512 262134549b6fa7a30a83feeed58ea5cfbb45a1f778b116238f5603c2e4e22243b5d63b2ce979c05a8d21990f3887e86dabc28f5ff08edb36cb44f2b866e53c3e
-EBUILD cfn-lint-1.11.1.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
+EBUILD cfn-lint-1.11.1.ebuild 2173 BLAKE2B 5e4c47efdb2519007e70bb5a736e25ef396631a967b23f6057e450a31358b2bf16fc3d85a30259dd2414e85a185784504b6d330a6568edccb8880d230fb81327 SHA512 da3c99f559c87c3b50c75a2055b1ca0fecc2eaf12f9601460efb853a31569aa081668ae2f300b4f0f1bb551dccba1c1b65bed2aa1cb60bbfbc09295d75cec3fb
 EBUILD cfn-lint-1.12.4.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
 EBUILD cfn-lint-1.13.0.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild b/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild
deleted file mode 100644
index 067ed8be2ab7..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.10.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild
index 086f03ea08df..b020827d82b1 100644
--- a/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index 7692239ee05c..094222430f95 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,5 +1,5 @@
 DIST contourpy-1.2.1.gh.tar.gz 13440991 BLAKE2B 2e792ca990244f7890462b84a2f23e4fbc31fd8ce0a18bc8724767dfa4b5fc0a4271dc6989531423db58d567706a28ce95e680372dbf64bae93a09914353f3ac SHA512 2bb2ac7436cbee1ebc69e6edaf3166e294de32711cec506ce9a3132f1cf20ff8de70af27b432b81abb582c9fe30239f8724f68936908bdbf6348eb249eaae4d5
 DIST contourpy-1.3.0.gh.tar.gz 13445333 BLAKE2B d49131f0d46f4000ecbd9caf7cf63c3089085cb6ce85f745ba737f0c3a430e8f5594205dd6be0e5fcc1ae8572594825b363b07c01feabe8ef13641eacc4a9ac0 SHA512 aa16e87879f3513219b1c1f4e001e99c9842248baebd2b1632b3177b141c16ed7d28efcd96bb33bddf941fa1613887691f4c293262c1fe7f82d12c0713fe852b
 EBUILD contourpy-1.2.1.ebuild 1087 BLAKE2B 34639bb788aeb3c5b14c870ee0289fed1704541656de10c9bded6b28bc461a118320bfd0e735fcfa97f339d63682c52da6f16e1130ad909eb8f3189f0321c296 SHA512 1b0f5b4eac84f418a6ae549e029712133fe3bdd4b008917de5bf56e9c9a556cbb83e022103f8ea8a9b881ada3e4bb02594295355cdfed2a7f343bd430bb6103a
-EBUILD contourpy-1.3.0.ebuild 1146 BLAKE2B e5cd47786387cec027a7765a4e97e08c370a6f7f373c4f84ac24c298c9e06c9c329c931a38b3db3b279528273bed04f84f5481ecae76b1b8a08411877731c638 SHA512 b1a8b04a9bd12d2f908c3098b30fbf3f395a1082aa5c9d1b11fddd2e7ce2097f85c15a86cb4d755b07ead334470f255888dabd200885fbbf2a28ee6a0a1ccadb
+EBUILD contourpy-1.3.0.ebuild 1142 BLAKE2B e6d9958346755acbd196ba23c967057f62424658fd9c6b52cb2aadea20d3d8cdac0d3c6e64785dd840150f8bf6c0c3b086c6bffcc5f0278f0a4952b1dbb3ce33 SHA512 2d1c9846b9f846cd5682c862b266ba35238f0ed6a0adc4e6a56faf67a3b99865b3ea2e2a9102d0e12f664365abc866da61b7763bdf39b273183f346c245c176b
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.3.0.ebuild b/dev-python/contourpy/contourpy-1.3.0.ebuild
index 02fcf3f45f2d..08d538003259 100644
--- a/dev-python/contourpy/contourpy-1.3.0.ebuild
+++ b/dev-python/contourpy/contourpy-1.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 99214159b37d..e34db44339d6 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,3 @@
-DIST fakeredis-2.23.5.tar.gz 132797 BLAKE2B 1314ad46b310d4c1661b86593057afb3d1e9d0e4412146c1b883a17802c681e68062cb89dd89bc7cf3dfaac1eaf713fad7d4860986f50ed585a281208db0778a SHA512 e402cdd881872dc9af2e2b555d89329ba0eea0773f3924936774fc5a3a49d5fc9cba121f9bcddecc6d203f50bb2966aa7576496345966d415852ed8ed96cc8d4
-DIST fakeredis-2.24.0.tar.gz 143594 BLAKE2B d14a163f9997b61bfcc156ffc47d5f18c94db9226e961c2bda7d4160d4c80e19db0a3c6a500511ad80f950e0c6ebd6ab160cf11cf6097ca3b26223183a54e889 SHA512 13a42750afd4f6432904aa01a841d7f3d2e8512955751fdf8f638b5e207039fa1b5e07bdcd28b7b9d1c1461a85a0c12cf7a1d663dd287220850575af097d2271
 DIST fakeredis-2.24.1.tar.gz 143606 BLAKE2B 1f89aed8f7a66c9100748946441d6a6876f1e0795337368fc34a9c89f1c256ddebcbd9b9597f4ff75703c78c3bc60031530423ce358dcc95c1567acec1b9856a SHA512 737ccfee02d05325e752d7cac8fb405937406acac9090709ead76ed8db2e1912f1c0d128a8ea354e78acfae317ec6bccb931f784720a3cd4c84693f9f3607a17
-EBUILD fakeredis-2.23.5.ebuild 2348 BLAKE2B 8b9e67d78e802e8a104c54617b5ed514162e69e769b67fc1881fda27200248a19ca0846446a733e748a779787901a5b5f6a6390a87e2a2ae1c08b26b5346c8f8 SHA512 e356160b3a3dac3017b2df6a82558e8519776a1ea750b2d527602814a22758c0e782f84343b70f1830b9ee44d86df151e29a0a4c3d2a786a0adeaf7558e49cac
-EBUILD fakeredis-2.24.0.ebuild 2564 BLAKE2B dd74879438e463fa78d75063227c910ab1446e50e1766562d9a8c711717f566c16f97d818bd882f453f3287b50947bc225d659bd5200b0c23af7b0ed94fbd13f SHA512 6fb0ac9ede7473793e5c341b9fd614412ef61b64d75da53e2a656e67d000d2d505b254b4b008687871172259acd00a74f440900f31042197054ec2c047f5830a
-EBUILD fakeredis-2.24.1.ebuild 2564 BLAKE2B dd74879438e463fa78d75063227c910ab1446e50e1766562d9a8c711717f566c16f97d818bd882f453f3287b50947bc225d659bd5200b0c23af7b0ed94fbd13f SHA512 6fb0ac9ede7473793e5c341b9fd614412ef61b64d75da53e2a656e67d000d2d505b254b4b008687871172259acd00a74f440900f31042197054ec2c047f5830a
+EBUILD fakeredis-2.24.1.ebuild 2561 BLAKE2B 63536d1b0afe4339b2367a4bde8c701bce5f6936cb7eca8ef7ec2a3d034596d80d0a12518c50fef9571499aa2c7667e0d174b381e3524318af9c5017c3678cf1 SHA512 0a815811b941153b355b4511b8efead834cc77fd15753404effbc76ad003ade914a056478681d1685caafe229ad7145ce9f023f17a1783a987d2cefbd68d0c7f
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.23.5.ebuild b/dev-python/fakeredis/fakeredis-2.23.5.ebuild
deleted file mode 100644
index 79980da8bf31..000000000000
--- a/dev-python/fakeredis/fakeredis-2.23.5.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.24.0.ebuild b/dev-python/fakeredis/fakeredis-2.24.0.ebuild
deleted file mode 100644
index bc4af7542c89..000000000000
--- a/dev-python/fakeredis/fakeredis-2.24.0.ebuild
+++ /dev/null
@@ -1,97 +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
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/cunla/fakeredis-py/issues/320
-	sed -i -e '/LICENSE/d' pyproject.toml || die
-}
-
-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
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_mock "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6380
-
-	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.24.1.ebuild b/dev-python/fakeredis/fakeredis-2.24.1.ebuild
index bc4af7542c89..42e3f8bdf604 100644
--- a/dev-python/fakeredis/fakeredis-2.24.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.24.1.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/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index e6681ccbec23..91c2004f845c 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,5 +1,3 @@
-DIST flask-cors-4.0.1.gh.tar.gz 32226 BLAKE2B f6301842b20175587be43d3c1f22fb341463f25d21fcae9b6463e8c48b149ab7ddf000d5541645f217755bc43863ef060cf1e2f6e57941632db420efb1cd223e SHA512 51dd7c50d5db6a6b6985a32f08f9512603e64199bf90dd22349cd1dbff94f1706b1e26cbe7765fb6dc6310fce86ac470896b127dc83cc740436e1ae11c11f7eb
 DIST flask-cors-5.0.0.gh.tar.gz 32891 BLAKE2B 0315f37fdd10d6000c8b5613a9b8616df5db1009e23614a68e430979888ead49c20174cde0e4f1a1019b455cac868b113bf09f0c004552cc452a12e1840764d3 SHA512 36cff5f9d9a3692a794510b431ad1889931e9d09c569078ab604e4b6b0777139afb10063f851f2e64d76ae6441444ada4a04855f8578a78bb5d3aabdf346e0de
-EBUILD flask-cors-4.0.1.ebuild 907 BLAKE2B 400165b4a8edb558da721391659856575e3e6651445467a2995faedc82d5b57f4cd98c602b9298844dd196de47b0053026b878ac2e4dcf2792c64fd919552237 SHA512 8a5a8107e51268ac96d57f315970614629158de9034bb70329a0d2a841883f6f6af0dd5b80da2cc1afbd4aa6b8e6b91646ac67c001657761a38a75ed0cf43bad
-EBUILD flask-cors-5.0.0.ebuild 910 BLAKE2B 12b95a74cd931f3c0631976db3538171e22bd165c5781e3ab19dbd42869177a36bf545130d83a06e0e310cf41a91b924825e435c06f84b1d153e015368b90872 SHA512 1a0811ccff9366df3d9e14ab7446cce0f1dd878170699357390b79298d7c3259cb2724d5eee6ec98077c8b9dbd2bf912be6850d2f5f822016e59a80c104a99c3
+EBUILD flask-cors-5.0.0.ebuild 907 BLAKE2B 400165b4a8edb558da721391659856575e3e6651445467a2995faedc82d5b57f4cd98c602b9298844dd196de47b0053026b878ac2e4dcf2792c64fd919552237 SHA512 8a5a8107e51268ac96d57f315970614629158de9034bb70329a0d2a841883f6f6af0dd5b80da2cc1afbd4aa6b8e6b91646ac67c001657761a38a75ed0cf43bad
 MISC metadata.xml 679 BLAKE2B 573d2321e86038dd80d4c027b1fb8a25ce7fcf8d719153b3b0cad595b7b63c27c5d7f1cc24b81c21fdb9071b018f7922f4f8c9d017261f38b386ac3646f80a3a SHA512 c8c5f5955c87ea60bc30053916ad6373b1440da7bd1fb1011b4528143573aa026cbec484738593a7de70c33ac23014932722f281af3ec121f59fac213040123d
diff --git a/dev-python/flask-cors/flask-cors-4.0.1.ebuild b/dev-python/flask-cors/flask-cors-4.0.1.ebuild
deleted file mode 100644
index 0995ced79cb4..000000000000
--- a/dev-python/flask-cors/flask-cors-4.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/corydolphin/flask-cors.git"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/corydolphin/flask-cors/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="
-	https://github.com/corydolphin/flask-cors/
-	https://pypi.org/project/Flask-Cors/
-"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme \
-	dev-python/sphinxcontrib-httpdomain
diff --git a/dev-python/flask-cors/flask-cors-5.0.0.ebuild b/dev-python/flask-cors/flask-cors-5.0.0.ebuild
index 0486dac2f707..0995ced79cb4 100644
--- a/dev-python/flask-cors/flask-cors-5.0.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-5.0.0.ebuild
@@ -16,7 +16,7 @@ else
 		https://github.com/corydolphin/flask-cors/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 5437486c4116..e3b5b3dbb7b0 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,3 @@
-DIST python-api-core-2.19.1.gh.tar.gz 212130 BLAKE2B b68482540dfb896129d903d49623db88661652db9eef6d3bd0615746fe64bdcd1d83a3d284110cb7f617ae89ffbe47257d2db7a0fdc84c984c6321a51499d116 SHA512 0f4ffcfd2bf5458ebe942d2a601d8568026b280373538d2362379cc86200f5762eb9eb978a7f9cb5c8014d549c8e48d4acd6114ce54f90fe01f09814c720f589
 DIST python-api-core-2.19.2.gh.tar.gz 212969 BLAKE2B 6ecb63085b9108cb0755dc3bdd31d328de948ede85e2f1e62dae92bd9c12d6d90d4ef24f57a7a953567e6f9e8d105ffbde8bd99d8a42081190f95f2a48b6504c SHA512 76a890ebaaecfd4d913e4e1d3d370e81e655eb5e8192a10292a7a792f6a9287dde7dea43f27a70edcc7430f71346e52f2719393b54cfd7c4223eeba3c28d37e4
-EBUILD google-api-core-2.19.1.ebuild 1976 BLAKE2B 66d4ec8fbd035a0f4a072b2f55550a544f4b625370cd2eb263cbff503c043916962427aabff6d124fd3d02f39a3f7b65bce3d127596b0ab2e3d5bd963f582109 SHA512 5f7b600fde1a438faebf55c7b17e7c03b8e20c6067dd3875c63f3a8d0680904422c5058af472eb26492af66c9d567e53311f8673e3210ce5ba66ee84ce60bfb9
-EBUILD google-api-core-2.19.2.ebuild 1949 BLAKE2B 8bc8670d0f21412c241bfa0a73339f6d64f83f31c6e8bf2947d5726ab4a35b4af97c59e5e4de670c4d19b0bd5e0df3ac0b01e98fc38bc7564845bfc08d7ddec8 SHA512 bd8df0045557275174189a991cde0cd2f1d6bc5f5f041858e4131fee25cc5ff2051c4ac769437cefbc2a2caf846e3e13c0204a1849d119672dc8b2fdcd4e9cd9
+EBUILD google-api-core-2.19.2.ebuild 1946 BLAKE2B 2bc9751de68c1072642a7c834b7707d8456af3bb3f957eee8932576781202b49c089a5cb6902c42db23ad56680b850531fd341128bee19a71548d7c5f3754d19 SHA512 bfe5b327f67db8541b36c1ff60850654217559fee0704714dfc677e9c637e365e9c46fee8b20ed6ee034b4fbdadc6a1302c8b479b1cd44ff7b1cbe653158ad89
 MISC metadata.xml 519 BLAKE2B bf6ee9b3f0f7fe5fbfa5461aabf7872c803bd0483938da629ed6468017d82ac5b8736a52ef325374d7948a752ff1cfa6006aca2e833721f5a4a47f4adc5d8630 SHA512 d56b0312f5e5b5ba909c84af358bbfea98ea4098fbdd0ab562e0669a87a492facc05644d13fc38a196e1300f4cc1638b28cdcd10f412d753d71f8cf20a7fec62
diff --git a/dev-python/google-api-core/google-api-core-2.19.1.ebuild b/dev-python/google-api-core/google-api-core-2.19.1.ebuild
deleted file mode 100644
index c9866dd87e9b..000000000000
--- a/dev-python/google-api-core/google-api-core-2.19.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-api-core-${PV}
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-core/
-	https://pypi.org/project/google-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html
-"
-SRC_URI="
-	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/proto-plus-1.22.3[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-)
-
-python_test() {
-	rm -rf google || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.19.2.ebuild b/dev-python/google-api-core/google-api-core-2.19.2.ebuild
index 61fa5cb4fa0b..ddc45dbfe2d6 100644
--- a/dev-python/google-api-core/google-api-core-2.19.2.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.19.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index ea4b26b01c92..88754b8d2e04 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,9 +1,7 @@
-DIST google_api_python_client-2.142.0.tar.gz 11680160 BLAKE2B 660e61509969fc6d6d5235163cdede57011150f8932bb4bfccbae19ae020367a34b9ee103b5ec788bbe22580ca60ff242bf3734ce0f81cc20a64e80d57e7628d SHA512 ede409d7f46fb06aaaf3cf2c850259cc8e7e7d2b4a8469323118f2774c31f52f9a11a8fac68d3e2ea27e9425badb5ca08c2b432321d23b6b0b460dafb0e652ce
 DIST google_api_python_client-2.143.0.tar.gz 11695158 BLAKE2B bff768420c0303403268aff68059e81852da89e1a353bae23c86f17314842e17986b39d5c2410adc8991d3966b1c718e88a49a22ed0e222758928928c519077b SHA512 c977599521402fa3b63c432d8e058a4c5a2ac5cf15eadcba7d43200a2c5eb246bdd25a7fecb98ba3c2791d0d566a518d8274f9f77561d0fc7c78c7378a0b05c5
 DIST google_api_python_client-2.144.0.tar.gz 11688778 BLAKE2B 98ca8b9d389876abf16c809f72a6ed907676ae6607acc82aa4656f8c05757459a478f820db6dc364eb7484a839f402c43c50136e254e5d0501eeeba1a1274a67 SHA512 3e6a9a59408f994dd8b5fa6ef5e49b069d907006a29c6631fdc25d6f2cc885cb919387b1cc385d6ecfccab450b4a4787787e401be9b2d7d97ba455595d72d297
 DIST google_api_python_client-2.145.0.tar.gz 11714260 BLAKE2B eb672bdf74519f7dfd984412348ee0c62aa6a942acbb3182648bce2018af72ba6737924cb82c754a94c02f5b749c1bfdd07edb66bb2294b98e2b636cac7c2107 SHA512 33452e866798cd82f79e4d9a8708b4ca32a1e3118e37fbfe5b6e8b8b431167560c4175a5155499bca864fbdb59623368663e0025f71e8bd64b44e365ac889ad8
-EBUILD google-api-python-client-2.142.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
-EBUILD google-api-python-client-2.143.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
+EBUILD google-api-python-client-2.143.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
 EBUILD google-api-python-client-2.144.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
 EBUILD google-api-python-client-2.145.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild
deleted file mode 100644
index 56cf84636d29..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 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/google-api-python-client/google-api-python-client-2.143.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
index 58a0eb467bad..56cf84636d29 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 8b48f61be8db..b84c7dc51886 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,7 +1,3 @@
-DIST googleapis-common-protos-1.63.2.tar.gz 112890 BLAKE2B c6b5262435e7458721fe63fcdc9f8c6485fda27b417619f597d662624b1be13380669d5467427e3f70755f64a187b320cf5954adc307242ae937830c3774aab9 SHA512 ec987acb6ead40771d69e851ca679e7985532a39821d5a2318f9e5ccfce17b9e6f9d4339266b77cb2e55f2c0de0256c80321677d026f4f2c830bdb435aeff676
-DIST googleapis_common_protos-1.64.0.tar.gz 113350 BLAKE2B 79f578c079956926215489353c5b75542f0a44a27f41d8f36a7459357e4d425dc361cfa437d1dc5bbe3338b9ed8a70667c18fd718b962b41e6489b107fb05222 SHA512 3757083840f1a1a6645836f64be350fd0a7378c97f72ab540342a9cdc733d427179dc49a73b0a97e0ab75544ef1e4f81292b0a83e375829c6082de76a6d02fab
 DIST googleapis_common_protos-1.65.0.tar.gz 113657 BLAKE2B a74f10ce3fd1d7eb1805174157ef751ffedc6042f27c11c2e9febbc2a91de7c963fe266beb51f44445bdf6eb8a7237f86902ca670a875ea87fe24782dc8fc79d SHA512 5c62ee5ff6b6d39dc7053031a17be88300888ca3f91e8743ab11deab9b571d40371c12332dbd5bd906941e7917aca36ed28a19d7af619afd305e0649aaeab85d
-EBUILD googleapis-common-protos-1.63.2-r1.ebuild 794 BLAKE2B 909de6cf49d0db18a74297aaa1abb590f7c8e3c40820b4ac8b572cc7c6f7e773a09af5e661288ce67b8a215a00dcf6b6677889e0f983365a4631c2f714375902 SHA512 0951aa97cfca2c9ea01bb1a960330aecbe7e950ea4ecc7315e69645e5b6a304e78cd1e40097cb9fbec55134fb95f37071a5d6afb46513ba7e066e932e542fdbb
-EBUILD googleapis-common-protos-1.64.0.ebuild 766 BLAKE2B d7f199c8dbe860733e350804d4715f113d215aca5e08f9d631b6355c1f47a65a3144f1ccec84b1bccc2f4507f5cd9419a18da085f6fd7b6a129d8780bd4f7648 SHA512 1e278044b928c409135c7c48e4d2157ebc0a25e52d330e5b80f76807eebea3582a9d87d02f2d9e6e8038bfa784a763ec0cd5fd1ac7f4972547663e0923355753
-EBUILD googleapis-common-protos-1.65.0.ebuild 736 BLAKE2B 6a523d23b6d570fce97b285432757d767dcb00b4a45231c9956218734a96a4d5162c88b21771aa2f1db98971dc900733175d4f3ed1291e4dcdc48c3d506a2f8e SHA512 21cfebd5f2921d6eb3d4850cfda5a690cce22c8a1fb77c6753343ef79f71a18ec066a24daa6eb2728182f9cb7d717eacba3eeac26f62b9cc33b78f98f91966be
+EBUILD googleapis-common-protos-1.65.0.ebuild 733 BLAKE2B a6d82c9f5cde61bad31fab431bede74ca563a2f35ee164048aee2201181d16956ef90f29642ba97a3e32d8200562140cf4c84542941a62b949fc37c66b9c8448 SHA512 97f30e5ef7c71c3a4a40bdf2c36ec5be5a10fed24b4781ff29725c287059172827b585e2731c7cba8972050c6d3dafde2311f5cd25afaf86adc09f515e6a9554
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.63.2-r1.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.63.2-r1.ebuild
deleted file mode 100644
index 9489baf555a5..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.63.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-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="Python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-common-protos/
-	https://pypi.org/project/googleapis-common-protos/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.64.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.64.0.ebuild
deleted file mode 100644
index 22f6d27fa091..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.64.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-common-protos/
-	https://pypi.org/project/googleapis-common-protos/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
index 08022aeae1e8..6a256da12cd4 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 358b5a120dc3..2e32b03c1ed0 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,11 +1,5 @@
-DIST hypothesis-6.110.2.gh.tar.gz 9476926 BLAKE2B 8fb0b250e9c49f56d9b0d077db6305ab86c21eed4739605d3a45423cc0d5695be0e27cab351263f7c3526b26453aee38d6b794464052be6154b4158a776cc873 SHA512 2386f75b91e42e20babf5fc78fcc1ed22391bfa144f318074b0efdb4a1575a6db597aa3c00e756ddea24b792f49d9d6269b6aebb8f8aa8c497e98d3bf2771749
-DIST hypothesis-6.111.1.gh.tar.gz 9475914 BLAKE2B 90604318db1a47db4eea8376c943c077058f3158c6c5220aa5f60575cc85c8cf97ed2ad435c7351141939e5b6773d013cf27e4ef9ee64bea2705596b3e4fecc7 SHA512 40e73843ba4477a9bd75087b42f92b6e483beac72dc8684a3d20e90b764f2c0773479a44b6107b237bcf17d347aad45a0ecb23ec54e19da08860e1fa86e5e772
 DIST hypothesis-6.111.2.gh.tar.gz 9475843 BLAKE2B 69a436586184a205fcb6b4c053e3c5f53a0c19344b2ffbe697d1cc8bcec62815e680783287f857cc64b9e9b66415670185b38405601a09f93e4c325561e567f2 SHA512 405d0a7545d216082f5b75d8b90bf53169481a96a23f8a40685165610dffe2fa2d47397abda98a90db4d281d274a35a201fbbae191fe264cba6be5deb0709042
-DIST hypothesis-6.112.0.gh.tar.gz 9476351 BLAKE2B 1886389d51f09af3127fbeb81ff62618d67203f9ced47507a1c8fdcc90ea1331d37f6937f62f255b47b339c81f686eb1e3e4d9fd496c14565e692fec73b850bd SHA512 9210a611bb5bd02b855057d72565fca1aae72807788433a03ebdddfbe9d44fc454ecd57ebeeb2a9f2d201580929aa44d585615465bde770ccb95aaf1ca1a4239
 DIST hypothesis-6.112.1.gh.tar.gz 9476397 BLAKE2B adee46d6a4cf56bbbd8e5a91afc8236b9d311aa18efeaf6b367fc32d5ff3d679e08c5a8c500cedb50ff2cda2bab567a56f5ed564067972bc2f63bd6f5f0b88e1 SHA512 60b68f50a5d8d7ec23b2632a1a3c7d412ecedef6e58ec9e2f0450b07add9ddaa25963cd08cfa1d60741ff54cc47996da02dab1176ab25b8e7ecd3154f1b0446d
-EBUILD hypothesis-6.110.2.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
-EBUILD hypothesis-6.111.1.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
-EBUILD hypothesis-6.111.2.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
-EBUILD hypothesis-6.112.0.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
+EBUILD hypothesis-6.111.2.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
 EBUILD hypothesis-6.112.1.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.110.2.ebuild b/dev-python/hypothesis/hypothesis-6.110.2.ebuild
deleted file mode 100644
index f41c1bd0c012..000000000000
--- a/dev-python/hypothesis/hypothesis-6.110.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.111.1.ebuild b/dev-python/hypothesis/hypothesis-6.111.1.ebuild
deleted file mode 100644
index f3d89f9d71ea..000000000000
--- a/dev-python/hypothesis/hypothesis-6.111.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.111.2.ebuild b/dev-python/hypothesis/hypothesis-6.111.2.ebuild
index f3d89f9d71ea..f41c1bd0c012 100644
--- a/dev-python/hypothesis/hypothesis-6.111.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.111.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.112.0.ebuild b/dev-python/hypothesis/hypothesis-6.112.0.ebuild
deleted file mode 100644
index f3d89f9d71ea..000000000000
--- a/dev-python/hypothesis/hypothesis-6.112.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 8a64347361fc..4ad78ffc8d8a 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,5 @@
 DIST identify-2.6.0.gh.tar.gz 101732 BLAKE2B 0c6cdd8801861ac2b33c812766008d3e1a689ea09ee698441439aa2c02207f9f05983f7cbbdf1e999cdf4b34a6994a60c12249cf6722b690ae05126bc3178273 SHA512 0e7b27783fc9133d76247811e1bbd92b1c2f54c2feef6a603e725f92af44b8f595a5b39162db3b9f4cebdf2fe58587bb10f9d93a745d5cb6b507892d67c32899
+DIST identify-2.6.1.gh.tar.gz 101751 BLAKE2B 5f957409a4a819ba0922065484c824282255174619630896cd5b708912097bec1662e55eafcf4f6cadf832bb988c824623d9fc1879e76665c096cbcf01ff4097 SHA512 3d7ee7e0e75d24626b4c322eeafaf624dac87692dcb0eef082be6eb413b3dcc8566e356b83c2cd1eea95e98d55258ee5aebd06ac0c85ee385629e819a549d155
 EBUILD identify-2.6.0.ebuild 595 BLAKE2B b3a1cdd27d99a9ebcac7d8b05ac2522c59c57084408b836fda3d2640f7f6a035769de83ec231edbac148b0dadec5247a029dfe13316902f0374ecdb9d29a1518 SHA512 ffb61e68fc1cb6ac823449f8fc0ff6d5ed0f8c29cbde1d7f144670631f9ced5252f380387a0b63fd6ec70ffac37972fd7014a7c097f2fb01bca84a2df0001873
+EBUILD identify-2.6.1.ebuild 598 BLAKE2B 849a1a7bec7f25ba65accd5bc9fa8520a280d69fc9e091ebc6cac5949f7bbfe14ec25fb9ea586cc1aa0f184338a271c41fcfe7212f0a04c4838bb88e8c914081 SHA512 c09e831f9280de0d81e7e2f6f21b874ea5380ae1c7a65d59be70b5f1b19beb249f0b213357c94abbbcfd9bcb898f528c7114eb89ed709e6e0c20f90ce750bbdf
 MISC metadata.xml 395 BLAKE2B 01314d222b5ab4f906d3a0b8ba56d9ffaeb1cdb4513147a675df16f4ce1dbb6f45d8e63d36a42344c3e2278737956467abd8f71c74db232c5da7889810ee80fb SHA512 14280c2065b6f69836cbb493342c8e50c900f218a019cd074688913879e5f515388902cefcd618e8bb552af8145ae33c92a9b7caad867d66e457369fe74a187f
diff --git a/dev-python/identify/identify-2.6.1.ebuild b/dev-python/identify/identify-2.6.1.ebuild
new file mode 100644
index 000000000000..6294eec35289
--- /dev/null
+++ b/dev-python/identify/identify-2.6.1.ebuild
@@ -0,0 +1,29 @@
+# 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="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/importlib-resources/Manifest b/dev-python/importlib-resources/Manifest
index 4a0539f20814..775b0d9a19da 100644
--- a/dev-python/importlib-resources/Manifest
+++ b/dev-python/importlib-resources/Manifest
@@ -1,7 +1,5 @@
-DIST importlib_resources-6.4.3.tar.gz 42026 BLAKE2B 8a88825467bf558b4232ce4f1600ceda56b67283d93182d0144b5cabe6227bdf79e24a8fb6cef47d7cc59cc9cc293e70c7a2cd7ab1512a523f04cf167ac27cdb SHA512 23b6e8d37d2317cfe9d465f8083b6fa8826c34ec114844993556657b943ecca3b3d6e5f4ca958787d980ebd451e174b8e134f35445bdef085ca29b71c76e248e
 DIST importlib_resources-6.4.4.tar.gz 42721 BLAKE2B 4e38bba910e2de9e53297151f6fd9a839534b7aca1a98c4c053c420eba4b137b7ca60a32dce84f3ed5c558e3bfbf3f90fea48f3e6e7e8921c2961756ef96eb04 SHA512 ffdd2cbe56ae308392e9fcadbd5822b68afd5737a78b04416e84a1ca294ce33f4f0df5ff5ee4e403f43064c9bf33df3d2742809d651295b536d0036f7359580c
 DIST importlib_resources-6.4.5.tar.gz 43372 BLAKE2B 8ab9cb9f2e693de87d6d3c2696e660ae067ad00d725db542fbbd9b916cedfc8246c45285e728d352f02e4b7a56cc7d8f360f324af9a65cfdb935e7c20f753206 SHA512 e5949475a27220b101d0ba57b091a3d56a2e1092ca3102d9e260561742289ee32e2bfe17738304a72507314fc46a151f3cadcce06e71781d20bbedf7057a6366
-EBUILD importlib-resources-6.4.3.ebuild 698 BLAKE2B 83f43f91d8d1500d2101cf9e1856cb0757b6f97b076f16fd1620bf10d0f3600b7be8a4ba601649c58c21831d9cb080d0f615e40e2a7f668bd6ea34a14efbd6d2 SHA512 5a6eeb91da0e3e7780be103f5b117a9fb1d1d604d2efa826b7ae7afbba4f46fca386b500fa0c6bea10fe09a24f057b0b2735dc761b43f5bfd0d1b7e6ae4f410f
-EBUILD importlib-resources-6.4.4.ebuild 712 BLAKE2B 3bcd7a2855c860e029534d720080b34e34aa4e78bd279cc67089e9655a8f6cec8952c2ef2dbc5626134881b9ce718ebdec352276af243c905b50462515770bec SHA512 be6d7056d690fdf4f2eeed0047a7cb5f0d552a0562069a0740142212a3209f44d59a615cc245923c3afecf47255ada0b401aac0f9f715de8e1afaf0f0967deda
+EBUILD importlib-resources-6.4.4.ebuild 704 BLAKE2B cc420ea5c9d4085f7d981c867f2101092f7a60d94864c6c5acd333f0f40d8a5f4be5064ce8277f92632d4431c2cdaa5f29eff9e5dd72506908f242ac1b8d17fd SHA512 b9f7a04e718cf74f7bae8eeec20a377da8406a0b41b3266517c60e12517b75ae4e45d3e4091a99942c60d1e21cd92a69c3cf1ed42f2baa89aaf3ed452a6a0af0
 EBUILD importlib-resources-6.4.5.ebuild 712 BLAKE2B 3bcd7a2855c860e029534d720080b34e34aa4e78bd279cc67089e9655a8f6cec8952c2ef2dbc5626134881b9ce718ebdec352276af243c905b50462515770bec SHA512 be6d7056d690fdf4f2eeed0047a7cb5f0d552a0562069a0740142212a3209f44d59a615cc245923c3afecf47255ada0b401aac0f9f715de8e1afaf0f0967deda
 MISC metadata.xml 544 BLAKE2B bf09c5e67d73a3b6aa1f155da9da56861323d085eb87ec5b778e23913125c3291b497fa6b1331ec81a72f2bca9ccbfcd6e7376b25db90ff74adaa567f71c27ee SHA512 71fe2e33b069ce288df3e748adf3d45573b141995c23b4e41582af91bdf4de421d067aadfc8824776c230ea8adb76d836f94ee23ecabf95372b15f872a4a10ea
diff --git a/dev-python/importlib-resources/importlib-resources-6.4.3.ebuild b/dev-python/importlib-resources/importlib-resources-6.4.3.ebuild
deleted file mode 100644
index c17bdf317bd7..000000000000
--- a/dev-python/importlib-resources/importlib-resources-6.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# backport from py3.12
-PYTHON_COMPAT=( pypy3 python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_resources/
-	https://pypi.org/project/importlib-resources/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
-		>=dev-python/zipp-3.17[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild b/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild
index a6025831533a..5bdd31f193ae 100644
--- a/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild
+++ b/dev-python/importlib-resources/importlib-resources-6.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 60e16610490e..a9e58a1a3990 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,3 @@
-DIST jsondiff-2.2.0.gh.tar.gz 22672 BLAKE2B 64af3c3f0aa9c7c6380af30ae303c230a04ba02d9e97d25b46348134312ea53d869e74c24a1b0d72983d731dda6d74a3fee3d89df6e9a6ef083321fe9b501ec3 SHA512 a1da92a1a38047947c2ee6057c641930c1b141889f992723c250a4444871170e2b10c892595a3bce026339b1d03c91d157cdf918fb36d4b916131bee5db969e5
 DIST jsondiff-2.2.1.gh.tar.gz 22715 BLAKE2B 598d999d6d2dd9a3a6abd8b34145420b2ee9c6b5bf4a686e1c4fe605d68c3ee588efda4db0a0127a13f10e4639b43661f297e83a314ee8a0c12e9408c8dfdcbb SHA512 e10ed1f1b11b877223936586c1805cb8b8ae3f487f913f4d33030ae6e87a06a54f1f9adfb2b50485d72123f2feb6b40aa019851a6c9fd83575cc0f0b814484f7
-EBUILD jsondiff-2.2.0.ebuild 827 BLAKE2B 7eb175b25ddd85feec668edfd93ad3f639c5f795ad279700531e98c2027e76aaf9bb98e202c31272af2a91aff3a82641da842b9279dee83dd53f144ac6029d00 SHA512 08bf3da86c1f7ad683963cdfe2f9dab04cc958cd07249216061f650bd146a189275203d6d2960ead9ec14cdd1cb7a9fa2e3a929c5d639942dbc77814f76417d1
-EBUILD jsondiff-2.2.1.ebuild 830 BLAKE2B 06855c48602171ab6a48d8e40fac0615d30274401c2c284b7454307bb71dc7dc8cb0c8f7bbbe957fe3a86b6608485e0b0a3e88a2bca0978a5d5a3a1462632bea SHA512 de41c4a480a657b920151e8f60f7d9730298092596cdd7aaf9e07ae442bb5d80d497383b1096f372aa006e0a4f280176d3b885e15cc15cc9288139e0490c1758
+EBUILD jsondiff-2.2.1.ebuild 827 BLAKE2B 7eb175b25ddd85feec668edfd93ad3f639c5f795ad279700531e98c2027e76aaf9bb98e202c31272af2a91aff3a82641da842b9279dee83dd53f144ac6029d00 SHA512 08bf3da86c1f7ad683963cdfe2f9dab04cc958cd07249216061f650bd146a189275203d6d2960ead9ec14cdd1cb7a9fa2e3a929c5d639942dbc77814f76417d1
 MISC metadata.xml 561 BLAKE2B f11baa5f35a81e4fd69adde15b5a39d728e8137a112ef7c794e8d008d5de829ab5a333fcfdc2e1dd2156d91bb779db204a21c73eaad424e983c7865b33a81785 SHA512 238d5cedd70a0fd887f6007cbee0e11faf4b574b346fa91c66ee6d93e06571364fb80a0fbc13fe347f34e217e7589f5b61984c5ab0ead465d5e725d1792af4c5
diff --git a/dev-python/jsondiff/jsondiff-2.2.0.ebuild b/dev-python/jsondiff/jsondiff-2.2.0.ebuild
deleted file mode 100644
index 5cad8ebeaf5f..000000000000
--- a/dev-python/jsondiff/jsondiff-2.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="
-	https://github.com/xlwings/jsondiff/
-	https://pypi.org/project/jsondiff/
-"
-SRC_URI="
-	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/jsondiff/jsondiff-2.2.1.ebuild b/dev-python/jsondiff/jsondiff-2.2.1.ebuild
index 1f6ddda4fc90..5cad8ebeaf5f 100644
--- a/dev-python/jsondiff/jsondiff-2.2.1.ebuild
+++ b/dev-python/jsondiff/jsondiff-2.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 2e52aa7ff2f0..a6dc015316ef 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab-4.2.4.tar.gz 21506914 BLAKE2B b130f91807c96d57d01127a37dcac1589422ef36023e9b02a32ade9c2ceedf128fce49d1a11dfbb5836dd5f40a0828e32f625cb3d99eb0098785b5be6b56eeba SHA512 2327c7d7b63185c9e1a90acfcac4b31224835601ed8e0bb545077e0c68f6cbb612af884fef288b7e28245b83a035542590cbd721b0f9e44af27bb4aa8a00acab
 DIST jupyterlab-4.2.5.tar.gz 21508698 BLAKE2B 9222972e40e60549360d80221b97806e47b70592ffa9a63b3cb030e4b4ad061a8f8eadf295d76ae0302efb3bbf854cde9f5dfcacb6df3c6ad1994bf6ab66d1cc SHA512 7c5c3aab1bf86da0e49742630ece8a311ec351be99bfce3e35b5e92e06e858296e882a47f7a1abe9ab1c63cc92062f21d557f4f6237846a3c8377fc6288bf298
-EBUILD jupyterlab-4.2.4.ebuild 2760 BLAKE2B e5f0a51d2c22bd4feece54cefe493e5d2dee0de04f768e18c056f35009abdfa01b0f1d117f4d2a5620a8e64e7238342f8bbb59f56e42429cef8d12dd6e8dbfef SHA512 b91b9d7d4fc1e19a7a2b28f9cc34f1de3a533771ef51bf396fc9134d6e6002282f75a1e6d0343558becc8867a33c797e3f92d1317de34fa5008e623d17ba54b8
-EBUILD jupyterlab-4.2.5.ebuild 2765 BLAKE2B 18508727647b6c8a027dfcbe6f4930e17d466a5e300093a58a05e571feb4b2b5b35a0ee1e42bdd5793ff7e81a1dfc74436493dbe8417279092c4a7fadce009bb SHA512 1ad2ee34bab187e5f6ae22b0032456a490ad7f22def66af2a2c50f890688921917a0e712a5063112203d35fcd06ea38f71b8b339045f7d4a5131ed6d1b526520
+EBUILD jupyterlab-4.2.5.ebuild 2760 BLAKE2B e5f0a51d2c22bd4feece54cefe493e5d2dee0de04f768e18c056f35009abdfa01b0f1d117f4d2a5620a8e64e7238342f8bbb59f56e42429cef8d12dd6e8dbfef SHA512 b91b9d7d4fc1e19a7a2b28f9cc34f1de3a533771ef51bf396fc9134d6e6002282f75a1e6d0343558becc8867a33c797e3f92d1317de34fa5008e623d17ba54b8
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.4.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.4.ebuild
deleted file mode 100644
index 81ef015903dd..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.2.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
index 70f94aa414ed..81ef015903dd 100644
--- a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth1/Manifest b/dev-python/keystoneauth1/Manifest
index c45c3158072a..7ed64d9e29fc 100644
--- a/dev-python/keystoneauth1/Manifest
+++ b/dev-python/keystoneauth1/Manifest
@@ -1,5 +1,3 @@
-DIST keystoneauth1-5.7.0.tar.gz 275942 BLAKE2B 71e94ed879cb79b65ea19cb06718c10268979a4f271e04314b24db648eccf3b0003826e71942854360d3df7563c893ee73590a826337fe1c0aafb67245f58f2e SHA512 529a831b6ec51e780fae09d6368d32eabfc843d019a16101c66a6cf2b8ed6b246e1d9e8def5ed11154115b460e806f29a47cb419e1c72da43b7348480843255b
 DIST keystoneauth1-5.8.0.tar.gz 278617 BLAKE2B 93437140316d1f353c42f3e8face97d9510c4a795f5c5c7c29b7dbd7c66887a819d71a66f35ebbda3851174cc9c738f53d8edc35a940e4c06a0b4cec19db36d8 SHA512 a427c9a6339cce57e53b78ee3e33276a87753e4cee44fe5dfbc85c7d54bc95bbc1e4536a26c8d1be1ef5a392e9095d529fd64df0ce61f1a4a4c0ba8078b2cddd
-EBUILD keystoneauth1-5.7.0.ebuild 1835 BLAKE2B ca29234702a3b07f03b04cdecf14b73ee01e66f50b3cef7cc58b909eb5c2c0e4654600bb0a52b2637a8a743e349c6ae983db6a5f72ff6b1556ee1e9849d4819d SHA512 9f98752a273b794d162620b0830d9ce6b4ad5c40685c93a9244ed8ea03d1f015e65a10c8c0dd1db8bed3b3259308ef20b64762d13f76dc0725c611487f21207b
-EBUILD keystoneauth1-5.8.0.ebuild 1838 BLAKE2B 7a5f6f131a39aa35317579afe27e504915a278621f4eb3ca201f68aba9965ca56c7eda721e1bf39f571ed1183caba281f733a8dca5d4e8ff552a03ecae2afc6d SHA512 fd03448b9e3bdb0ad54383ffe657d73f21f5f8a001fb33089715be01453f642488665bd8d63ad747c5d93821c5b1b946c093d6b6f4672fb2528ee08112b3c66c
+EBUILD keystoneauth1-5.8.0.ebuild 1835 BLAKE2B ca29234702a3b07f03b04cdecf14b73ee01e66f50b3cef7cc58b909eb5c2c0e4654600bb0a52b2637a8a743e349c6ae983db6a5f72ff6b1556ee1e9849d4819d SHA512 9f98752a273b794d162620b0830d9ce6b4ad5c40685c93a9244ed8ea03d1f015e65a10c8c0dd1db8bed3b3259308ef20b64762d13f76dc0725c611487f21207b
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.7.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.7.0.ebuild
deleted file mode 100644
index 5957f0726301..000000000000
--- a/dev-python/keystoneauth1/keystoneauth1-5.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="
-	https://opendev.org/openstack/keystoneauth/
-	https://github.com/openstack/keystoneauth/
-	https://pypi.org/project/keystoneauth1/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fragile to test runner name
-	keystoneauth1/tests/unit/test_session.py::SessionTests::test_user_agent
-	# broken betamax
-	keystoneauth1/tests/unit/test_betamax_fixture.py::TestBetamaxFixture::test_keystoneauth_betamax_fixture
-)
-
-EPYTEST_IGNORE=(
-	# require hacking
-	keystoneauth1/tests/unit/test_hacking_checks.py
-)
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild
index 825474f59123..5957f0726301 100644
--- a/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild
+++ b/dev-python/keystoneauth1/keystoneauth1-5.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index 8b83efafac8a..1260a9ccf505 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -1,8 +1,4 @@
 AUX leechcorepyc-2.16.9-respect-CC.patch 1306 BLAKE2B a86c60aa1e4e6e09b5de727afa7a0e686b0dae5a50f56243402a21f6f1671ddaa5617e69e1e4155e4804bc97809d6cc024fcdcce13cdc199d1048f9b718af263 SHA512 d25f5b09fcf5360b028ef6a7e712eb990cfd9cb1074f2bd4b3164b0bfd9f3d976912f226c85e0b684872abd7adc0889ec28453667b34d1f815018ec53e7c7a57
-DIST leechcorepyc-2.17.4.tar.gz 180273 BLAKE2B 09c6d8b4bba14d645c1718f6fd5c32d08715e2f8bc0b065ff08823bb95d2aad025452388f4d26b2b61c703a8a796d1b8999f1461b1a8ae5c7479e60e204a8489 SHA512 6948f09d53e3d2a47611f7d414c06712850427aecd43035c571daad61bdff2cd5f0c9799b7bf74b042ad66d7686258210a3bc7bb29af0b632025fbf8ca458cb0
-DIST leechcorepyc-2.18.0.tar.gz 234411 BLAKE2B ebf2dba7cc20bdf8fdcac65d889fe3fab0e5c5b11509468f2733ef6a20bc0ccf6e0fc6788ac6ec62101a996ae983b3dbbab3afde1573b76d84ee4e0bd224e749 SHA512 c85fbc2eb2a62929f232f0657944406cc3918320a11fb3824fbe60889ff3c61796a99c39d7083b895868a0bbf2d2dacc473db59d9e4c183aeae3528bb03a0b4f
 DIST leechcorepyc-2.18.7.tar.gz 234929 BLAKE2B 5e785ec50975fdf3f943a18a09bdae6308e8426691ee5f1eb11d0db9534126b39d009946b8ff2f02783d6e97e2d45e2cf9cddd1cc7882a1569412dc50d08694f SHA512 8938ff389aed0b49df4c0f3c9f00838a418784dd21d019f6c821fc4d1561414d17ac4f59702cb54f4e1584f39d48bcd3bbd8247e8eed2bd38ec6941524948ffa
-EBUILD leechcorepyc-2.17.4.ebuild 944 BLAKE2B 7b90074a11ab9ba15f240ce0628db0c96ec1a13ca5317d94cec83a5bb560340ebe2fa0ad84b88c40cd7874074b6aa3642d1cd23a1160104f8404296b6d35f3d2 SHA512 828a17ce662b17821f6611a739107381c62869a706e0154cf377e76ae713aa09a55b7ae8428e483eed973ef9129b5250e2b048131a2980d78d7399d962dc55d6
-EBUILD leechcorepyc-2.18.0.ebuild 944 BLAKE2B 7b90074a11ab9ba15f240ce0628db0c96ec1a13ca5317d94cec83a5bb560340ebe2fa0ad84b88c40cd7874074b6aa3642d1cd23a1160104f8404296b6d35f3d2 SHA512 828a17ce662b17821f6611a739107381c62869a706e0154cf377e76ae713aa09a55b7ae8428e483eed973ef9129b5250e2b048131a2980d78d7399d962dc55d6
-EBUILD leechcorepyc-2.18.7.ebuild 946 BLAKE2B 6347b2b0bf5e3ca57220cab76e66147abbaf929fa77c2d9b4865caff8033701bbbf6dfb3a5c13e080883cff4700d07724b2f6bb2254b527f829e5ea282e2fb41 SHA512 736cdf984e7a568ff49e2ec7568bf2f0f38e024016e65f10334e83b015bd7db9635726b51e2bb29f503f89ba2546779379b1507787fb9dc90ab45b5a6b3f2513
+EBUILD leechcorepyc-2.18.7.ebuild 944 BLAKE2B 7b90074a11ab9ba15f240ce0628db0c96ec1a13ca5317d94cec83a5bb560340ebe2fa0ad84b88c40cd7874074b6aa3642d1cd23a1160104f8404296b6d35f3d2 SHA512 828a17ce662b17821f6611a739107381c62869a706e0154cf377e76ae713aa09a55b7ae8428e483eed973ef9129b5250e2b048131a2980d78d7399d962dc55d6
 MISC metadata.xml 683 BLAKE2B e85f13b83acf28fc6d59876fad2576afe741065c754680650adcb7acd1068410469de969ab4ee28ef5d9e7ff448c615293cf3f4713b4211c22dbb1b13d7f5947 SHA512 cff010f9f6dafcb3379a0de5ae0c98b974e605cf4e3a0131657832da2f0609e62cf07d3da84327b8c1272eb4cad64218e6c3f0231ec2402b3801e2453a10e76c
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.17.4.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.17.4.ebuild
deleted file mode 100644
index 2c256d774426..000000000000
--- a/dev-python/leechcorepyc/leechcorepyc-2.17.4.ebuild
+++ /dev/null
@@ -1,41 +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 pypi
-
-DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library"
-HOMEPAGE="https://github.com/ufrisk/LeechCore"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# leechcorepyc ships with a bundled version of the LeechCore library. So we
-# don't depend on the library here. But we must be aware this module doesn't
-# use the system library.
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.16.9-respect-CC.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid redefining _FORTIFY_SOURCE. See #893824, #906715.
-	sed -i -e 's/ -D_FORTIFY_SOURCE=2 / /g' leechcore/Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-
-	distutils-r1_src_configure
-}
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.18.0.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.18.0.ebuild
deleted file mode 100644
index 2c256d774426..000000000000
--- a/dev-python/leechcorepyc/leechcorepyc-2.18.0.ebuild
+++ /dev/null
@@ -1,41 +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 pypi
-
-DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library"
-HOMEPAGE="https://github.com/ufrisk/LeechCore"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# leechcorepyc ships with a bundled version of the LeechCore library. So we
-# don't depend on the library here. But we must be aware this module doesn't
-# use the system library.
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.16.9-respect-CC.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid redefining _FORTIFY_SOURCE. See #893824, #906715.
-	sed -i -e 's/ -D_FORTIFY_SOURCE=2 / /g' leechcore/Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-
-	distutils-r1_src_configure
-}
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild
index 594aa6daeab7..2c256d774426 100644
--- a/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild
+++ b/dev-python/leechcorepyc/leechcorepyc-2.18.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ufrisk/LeechCore"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # leechcorepyc ships with a bundled version of the LeechCore library. So we
 # don't depend on the library here. But we must be aware this module doesn't
diff --git a/dev-python/lxml-html-clean/Manifest b/dev-python/lxml-html-clean/Manifest
index 095002b141f2..cbace0ff7be6 100644
--- a/dev-python/lxml-html-clean/Manifest
+++ b/dev-python/lxml-html-clean/Manifest
@@ -1,5 +1,3 @@
-DIST lxml_html_clean-0.2.0.tar.gz 15438 BLAKE2B 570ac3e0a5861692a439fc2a52ee34e40c659ee3c6bf1b990b1e9dc47f25feedd654cf8f4f1f4c27a49e00c6a8be7940492405d5ad61920c29c1c464609848f6 SHA512 67908512294932454ae461d6371c5dd525e2c21b67b6fd437f4a4ecda7bbb6c617526f9541d4ad0fe624e3f8506ed8a391cd766167f2054a685d96ef18b7e53f
 DIST lxml_html_clean-0.2.2.tar.gz 19619 BLAKE2B 4317ba3e3ae05603f5e2e53561ea7bf2c2d291ac7c87eb2d4afeaca89ccb13b63dd4a85c9a9e4d5feb3bc6773d27618d2057983b933b3b17e26c319003b3bb7c SHA512 c40aac3453e822c5659252a271071b1e3b61622ce3af78e27763c771147a22a9894ef2512ca38f1d0e67be1d21ce5b860641a2a067e94837cfdcb318610720eb
-EBUILD lxml-html-clean-0.2.0.ebuild 487 BLAKE2B 0774c4cd3806346d4ba81b9a5c548688e5a97f8624b46752b8292098960f06ee133a8fe160b32fb2d9f27699ba3d246a1d9b129815ffccd767b468791a1de311 SHA512 8d1738b637a455b68571bada0ee1021611db5ce9c4f29431d401a93331d77562d1a30d88defe3e13ac308fedb0b29e95ce810695c0588a8574d783157182d447
-EBUILD lxml-html-clean-0.2.2.ebuild 652 BLAKE2B 0e93fef3a394ba9c0c5797027128f77461dfe86d9076cea68ab1fc3022ee0ff6365d968b5b1cb17b85415d59a1bbc68a2e13ae6335b533abd9b33bef45cfd103 SHA512 d25133555c7d5d2e7f24fc000c11e7a324e989e2c9e910de1dc6480b34e11246511cde1fa51c93e527b0d53adc30fd19bea7b5dea9155e4bfa466a2d2c1bdfd8
+EBUILD lxml-html-clean-0.2.2.ebuild 651 BLAKE2B bca7d6c561e4f447ee124a3178e6e14d2b3df48f4a8bf103ba6ee652b5222c648e3fa23bdfb4811d3ef47c06741aa31d55e4a7974a778d99639adc7b91ffb40d SHA512 0b2f4634fa3e54d16df0ca698a31f89b4712a78a6495ddabc45f5d126fd1cdeb54db6f37f3bb601d3efa601c675bddf6b7399a11709a495fd757b1c277b578c2
 MISC metadata.xml 497 BLAKE2B 18a62ece379f7aebe63687b148c878a6d3990570c66e31102ecc727fed76ab92df6ae0bf5191a7d7621106ea2aeb0431f2c5c09f5cd70442c8e869a24c77b375 SHA512 95831be01d43c01060d05d6a3bd7c92dea28c2d1d78c7a4e98a8de50cebb0b0779afec4732e2a9c355c9cf4b693e29624c95996fce27a225b285c3b94e3350ec
diff --git a/dev-python/lxml-html-clean/lxml-html-clean-0.2.0.ebuild b/dev-python/lxml-html-clean/lxml-html-clean-0.2.0.ebuild
deleted file mode 100644
index af89140a5b4d..000000000000
--- a/dev-python/lxml-html-clean/lxml-html-clean-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 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="Separate project for HTML cleaning functionalities copied from lxml.html.clean"
-HOMEPAGE="
-	https://pypi.org/project/lxml-html-clean/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-RDEPEND="
-	>=dev-python/lxml-5.2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild b/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild
index 8523f79facae..a6ee89769a14 100644
--- a/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild
+++ b/dev-python/lxml-html-clean/lxml-html-clean-0.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="
 	>=dev-python/lxml-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 1514e65c0e27..e3f0f7e5e301 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -3,5 +3,5 @@ AUX lxml-5.3.0-pypy.patch 6909 BLAKE2B 47c57123a140681037900141c54cc47ea95e0a45e
 DIST lxml-5.2.2.gh.tar.gz 950650 BLAKE2B d9e3bd96f386a808eca58ffa9a6b5a79e43102b7161fac9b97905de2bd22d21feaddb093e27463f597ef5378d754011c2999a38953e6288595b8dd171976688b SHA512 20b87a2d6e7ac82b6979d6fd18ecd5c224fec6eeee6b69d47a5bf2947ce53e6a517d1b86ab68836a5974f78ce86551ddc2317c1a7255932b418b98dc64d59376
 DIST lxml-5.3.0.gh.tar.gz 951199 BLAKE2B 8317179c524856593b323f665c288ddddd8af7e716e1ddf1222a857c8466cfc62a6c20b21744ca418f809a3c8492216c5c9c38cfa62f2e7d51daea7343b6810b SHA512 514477bf4c865541233d73f20de816b51d265dbd75c56a0d13779e14527c73e85ca890718d06c08728da228d410459016e9cb8abdad4d03b44a81a04a198fb54
 EBUILD lxml-5.2.2.ebuild 2975 BLAKE2B 31b5f53c85c7192b316f56634cd08fe4be0ce2c59b269b9399a73371f577e84262184e5dc5596bffd95f0b8fca21955ace0e06cc8eccecee48faf7a599bf3422 SHA512 ccd45aa409aa5f43be0c5bf13ba44f8d5985c2b42a34dde1289a5e30fb3ef4781cc61b36eab949d890929a2072e902eaacef79bd1fb71eacc1f94db379e5183f
-EBUILD lxml-5.3.0.ebuild 3060 BLAKE2B 59ebcfc3913eccdbfa4baccfc8f0da1d0bb826b9a8f4a0ed4ae15d45f141e821cc30ed7da6978323d88313a2099dc67fc3a6ffe4504f2e575c4f2747b8d3f648 SHA512 de0046c9be70e01b4c04a7a15dc3047a4e165cf5b64964b3867501f34007402dd00c67772b4de6b3816589f52f031abd44b0af773a34d07913c7fbf39aa31fa7
+EBUILD lxml-5.3.0.ebuild 3053 BLAKE2B 88563fd7d4d95b8dd75977b32da3fad190eb65ddef16c6198c4cea93f0157127cafbdfb750c1a864a451eeb793c4d1a21a37a81a9995921d34651e9ec8ac5a8d SHA512 6b89a8fbfe175289339e19bba566b8b68bdaae7650c257dc32b7ac113e26c657f8a7dcdbe3ddba23ae5d1409a0a7ce80350e43dae05d1b8f6222fccbd80944d0
 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e
diff --git a/dev-python/lxml/lxml-5.3.0.ebuild b/dev-python/lxml/lxml-5.3.0.ebuild
index 625afcf5f8d9..ddee48c6bdaa 100644
--- a/dev-python/lxml/lxml-5.3.0.ebuild
+++ b/dev-python/lxml/lxml-5.3.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~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/mypy/Manifest b/dev-python/mypy/Manifest
index 04e745bd270b..628d03416ece 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,3 @@
-DIST mypy-1.11.1.gh.tar.gz 3122001 BLAKE2B 6b4db9a363190177b96ea807538f1582071b213eae816ff55723c22de098e7ff2745e433a8a174fe3ebb6a9ed66f8ac75917883dfa027bdd7bca750a7517478e SHA512 8baa916ffe7e37c54c6dac98241441cc615ea8f847ebe3d12f41912d4a596ca47068d4fb0460e3bfc4b020ad7d2580814422b9dc3a22830c9031cec4111e3aab
 DIST mypy-1.11.2.gh.tar.gz 3122502 BLAKE2B 228127662f4c607aacf3ee37410d0fa039a225fdbf2fec27eefab4aaabf4b68fa33499bb978aa5f06e24b45b525ce524decfa84f4d7d6bb7961724db92a4589b SHA512 c25584db08adcf7693944e5a6a41743101e80a0ff03f36f0353a07674ad4e2d63dbd4ff3fa0e307c19d63bc5aac9f7523340bd5a7cb3661642f3fb33759aafd0
-EBUILD mypy-1.11.1.ebuild 3905 BLAKE2B 1150897e24c51af84c5f7af491ce109393090b835f78936aba7c98c77d513b550520c6a4e3fdde6161d34fa504c76e797792c07c8d41637bbf9e270ea337e13f SHA512 18b4170b35653647092c8bee866d201fe53743b2681651d422316258ec36ded52353001beabc464809d4a5716a1fbba6d91d9c8164733a4b57f325f55db7fe29
-EBUILD mypy-1.11.2.ebuild 3909 BLAKE2B 35f768540345e569c38fde1cd6f8bc463a36fb493757e8769135d9bc87f86f67c35fc000b41cff7d73da31c790831a99361d877d54f03aa7e944fa2f23c5347b SHA512 1b75547b7461cfcb885708ebbf564de37c938d12acbd185f816180da91da9e33fd947e3f2db789e0658dace34997e83d20a8b17ffb25e3f2a3673e426a701424
+EBUILD mypy-1.11.2.ebuild 3905 BLAKE2B 1150897e24c51af84c5f7af491ce109393090b835f78936aba7c98c77d513b550520c6a4e3fdde6161d34fa504c76e797792c07c8d41637bbf9e270ea337e13f SHA512 18b4170b35653647092c8bee866d201fe53743b2681651d422316258ec36ded52353001beabc464809d4a5716a1fbba6d91d9c8164733a4b57f325f55db7fe29
 MISC metadata.xml 661 BLAKE2B df57cc2dfde5b112f8c26b51ca5cc9e7727d318ee274ea7e1abf448819daf0307f471aeb7c32b19f20e87ce1ccffd47a5529415003765c275523e1b5236f3bb1 SHA512 eddd19c4b0b5211f73f9619f388a799ced108b62bb43d852ed2d01d0b1717e7b9ef118d34b9d61db543c7b47080fb8058c3d35f7359cc456069636f357e080c9
diff --git a/dev-python/mypy/mypy-1.11.1.ebuild b/dev-python/mypy/mypy-1.11.1.ebuild
deleted file mode 100644
index 906b969de108..000000000000
--- a/dev-python/mypy/mypy-1.11.1.ebuild
+++ /dev/null
@@ -1,126 +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..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="
-	https://www.mypy-lang.org/
-	https://github.com/python/mypy/
-	https://pypi.org/project/mypy/
-"
-SRC_URI="
-	https://github.com/python/mypy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
-IUSE="+native-extensions"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	native-extensions? (
-		${RDEPEND}
-		dev-python/types-psutil[${PYTHON_USEDEP}]
-		dev-python/types-setuptools[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/filelock-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-# frustratingly, mypyc produces non-deterministic output. If ccache is enabled it will be a waste of time,
-# but simultaneously it might trash your system and fill up the cache with a giant wave of non-reproducible
-# test files (https://github.com/mypyc/mypyc/issues/1014)
-export CCACHE_DISABLE=1
-
-python_compile() {
-	local -x MYPY_USE_MYPYC=$(usex native-extensions 1 0)
-	case ${EPYTHON} in
-		python3.13)
-			# https://github.com/mypyc/mypyc/issues/1056
-			MYPY_USE_MYPYC=0
-			;;
-	esac
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the majority of them require Internet (via pip)
-		mypy/test/testpep561.py
-		# known broken with assertions enabled
-		# https://github.com/python/mypy/issues/16043
-		mypyc/test/test_run.py::TestRun::run-i64.test::testI64GlueMethodsAndInheritance
-		mypyc/test/test_run.py::TestRun::run-floats.test::testFloatOps
-		# these assume that types-docutils are not installed
-		mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testIgnoreImportIfNoPython3StubAvailable
-		mypy/test/testpythoneval.py::PythonEvaluationSuite::pythoneval.test::testNoPython3StubAvailable
-		# TODO
-		mypy/test/meta/test_parse_data.py
-		mypy/test/meta/test_update_data.py
-		mypy/test/teststubtest.py::StubtestUnit::test_runtime_typing_objects
-	)
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# more assertions, sigh
-				mypyc/test/test_run.py::TestRun::run-bools.test::testBoolOps
-				mypyc/test/test_run.py::TestRun::run-i64.test::testI64BasicOps
-				mypyc/test/test_run.py::TestRun::run-i64.test::testI64DefaultArgValues
-				mypyc/test/test_run.py::TestRun::run-i64.test::testI64ErrorValuesAndUndefined
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/mypyc/mypyc/issues/1056
-				mypyc/test
-				# requires typeshed update
-				mypy/test/teststubtest.py::StubtestUnit::test_type_alias
-			)
-			;;
-	esac
-
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-
-	# The tests depend on having in-source compiled extensions if you want to
-	# test those compiled extensions. Various crucial test dependencies aren't
-	# installed. Even pyproject.toml is needed because that's where pytest args
-	# are in. Hack them into the build directory and delete them afterwards.
-	# See: https://github.com/python/mypy/issues/16143
-	local -x MYPY_TEST_PREFIX="${S}"
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	cp -r "${S}"/{conftest.py,pyproject.toml} . || die
-
-	local failed=
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest || failed=1
-
-	rm conftest.py pyproject.toml || die
-
-	[[ ${failed} ]] && die "epytest failed with ${EPYTHON}"
-}
diff --git a/dev-python/mypy/mypy-1.11.2.ebuild b/dev-python/mypy/mypy-1.11.2.ebuild
index 81a7e950a754..906b969de108 100644
--- a/dev-python/mypy/mypy-1.11.2.ebuild
+++ b/dev-python/mypy/mypy-1.11.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="+native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index e0f1363439e5..d1279761f242 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,5 +1,3 @@
-DIST notebook-7.2.1.tar.gz 4946671 BLAKE2B 2f78c497b1527c29a911fd0a057df41f3e522e426e3eae940d9adea9f1df982b14c5bb61210357dfc271df51d2534f97408790bffb4e02ff2f12b33769f9836e SHA512 e11415139a21a7dd8692673c2011d11621881cd4b99f69de5f32c23161734b1620560f57654b2e57177cb3ba01152bb76e0c9f79c2f7924b0d8424c21c219677
 DIST notebook-7.2.2.tar.gz 4948876 BLAKE2B 2f145ee832e9eff647f7c736d116cbf684ae63948d8e2e1da2a1d8f2d1d3df23d198719bde9f8a705eb5b77b62dbd654e16ac4de658fbd4a9a809e37d3add8e4 SHA512 b18348e898f6135bea72e759a8137bf32f6ea79619388bd8b3627bd497746a233de69e1b7865bec473a7c49d65f22bc5755afbf79eeb1b4dbb7e0e3e8afe8e7f
-EBUILD notebook-7.2.1.ebuild 1651 BLAKE2B 2752d2d5673516f14ce80c8db1484d89dafd4d4d851474c194c8a0ab26a72993e39d9b8e86ffe67d26767d68121adfd16fd8a89e29afa6129ce75237d3578d29 SHA512 59c2f354e1d47a558aaf4e7edee56badaa9526636ef810bec2df4fa3284d39490010f6f29a76a0dcd81c801347f1e61486fc7053bb4f232a772d553ee02005a2
-EBUILD notebook-7.2.2.ebuild 1656 BLAKE2B f871f5e3b481ceb24affc9807b3327629fdf7fc8a30cc260f59cf8abd82e07964cb53cd1c34d6ac0e00d66120db42ae46100925632378f764212524739b41819 SHA512 75bad18f6a8894fb7fcf0799192278006e118e620f5bc8824fa69c4c8ba79731cab0dddf870e2b97cd81045da638c75474db606ca7ba4a6869cd41306143473c
+EBUILD notebook-7.2.2.ebuild 1651 BLAKE2B 2752d2d5673516f14ce80c8db1484d89dafd4d4d851474c194c8a0ab26a72993e39d9b8e86ffe67d26767d68121adfd16fd8a89e29afa6129ce75237d3578d29 SHA512 59c2f354e1d47a558aaf4e7edee56badaa9526636ef810bec2df4fa3284d39490010f6f29a76a0dcd81c801347f1e61486fc7053bb4f232a772d553ee02005a2
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-7.2.1.ebuild b/dev-python/notebook/notebook-7.2.1.ebuild
deleted file mode 100644
index bd0953b1d6a0..000000000000
--- a/dev-python/notebook/notebook-7.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.2.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-7.2.2.ebuild b/dev-python/notebook/notebook-7.2.2.ebuild
index 49097b1c08f3..bd0953b1d6a0 100644
--- a/dev-python/notebook/notebook-7.2.2.ebuild
+++ b/dev-python/notebook/notebook-7.2.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 41b37eab61dc..05aa4c8ecb37 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,6 +1,4 @@
 AUX oslo-config-9.6.0-py312.patch 1745 BLAKE2B e9a9317c9f5943019029b437912bd8fcfa8f3531c69d43cf9202e87a4e8b26a605426c2ac41c041a64efed669fbe898384ceb7670bbccaec607aba9ea386ccfc SHA512 89bb7225a394fc6d965921413bc9fed882df9a9616a9f98c762433f00e4301df339da0bc18107bbe8f0a7f54a998c82e9651d451d9cb5547b4d8c7ef781cf3ea
-DIST oslo.config-9.5.0.tar.gz 161655 BLAKE2B 7844729658ddd13ff89b4c14983cfeeb3f6352f99a190058bd924592d9183459ea2da5caead7a77ed6c4a4e395aac2dd53f56847d81ce911ce76a04fa69f5b7d SHA512 517bb9fe416451eb791087216facd8643d77affb738aa2623817302dfc9dbd242d1aa2ba8c542fee437f91b2049129fa097fe37fec8c6a28e0092fc4d64c0c4f
 DIST oslo.config-9.6.0.tar.gz 164859 BLAKE2B 251e75d3ed919f2fce1efcd3aa5695da6e7911972ac89065813ef0c5b2b96fc02c436362875bf965b70e149d4436080ab23092f8f17568324e30eec7befe25cb SHA512 ebf31035bdf6f4ac8a9ce6bef14ca52fcad4418696520f0c199058211dbaa37723273a7c07eded03b139426392d7df6b192381af23e2324a92632029b1031292
-EBUILD oslo-config-9.5.0.ebuild 1519 BLAKE2B 6dacd9508a5f491fee75c647b235f832316f8b608d1208769a034e54133125959c3f9ea77b4bd1a1359ead30a5e17c4135dc208bfc2ffb1b236d166fffa5b490 SHA512 0830f035e382525edfa1ab10684c50e487be80964672d51bb0da3833c2c86398bf9137f21e49304445a1984085d6d8590b0f8a08e4430fabae6672f9744d5b74
-EBUILD oslo-config-9.6.0.ebuild 1640 BLAKE2B 084bed4c4292172d42dd54ac9d3dcb41a1c9903107fe7683a4b388c31633d1f6ffa0af6d1027a039aee2119153379b016431934d6ee4b6adc00681616faf5462 SHA512 988a7ee9c283f031f3ffac16a6f55577c242b3746642be333c6f248fc4de509dbde75c8f5039435f026f2401ec7a3d28ccdbf544606a0e7e9d88e7398ed7ea6e
+EBUILD oslo-config-9.6.0.ebuild 1637 BLAKE2B f18ebb895d586e61d04fae14a892194f5875c4c9c3e22ada4430031b097e2c4ad4d93962d963c1096b1bda99850790fd1fb1643ac9fe8c1a106b162de0fca6ef SHA512 8d9c7419979c114f1bcc23da638118df0acb5ccd363fd9fc7f2597a4e7d9f5be116ea34bedbc593da2961f587cb8b47d41c34cde134f6f95175310860e5555f4
 MISC metadata.xml 759 BLAKE2B 88d0bbdc03286429f96554d184f664fbbdb4e067ed137f95a96a573c09b4573de90e50b2d5875d627c8b9ed03a0aec7233bdc8684b721e16085157480568c330 SHA512 a29b5a534042e949f780cfb000bd9ce9cde81ae1c5e6b429bd7854598a2d0f0c8b5358dc645135ba9016065460ff5b858e48e02cdbd12ade2b1fea9d0b407410
diff --git a/dev-python/oslo-config/oslo-config-9.5.0.ebuild b/dev-python/oslo-config/oslo-config-9.5.0.ebuild
deleted file mode 100644
index 347ed61767a7..000000000000
--- a/dev-python/oslo-config/oslo-config-9.5.0.ebuild
+++ /dev/null
@@ -1,58 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.6.0.ebuild b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
index 764961e742d4..08a6668af8c9 100644
--- a/dev-python/oslo-config/oslo-config-9.6.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/paginate/Manifest b/dev-python/paginate/Manifest
index fe6c3477b79c..b140bf1122cd 100644
--- a/dev-python/paginate/Manifest
+++ b/dev-python/paginate/Manifest
@@ -1,5 +1,3 @@
-DIST paginate-0.5.6.gh.tar.gz 15567 BLAKE2B c5b60ad43c61a918c618668b345cae82e5e61516aa73130339830db8b8d1d49d271ed24bf9379c570ef8ae9de0844ff8e088820c7e128e1e6e77a03427c06596 SHA512 64d7d1a9952dc8ae5894113c381a9cdca5395477091d794774ed770f1e1dfb6a5d88a7bd07cc4fca0c0c8f708656261f3160b315af6f86ecc5b7f46e1d639150
 DIST paginate-0.5.7.gh.tar.gz 16751 BLAKE2B bc109607876b214572707cbfda25e35b57c80fc6947838ff31feab9299f3a51ad91df44dc5b5040583084a64609cb3156c9c344906f3b719cf55832a2bbe348d SHA512 f0e1957ff7b9177f052ae985e103b93acd55c9390bc06479926ccdc288343720214a02d2de46700caceb07d934d33baabdc364fc8cbd997a29fb433383892405
-EBUILD paginate-0.5.6.ebuild 941 BLAKE2B 8d5795b3133eea8fa92511e9a051bedcb1f58d6783976686c32a5a10fe99af3a14926f9007c131c9338fa709bdb9afbdca1d0173fefd10acb1031b8a6818c7c0 SHA512 ab86bbbabac679d05d123c5e87a5c43ae6468830996d6d86426edac4e726f2113bbdea5e8841d2b4aa6afa31748f7bb866ed1a65cab02164641186ab76233525
-EBUILD paginate-0.5.7.ebuild 944 BLAKE2B b862fb8428c82e51301608599c3886b62f70a4ce290721ca08c5d5b4dbdb4166bb8b4b6108ccbab8dff0ded7098de677fe917eac0aa6824e37e66ea45d6099cd SHA512 4866e8789f74d7d7918caeccb60f902c9cb6bb134d43704ff95f39f904d226f372d4c525673e0dcdfb132a9c40af3a02fc5c69b436ba268083b93260d5e59a9f
+EBUILD paginate-0.5.7.ebuild 941 BLAKE2B 8d5795b3133eea8fa92511e9a051bedcb1f58d6783976686c32a5a10fe99af3a14926f9007c131c9338fa709bdb9afbdca1d0173fefd10acb1031b8a6818c7c0 SHA512 ab86bbbabac679d05d123c5e87a5c43ae6468830996d6d86426edac4e726f2113bbdea5e8841d2b4aa6afa31748f7bb866ed1a65cab02164641186ab76233525
 MISC metadata.xml 369 BLAKE2B 19b0ed57cf4d77b7c7b5743db890ac9b4c9291770480ea34fc136ec9cd4c70a0bf7fa5adfd831714cfbe90bc6d2386c1ff6446ce7402d51675b2e23b3659fd6e SHA512 302d1f3ba21ecd4cc6ed7905f8b49e524d21aa32ae810d5b9124ec8a7ea2802fd79997afd573988679db1f246f193653ae34f2b275c27d30762002b66e55dcd5
diff --git a/dev-python/paginate/paginate-0.5.6.ebuild b/dev-python/paginate/paginate-0.5.6.ebuild
deleted file mode 100644
index 81835e8a3b27..000000000000
--- a/dev-python/paginate/paginate-0.5.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Divides large result sets into pages for easier browsing"
-HOMEPAGE="
-	https://github.com/Pylons/paginate/
-	https://pypi.org/project/paginate/
-"
-SRC_URI="
-	https://github.com/Pylons/paginate/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		python3.13)
-			;&
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# these tests assume that dict is not sliceable
-				# https://github.com/Pylons/paginate/issues/19
-				tests/test_paginate.py::test_wrong_collection
-				tests/test_paginate.py::TestCollectionTypes::test_unsliceable_sequence3
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/paginate/paginate-0.5.7.ebuild b/dev-python/paginate/paginate-0.5.7.ebuild
index e89c4cd893d9..81835e8a3b27 100644
--- a/dev-python/paginate/paginate-0.5.7.ebuild
+++ b/dev-python/paginate/paginate-0.5.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/parse-type/Manifest b/dev-python/parse-type/Manifest
index aebeed450392..05baf8b3f11a 100644
--- a/dev-python/parse-type/Manifest
+++ b/dev-python/parse-type/Manifest
@@ -1,5 +1,3 @@
-DIST parse_type-0.6.2.tar.gz 69720 BLAKE2B 76deaacc1824f701db74fbdd971b1dd8131f6d45f329e64f6eae993d6a41cebebb44c0653813bcb625e335bae5a81853c8c3704c0f102ebad96a38f43826059c SHA512 d614b105696baf135a7f8c84f751a2491dc7558cadf1c3891f1223f6196a7b041c499f3df4902b04daca5e6507522ec0f99533b6b1d027773a15f7738a574958
 DIST parse_type-0.6.3.tar.gz 78224 BLAKE2B 079930e12abbc5e01ad29a92dfd4eabcd4ab80803084875cf63e8812e75ec4d469496e0416c5699da89e8c4da56c1a3ab10a48f9920a926aa6ab988ca52131e9 SHA512 babcc8e47cb1933fcd07e1860b07cdefe2e236c2900b1a3eac7982d32b0320b02647a813d4d20def7df1fab8ba9621d5a5c02fa2147f6fff880d1449f61ef38f
-EBUILD parse-type-0.6.2.ebuild 683 BLAKE2B 84fcf17fa43c16e4bf3e78f3dd5021b249cdef25680ee20f49513f9dce2588e50edb213d1a742dec579577f535b4f7904aef37ddfe29acb2760914ef88fd5e02 SHA512 3da7b027bd75cd09d0f619a464cbc40fe0db87a208923c58304f0aca474f3ebed2c83aa932b19fcc7230724976ad03539aaf94442c472fa9893bfd8f06aa0071
-EBUILD parse-type-0.6.3.ebuild 685 BLAKE2B ef481609196636bffa537eca61719de8b342be31d33947ee5a4109bbaba9c67d033578909e1f5a737ce2c5029dd4b9760192b55af4813532bc00c03d11a744a5 SHA512 bdcf67327ed95b39aa3de6d1e61922ea22c4493674ba5fae6b160b80b194dd77a3c78cf2a97d6926d0a79f43813a171d34cc39f37f276dded94d4140fe958f40
+EBUILD parse-type-0.6.3.ebuild 683 BLAKE2B 84fcf17fa43c16e4bf3e78f3dd5021b249cdef25680ee20f49513f9dce2588e50edb213d1a742dec579577f535b4f7904aef37ddfe29acb2760914ef88fd5e02 SHA512 3da7b027bd75cd09d0f619a464cbc40fe0db87a208923c58304f0aca474f3ebed2c83aa932b19fcc7230724976ad03539aaf94442c472fa9893bfd8f06aa0071
 MISC metadata.xml 401 BLAKE2B 38e88a68d1271796b0e160ca4266b0d35c135aebb3ae4c88ea609ebfc2407a2b8cd7332bcb4adc0ffb2188259d4bd41eaf22d53d0eaf1947078fcb253835e6de SHA512 ead81a56944702a5b717e6c1b909cc81ecc68194a08586a52ef5b46b533dd34ecdce1f8da098f6967e705c74cceb92c026b717f96056ac35f70134c8e1e5bfa3
diff --git a/dev-python/parse-type/parse-type-0.6.2.ebuild b/dev-python/parse-type/parse-type-0.6.2.ebuild
deleted file mode 100644
index f54fa6807930..000000000000
--- a/dev-python/parse-type/parse-type-0.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-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="Extension to the parse module"
-HOMEPAGE="https://pypi.org/project/parse-type/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( CHANGES.txt README.rst )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# disable unnecessary html test report and its pytest-html dependency
-	sed -i '/^addopts/,/report.xml$/d' pytest.ini || die
-}
diff --git a/dev-python/parse-type/parse-type-0.6.3.ebuild b/dev-python/parse-type/parse-type-0.6.3.ebuild
index 26c1e370f536..f54fa6807930 100644
--- a/dev-python/parse-type/parse-type-0.6.3.ebuild
+++ b/dev-python/parse-type/parse-type-0.6.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/parse-type/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/parse[${PYTHON_USEDEP}]
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index d575fda0f2ec..c7eeff204039 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,6 +1,4 @@
-DIST pefile-2023.2.7.gh.tar.gz 74852 BLAKE2B ddca4b8ef37af829bb1757eb4c4ba9f46c3914e05e6c13e13a8e5a3c88a608aba486deec9338400fddae4591867c0c7dcf7325cee14d42b1bb724751a3a2a7f0 SHA512 241d9846954f094ed39e61d80e7d8c1612829ec909650175e75657f9cf69c9bef9e2a115d4106bb14757125c0ffaa3e93abfb2f078e80326e78ac5818c7c2fd3
 DIST pefile-2024.8.26.gh.tar.gz 76008 BLAKE2B 7f21d07bbe9a08239739f589e35d0ef4b5172e26b2a90acdbedc7792be70fdb0d4ee01888d674384fb011f3c716406c1b1a23b29fa412ce01863cae89acbc4bc SHA512 62781f2ab84040a13304ce550dd1e943991df152c5f2951281906e837b1659694051a074ff49cd08d5d508e9b70009b56418a4237511c4464c4eba9bda4bccf7
-EBUILD pefile-2023.2.7.ebuild 844 BLAKE2B 9ba5617c634419530420a848bb5fc50c762cef598184b7ea3f4ff0160ffc83b6e9a0dcf8f02f107c6c03e9aecd9ab3ee9bd5fd837f73a4a21ec8ae2abc1085bd SHA512 a325adbf2cd9024a500929dbff27d58711a8ce9a2719f24308bdce881a5cf4ad6e77d5d31240ed8203fb08c7eb65c6f5e47ab150e1832ef53b7065226122776a
-EBUILD pefile-2024.8.26.ebuild 866 BLAKE2B 9767046d852e889e16ebd7fe64be1546e9e8c84f5ba18eb2c90060993fb43b715f5b2e35579a02b167e3fc22774f2b23d9333b1176a0e4e564ef435e51c3cd06 SHA512 9c2d88eb66a2ce06feb4dc8fb8c4bb26d55cc4d793613bfc3e6919dc62e3a5803b1d72d490ab3df1e73a727f72fe9be73573d4c595daba3e60e5d546d700dda3
+EBUILD pefile-2024.8.26.ebuild 860 BLAKE2B 7dbbcb0d131f4ed5bce5037bd74f750245d012ee1c5bbfef13b5c69e22d18ad983b331de3a53be8fa3430f51b29a77a77ecf58bebb6d4500611b3e1b1cea526b SHA512 81b03f068cd9f10eeb549f4c39aa8babafba1c5449d0a42396d24545fd6ba15e58687a6b1dc0514202ded8635b8cc54b0b6925a1c00a3d421de14a821df206f9
 EBUILD pefile-9999.ebuild 866 BLAKE2B 9767046d852e889e16ebd7fe64be1546e9e8c84f5ba18eb2c90060993fb43b715f5b2e35579a02b167e3fc22774f2b23d9333b1176a0e4e564ef435e51c3cd06 SHA512 9c2d88eb66a2ce06feb4dc8fb8c4bb26d55cc4d793613bfc3e6919dc62e3a5803b1d72d490ab3df1e73a727f72fe9be73573d4c595daba3e60e5d546d700dda3
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild
deleted file mode 100644
index 8f961570806a..000000000000
--- a/dev-python/pefile/pefile-2023.2.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="Module to read and work with Portable Executable (PE) files"
-HOMEPAGE="https://github.com/erocarrera/pefile"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
-# suite inside the release files. The test fixtures in the source repo is
-# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/pefile/pefile-2024.8.26.ebuild b/dev-python/pefile/pefile-2024.8.26.ebuild
index 3eecccc699f3..5e1d6ab44aa8 100644
--- a/dev-python/pefile/pefile-2024.8.26.ebuild
+++ b/dev-python/pefile/pefile-2024.8.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 09cbd9605a06..65130bc17e6a 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST python-phonenumbers-8.13.43.gh.tar.gz 4916529 BLAKE2B 78f904af583fe4390ddd0d8f0838634a1e898ee93187a676b9bf409301c03e392d6e7404f30ae5d3b36d36809db647f749d48ea5e0b48f2db904a47513952433 SHA512 80df3d5bdb4ad7a32d4e1c1b3f7a4db473e21b9ff7e260fba5bc814e96067e042c81e805c3eb8494b31d2ecf3a0a73689ba2fc9714a9e8e7fe8098a7d13beb5b
 DIST python-phonenumbers-8.13.44.gh.tar.gz 4912993 BLAKE2B d579e9c17e8c78390ce93832d53a50e9aaed0c186a1430119c54a22ef6af65ad2bac42cd082278bdca0f0e32762c7d0b7e90d28f1998fdf8b5cc2544b241e7f0 SHA512 64eec22c997d1f0d775445a829d63c7568e943411522f4d55fdf4fd18b1c680c48396b056492f27f6275e83c7bcd53ecc5c6258beeb24d5a7e218011c50b5a35
 DIST python-phonenumbers-8.13.45.gh.tar.gz 4913395 BLAKE2B 78cf1a38dba34f4c989b39b676fcb0e78369a41cb7882fe59e48b9c36af9471082153a194ba75b72e7b25515eb0bcb7749eb0af78175f49c2933e17efc13c263 SHA512 28abdd0ae5f28b38c5279a850ee36812ddcd8eed6f57c9f1e816406c25896e6fdc547d7802ddd4b97a9253c3962946a8c17aa4c96e6a62823a9ae80c74a16024
-EBUILD phonenumbers-8.13.43.ebuild 816 BLAKE2B f6c2960a4435c0de44a1a1ab02278402f914bc58d8795b83b527003bb116ffeef3711a02c7d00e48999f924cb7426f0e657d5b1aa930cde98be4d273312d3223 SHA512 36a31a824519dd72fcedf797fa0164ff06d57429f46c1bd7c6d4d7de3d2614974319267d9cd5f44475180fc16fc3800417c931e19c0926ee120235d884eadda0
-EBUILD phonenumbers-8.13.44.ebuild 818 BLAKE2B 52157818a6a593c18dae9039574a974275876cee7dd286fa069e0014213f2c79bc748601d48f83b9f26c2a88319033375b987885fbfa6e664ceb674c6a36ce23 SHA512 4bd185fd81d09f95142678bc08d2f124877c09af6f58ad83115569437c2fa3e6d90b4ef7fa151bd6d5e2cb464a90dc0392bbc228e6aa9fa3a42952d570872ff2
+EBUILD phonenumbers-8.13.44.ebuild 816 BLAKE2B f6c2960a4435c0de44a1a1ab02278402f914bc58d8795b83b527003bb116ffeef3711a02c7d00e48999f924cb7426f0e657d5b1aa930cde98be4d273312d3223 SHA512 36a31a824519dd72fcedf797fa0164ff06d57429f46c1bd7c6d4d7de3d2614974319267d9cd5f44475180fc16fc3800417c931e19c0926ee120235d884eadda0
 EBUILD phonenumbers-8.13.45.ebuild 818 BLAKE2B 52157818a6a593c18dae9039574a974275876cee7dd286fa069e0014213f2c79bc748601d48f83b9f26c2a88319033375b987885fbfa6e664ceb674c6a36ce23 SHA512 4bd185fd81d09f95142678bc08d2f124877c09af6f58ad83115569437c2fa3e6d90b4ef7fa151bd6d5e2cb464a90dc0392bbc228e6aa9fa3a42952d570872ff2
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
deleted file mode 100644
index ac05eba6ee74..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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/phonenumbers/phonenumbers-8.13.44.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
index 43eeff396e3d..ac05eba6ee74 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 8fd19632f8eb..62993eec9b3e 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,5 +1,3 @@
-DIST progressbar2-4.4.2.tar.gz 101342 BLAKE2B 67625a794bd19a4ed78be25789980038c69a6590277f085befeef805397972ff1160543814523c425218e019647f1c1641451198e2dd08a5f8eacd9e507a04af SHA512 705383badb3943d3d339854d02ee4114f0e76261373deb8f9aff00fe6aae7f37bacccbbc673c2cb36114c7f8ebbafa96a06408ce6e90c3d26a2e2c65ece86958
 DIST progressbar2-4.5.0.tar.gz 101449 BLAKE2B 3c4adc503d1b6e0121dd579719aa6758a52459cf7c2d63016032edd89d9f22918b1e0b497237b1658f703d790273feb64818e420b752a5f0e04e99e75042fc1d SHA512 84d13cce516aebc184285479849a1f4d16d16bbd48c7eab55c28ce131f5c770d97368df1ca57499a59e4d2994bce5a0cef7cc3d7c3a358b2dd6beba785f5db33
-EBUILD progressbar2-4.4.2.ebuild 871 BLAKE2B d100ecffcecd8b569da36c4788185744f79db887f06e065eaa62d0163ffaa4c2e68f6bfd9670907462a16a04772b2926796ecfbd18a959e5064c15bf6a437f0c SHA512 f59490131baa6dcd41bff7f068afdf1166f8df4c75f2169d68fe4630cdb5094584942fe43a9c0ecd2ce0cdec109e6d958c8d4f043d26fa83d16b8d3821a144e4
-EBUILD progressbar2-4.5.0.ebuild 848 BLAKE2B a1ea3e016481cadc67fb05e2761dc552dae2a8d9507e492f617e55faa63d52f8dd5e480a472fa2bc4cfd858f5578c7e20962f36904b52930b30707fe501f58a9 SHA512 b45bac2c9a9758be699f8112f6271d76f8d28223fe9f66c36410e84dc2f186b326c88be50441cd8a3e09694550c622d96d8b385153fff0c05e665da6199ad51f
+EBUILD progressbar2-4.5.0.ebuild 846 BLAKE2B 56eb506e057df5f3442b70fc7c3c129729f4190ff4b632f78322d22e5acc6b609e19d177b1338c9720f7552ca82710f682f39b1fd7abe5bade607d1ffb547675 SHA512 86a1cbc31440f04018d70e8cee90ee619c9f51bac2a81ac066c01a0970817aca05ee64a3e9f06b81892a06e7195e10bfed2018e323d95eebcc965ff0abd43741
 MISC metadata.xml 404 BLAKE2B 774a579e397ff18f4196eaf238847e52062742b1ff00999e6b970c4a0f5e032d6caf57e2f64903882269738bdeefa3b3533711d36c68694989ffe6b508c9c467 SHA512 95bd7c3ad0f1addc6d6dd57aa89f04b20ad7019b35468aa44cb5077a819c4658cf64196c5443a671d8beb339f5bdbf40e544807b21c7e2bc11b39da5e0e8dc99
diff --git a/dev-python/progressbar2/progressbar2-4.4.2.ebuild b/dev-python/progressbar2/progressbar2-4.4.2.ebuild
deleted file mode 100644
index 31edc8ce4b9e..000000000000
--- a/dev-python/progressbar2/progressbar2-4.4.2.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..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="
-	https://progressbar-2.readthedocs.io/
-	https://github.com/WoLpH/python-progressbar/
-	https://pypi.org/project/progressbar2/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-utils-3.8.1[${PYTHON_USEDEP}]
-	!dev-python/progressbar
-"
-BDEPEND="
-	test? (
-		>=dev-python/dill-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/cov/d' pytest.ini || die
-	default
-}
-
-python_test() {
-	local -x PYTHONDONTWRITEBYTECODE=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/progressbar2/progressbar2-4.5.0.ebuild b/dev-python/progressbar2/progressbar2-4.5.0.ebuild
index 35fd688e6504..d4d568fc4ae7 100644
--- a/dev-python/progressbar2/progressbar2-4.5.0.ebuild
+++ b/dev-python/progressbar2/progressbar2-4.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/python-utils-3.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index 58da4cda1c22..98ec96b56af2 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,5 +1,3 @@
-DIST pulsectl-24.4.0.tar.gz 41166 BLAKE2B 3b2d41b3077f050104e7b416cb8dbba47f4282bb90ee58c855f4f5a1e1b1183b131879e6965edf8d8b5a2466ce3381e45c7a6b92f2b64fc336d311d3d7625440 SHA512 b17fd577f9c336f762925bd423fdca665afa92a88b0dae076ca016d7c5b2b3d9ef11efd27f7339031accadef00d513f972c216a23f26cfd049516f3dbcc63d01
 DIST pulsectl-24.8.0.tar.gz 41171 BLAKE2B 58a16b07fcec68f21fd573cf781f2ac09ccdf2faa3e7afa84a4f8cf9f28111e94bf41e0f8a8740434edeace78156f56ac428a87d669cbc947e331b8d555dd2e1 SHA512 4638bb41611e8d7a00f2daeec7e7783789d5d1d94841206b4052e53897e6547c21f8410c3400e1bd301e237b3a72143fb6ff3d67cbafd06bada0a1d0da007c96
-EBUILD pulsectl-24.4.0.ebuild 581 BLAKE2B bc378c0e1bd52ebdedf5ddc03c39ba9633854762e9a0cf052290b36c39bde68b309795b484d67914daba443fe564b6ac2e5d1fe7476ed5d3af6d7c5d74b93821 SHA512 a35c5890c05541cb18b0d3e95c422843ad925729194627507f3923592025cbcd3cb04ec4d707b1611f2778d5b5269f303286bdf851fccb2931b0cbae279db798
-EBUILD pulsectl-24.8.0.ebuild 582 BLAKE2B cf21cc4a02e86d920853c2342bab24250fe58ff85d04d36ea2a62625937d642d0a2fe2d75ba6f515ee5d0ccf44ab2915777e2c80e12328b7680a22c23eb42f60 SHA512 82928301f96ea5491747ff46103bceb9153f8e3ae744564ad0515027d8dc49b014756f58bad2c6a933304518869b9b26dda6510fe760f5a0a6126bb7fd6e61b5
+EBUILD pulsectl-24.8.0.ebuild 581 BLAKE2B bc378c0e1bd52ebdedf5ddc03c39ba9633854762e9a0cf052290b36c39bde68b309795b484d67914daba443fe564b6ac2e5d1fe7476ed5d3af6d7c5d74b93821 SHA512 a35c5890c05541cb18b0d3e95c422843ad925729194627507f3923592025cbcd3cb04ec4d707b1611f2778d5b5269f303286bdf851fccb2931b0cbae279db798
 MISC metadata.xml 558 BLAKE2B 6cdebbc1f507bbab92256bbac867a86468b733b40dacfdb71090738f5505ea6ac33b24cbeb06835e10d9845e3fd9189a6c34625176f12c9dc7f4a1511069e8fe SHA512 b15eaa0564bc6dadf8d46eab154d028b4cbde26fa099793aa23df8f82eba86a4125d173eca8a8d2d73359dc67171dca9d8716e1495168c7b6c8ff5c701a21577
diff --git a/dev-python/pulsectl/pulsectl-24.4.0.ebuild b/dev-python/pulsectl/pulsectl-24.4.0.ebuild
deleted file mode 100644
index a26679e2fc15..000000000000
--- a/dev-python/pulsectl/pulsectl-24.4.0.ebuild
+++ /dev/null
@@ -1,30 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="
-	https://github.com/mk-fg/python-pulse-control/
-	https://pypi.org/project/pulsectl/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-RDEPEND="
-	media-libs/libpulse
-"
-BDEPEND="
-	test? (
-		media-sound/pulseaudio-daemon
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pulsectl/pulsectl-24.8.0.ebuild b/dev-python/pulsectl/pulsectl-24.8.0.ebuild
index 693b086854aa..a26679e2fc15 100644
--- a/dev-python/pulsectl/pulsectl-24.8.0.ebuild
+++ b/dev-python/pulsectl/pulsectl-24.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	media-libs/libpulse
diff --git a/dev-python/pyasynchat/Manifest b/dev-python/pyasynchat/Manifest
index 20450849ae3a..5e2d93975b67 100644
--- a/dev-python/pyasynchat/Manifest
+++ b/dev-python/pyasynchat/Manifest
@@ -1,3 +1,3 @@
 DIST pyasynchat-1.0.4.tar.gz 9747 BLAKE2B e38edd9e35ce31f9015b934a5d4edb96053ff239978359f13e5b74ac9b8160029556207f79a199d82085882e80d88fc8033f9085f986b48dfaa50de780576197 SHA512 d36eb16770637a311d56fe22229de5a3cdfa699ae64fbafcdd5ce9acd43270b90813fe56db14528083ee1803a43d958d0b3b6616e0bbf907a4dd4a563981a278
-EBUILD pyasynchat-1.0.4.ebuild 681 BLAKE2B b9c06fa5d677c9bde0d13b4869f37fa0f74ce5ab98aeb38e16c29297763d346995f5a58d2a669aef8986a0808443133b60531533d414c6343b02973da07343c8 SHA512 b73c7f40dd202655126b1633a39f9aa583c7cda084aec780cde401c0e17919194c9cfb79fd5d187ba17000c5bea3041bf0d0b57f63ff9303ac0250b047befb3d
+EBUILD pyasynchat-1.0.4.ebuild 687 BLAKE2B 3c507c4084940f4643b48449c72b7a392ee989941333c37143f326ad1ff8f2f0eb7e09bd2fb274f79a3989acb7c59b1455798984b46db0e8a14a8034b8803a4a SHA512 6abc40653740ec85d2d35712c12c1d8b2f45628fc6bd38dcfb5356331ba06a4d47fb533af620fc127e570279befb8cc6a47c16ee8775fb462a20643baae9d1f8
 MISC metadata.xml 410 BLAKE2B 9e60dac1e4ef47dd2d5a1811c8ecb03d6b0f8ca88ca22b0717309d74e762f4807db9a240a58dff57b5bce05d6988da02a9961854a65b4442b6d45fdd0251f0e1 SHA512 efdcaf76cdb42d8949e9c5f660b28e782f13510f67f5395d5966551ac8e9c0f4272b64f4c8b6876838306d43b74d6c6ebe9e495d8f08545fc7cee2ecddf6a42f
diff --git a/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild b/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild
index 3ba1840d14aa..066434de9e36 100644
--- a/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild
+++ b/dev-python/pyasynchat/pyasynchat-1.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyasyncore/Manifest b/dev-python/pyasyncore/Manifest
index ccc7eef5cf9f..ad3a5f95a376 100644
--- a/dev-python/pyasyncore/Manifest
+++ b/dev-python/pyasyncore/Manifest
@@ -1,3 +1,3 @@
 DIST pyasyncore-1.0.4.tar.gz 15339 BLAKE2B 1cc689c94dc7fe4f4c75a78cf58a0afabbe48f01b8c1511f9500b93b64b862dc1c7cc653e17a49786af9360441fcb45be03fa38c72c2e89ec05385fd8bfc648a SHA512 43746fca009f7acc5f05506c7d54e71ee74a76a112c3689aa98ab714f0452d1ed1196836bf52585bbbced2d64c1d4ccd86f8f5c2d2c5537fdc397e29d0d87008
-EBUILD pyasyncore-1.0.4.ebuild 628 BLAKE2B 514c611587e24dc4355ed4e43998a656ba9fdb9e9cd8d8f8a750f2ec17a177a5265e97157e370044d4ae79f94b254c1daa8856c2c93020fa12301aab3e7bbed7 SHA512 6369d3e063158bda65835b8677eff049791041c2625b44ee3e2765803f91b495b8a9547d0a94eec34e2a69c4ab1be0bc64f25e3ef5f90d9a2d51b627892d1012
+EBUILD pyasyncore-1.0.4.ebuild 634 BLAKE2B 1c652dd03a59dcc883e66168312ca7c158489780474c6a91705cdd3a2d79b1aef4420d150e8b1d223241d4ede7439c976876d3ebbdd2202e47ccb7edad72a534 SHA512 844cc72993e40832a61d9d5ab66ee71c81e585de703480eac5597dfb7aa019aa521d7819949125a87f5679b45b0f27ebdc242cc87cd9c7f5271cc7557d7406c9
 MISC metadata.xml 410 BLAKE2B f69eeb55bd7570cb72b1dfc228c0ee3fd14bd4abd8b58d279c4672af0476ae1f84ee8c2aeb40208daa5a266479d881f5b8f7537da37af8118be2f16bdb21bb3f SHA512 71e37573484b24241176e588db3d9d0426db443555c15e258acf83a47fbd2158a5d6bc631bb5a58a4bc6d855a76f79361013ab08204293c95be6e0dfc3beef53
diff --git a/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild b/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild
index ce24a3a3dd8c..717545d31b63 100644
--- a/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild
+++ b/dev-python/pyasyncore/pyasyncore-1.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 7482361f0e1c..a477b8fbf2cb 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,5 @@
 DIST pyftpdlib-1.5.10.tar.gz 204487 BLAKE2B 7c611498dc2d11f752bf6a0ada01d906fca5c28e93b21bbcaaa76fafc88dcfe7afe616eb06f102123e614e061db2b6b62766f5036d749f8bd2b6d5cc35fc52e8 SHA512 c8c28d7aab13f2aab222ae038bde96f17abefd461830813ca00b621a6ee3e809c59ed135149ba735e7e92a6722aecfaf7095ccbacd7b3e17a16ee69fe1668766
 DIST pyftpdlib-2.0.0.tar.gz 196108 BLAKE2B bec261eac70a93092055413fca67dd4a480e492481f027b32508dcee8b479dbc0ec84c56d972dca63f2fbf4e3240e02b1c2877105cf77130bf75b64c9785993e SHA512 c154127771b949854c05f87a7b77f1cf144e2756cb0709c44cd0921c2ac415e7c6336c6dca1982b762087a42fc1408e26fbb2ebecbf9255d6f2d6019af14ccfe
 EBUILD pyftpdlib-1.5.10.ebuild 1461 BLAKE2B c5c21ffc0560378da5bdb5eb6e1b9919dd167f74e0b16f0fcafd1d0ea8cc22286a54b69c10b40cacf02dc7b6a218274fd860657bd7b1dfa430a160b505ec4300 SHA512 fe1285be1d9805b5111e0c64c85ea6e34101eda4219547c20285898e57c465753072aa9573d8c2229b6b1ae5d78f981b80e6d39a67f9e0ab044706940c5f5f5e
-EBUILD pyftpdlib-2.0.0.ebuild 1585 BLAKE2B 2a6a2800706cfffda22a07804626ffa9bc57703b53f68cda5e7ddbb6bcd679f281696ffc6f2619876898af5b07f810491074989403bf10700d0e479f74aa7f48 SHA512 fb0e5052eb75f0940e4e473df9f5c3fefc2e87eb29ce45f0bbd04dd562fbd4954a4296f4874535313fc5302d7d46880332fb13bf66f06de0564c6532f2043afe
+EBUILD pyftpdlib-2.0.0.ebuild 1591 BLAKE2B 76471d463b60e1df91c975051cd3af8e3e86814e7ba69f1351a075a1d244558f7050d0f4bf9006bf05f2dd4d9da5367eb999cebfaea601f1a3653e18f3f0b9e9 SHA512 1e974526d415a5d6f89375537ba893e15d4507ff7930540282965d68f96df4219a24a433c270dd97fdfd228cfae7f22dcc9fc05afb2e35e3046a9323da8a88e6
 MISC metadata.xml 463 BLAKE2B ad4e4d5a1717e55743061f2cb4baaa7ea8ce73f4caf0c8d62535aaf73daf12339584bf75c82c35b425223f478094bb37518b43d34694fb4bc6aef6f11033fa8e SHA512 98bb4e647da164a8676f9162d1109d1f6d1ff9279ba8d26207f2ed793537af27de11b40296bacfb478e87b6479c9d31bb24f56bc1acf2a0bc228b2d00a733e1d
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
index 72e399571136..f28406bf5316 100644
--- a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyfuse3/Manifest b/dev-python/pyfuse3/Manifest
index 5d3dc5a91b92..42cc5bb96a50 100644
--- a/dev-python/pyfuse3/Manifest
+++ b/dev-python/pyfuse3/Manifest
@@ -1,5 +1,3 @@
-DIST pyfuse3-3.3.0.tar.gz 867765 BLAKE2B 29a871bbd4c82298231eac0c8d4b668a75a9ea748c3dd15f093a369770fbfe080620b6209c79ce934880757764c946c3216b558dcc63cd1d1a7ef03e124174c2 SHA512 b23116104fc78e9d6688e05f495a1cc48ff2c0af03a537c1f2743f84a596ba36b59e1ccba2e8272a0483c083479df91be2ccd49bd2e0cb160ff02a74ad623d18
 DIST pyfuse3-3.4.0.tar.gz 962992 BLAKE2B 44bacb061a29034ac02879ace6d727fb99e5341b59233788575b9d460bbef93152d4c29f855fa82966490d228f4c0e7f829d43940d3a36d963618276c5ba9bd1 SHA512 44220578d411abd8c75f9f3a88671dad96407ad261942f7ceb1e86454c9c0ed49cb5e8a8f533c8bddadf189382a75475e4641b2917dd83110cd5e2f6bd733db1
-EBUILD pyfuse3-3.3.0.ebuild 718 BLAKE2B 18839b8b1a1ed17afc3260292a6b9f1d857caa41d4fa0d079920a4b2e397f24cf123e897f3d8766494b3c79ca457153d48343e913fd377e5a3783cc4fd3dfd65 SHA512 6ef11556e4df075f7351659c3c4e38819c50bdccec3b93a3a686539e1e12d31974f24b77e90746e11de426f2eb852b9cd043451eec862a354a10fabab6d886f4
-EBUILD pyfuse3-3.4.0.ebuild 721 BLAKE2B 0a38888f1f531de9fd463eb6c89b91a59faf7ab0deb4b81b63b7ceabee40ad7256ae2657ce2167acfd45b21fa173f82e731e3e8248fc7a6a073cd0b915926558 SHA512 8f7be73302681e567064a8a25a8e3573f5b6a573e96b2d283c5130ebd6e9e6f731d60c4ac917fef21956716511d0eb1f3d8f71383a82ebca4e768c035c7e9481
+EBUILD pyfuse3-3.4.0.ebuild 718 BLAKE2B 18839b8b1a1ed17afc3260292a6b9f1d857caa41d4fa0d079920a4b2e397f24cf123e897f3d8766494b3c79ca457153d48343e913fd377e5a3783cc4fd3dfd65 SHA512 6ef11556e4df075f7351659c3c4e38819c50bdccec3b93a3a686539e1e12d31974f24b77e90746e11de426f2eb852b9cd043451eec862a354a10fabab6d886f4
 MISC metadata.xml 293 BLAKE2B 62845768731235297bd2f4b3e133dac78cf4ede4c966a5744e3e37c51598a6774b103ba1de844c7a2b39c025fa5f0349cf760c1b84386c72837698290fd11e90 SHA512 85d980dcf39d4301087c21db1ad344ee261e96656182cedfae8ad33fc93630bb3938a3e4c34279454e14ec6f8d429c19183f5cf300d29be9610ebd24abe13ee8
diff --git a/dev-python/pyfuse3/pyfuse3-3.3.0.ebuild b/dev-python/pyfuse3/pyfuse3-3.3.0.ebuild
deleted file mode 100644
index bdb126f76870..000000000000
--- a/dev-python/pyfuse3/pyfuse3-3.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python 3 bindings for libfuse 3 with asynchronous API"
-HOMEPAGE="
-	https://github.com/libfuse/pyfuse3/
-	https://pypi.org/project/pyfuse3/
-"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-DEPEND="
-	sys-fs/fuse:3
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/trio[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_configure() {
-	esetup.py build_cython
-}
diff --git a/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild b/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild
index 00e4368cc5d5..bdb126f76870 100644
--- a/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild
+++ b/dev-python/pyfuse3/pyfuse3-3.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	sys-fs/fuse:3
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 936d831c36b8..34200feaabe2 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,8 +1,6 @@
 AUX pysmi-1.5.0-py313.patch 1750 BLAKE2B ad4a49c9e8e37728a0b07fdcc561b0933681abee0a8759f47039a519d7104d7508835a7f1add3c7eb5375075ab027133e490a4f07426439c1ee831456e514823 SHA512 3c7d9dbf97ed9f284fef69253095a7ffe0e5bae7a36ece7c5ddb0fbd2d7e9055748aabbf461ced5d68eecf670baabb699e97dc570e2b327e77acb67cdb74a4ff
-DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
 DIST pysmi-1.4.4.tar.gz 117164 BLAKE2B 2ef1c2fc58ee90ad052fec5f0aa08fc128cc041e24dc74d8942ff81912e7e45b480e5a125e412e0c52818670dafbd9bee310a863f9a5b898c8a67a18492897ae SHA512 9ce5665d1db147cb80fe7ef17981a4231a25a8b25cfafb14784acc0355fbd0296070a7da67a7f6b1e738e0f5f1249f871ee29a72da546e639ad4d2f2e8b00c43
 DIST pysmi-1.5.0.tar.gz 124064 BLAKE2B 763501b0fd575e356944372f0f173857d8a982a1cc7342636807d7147f7b6615d9c9518f099fb3071356957f0775e7bbd6b5f37d2110947ad22585cc44dff461 SHA512 f99fbc186b2fd481b16269e5b3622821b932459ec97023968ce8e0ae5c2d863702122a44fafb26d901b8a0b03c02f97e60c6999bdde0f19d551a61daf4e926b5
-EBUILD pysmi-0.3.4-r1.ebuild 566 BLAKE2B 4e348555c1e0088bd84efbbe6ae47e9c43987eafa33d25ff38c09f5297da2188f83bf7a8bea150e88dc7d089ca7472f70c472dac2e85b84f53a2386e22ca314d SHA512 2f4256502072f54023a19fce35df1aa8458987c29c644f05faad894f677359b51c4c36bab9b58456dec337ec27058eec69f3328aa83606b938be2b5cec0f5990
-EBUILD pysmi-1.4.4.ebuild 798 BLAKE2B dfcfab8fccf1404e04d8f57a7dc09fbfe761779f8124a9d01467507533369afa6b8f3fda1e33f6846fe42cf27d99d7aa7e342beb22b44ba8d68f593c584ecd8e SHA512 cf6750f59fbab51696867b64a3c012a532f2e351ccb73c84adfecb8438971a8768a972871bbc56e6d1ccff0b5909f62fc2881336aeb0e5e0ee6e74af9f559ab2
+EBUILD pysmi-1.4.4.ebuild 794 BLAKE2B c1ec8955e20f2aa1455d22cd3f6cb2a7e96ee7f13df19c6fbc310e4e72b4abf75a8f08d1b811f1e256a575ea92fd46ad77bf8a8d91f3847e6a9d0df8e7c5d329 SHA512 5e25400912785c32bfaebc2d9974fdec0e63cb68ed24f08dbeff950638bf3a48e2e8df021e94c38859c65d5509943697a35f2c316fcc77d0b75a17f346c5c1d6
 EBUILD pysmi-1.5.0.ebuild 974 BLAKE2B 437ed286809f828344ff36c74f73637461e9e0f68be6a4c0847db55f46a907a5a2a9883ea39376335d45457cef23614cf973ac554b0beeb1101aac6f9e308eed SHA512 9c7904f99387f86cbcb2c979f60d748616dee617f834dea2856cfd0eb162d4c5c9b6948526dbe3477aaca88fa68e81437d27a765e1f80ed0b943580b4f67e9cc
 MISC metadata.xml 387 BLAKE2B 3435c6cc7ebd04242a6529a751eeacc132dbdf473c3b5f68558e97457376e81175f51e3bee10b315b4bbf4c5ac0ddc31ed16ee6a7e8ef92ac1f5b51ce70c11b0 SHA512 15561667591496522b4662368bc9db35327bd7483e3d7411fb4d227129b02f67e042299af44203baea4a1bbd4ba3fe6c74aabb4a598a748788f2077a51571f14
diff --git a/dev-python/pysmi/pysmi-0.3.4-r1.ebuild b/dev-python/pysmi/pysmi-0.3.4-r1.ebuild
deleted file mode 100644
index eed53736337e..000000000000
--- a/dev-python/pysmi/pysmi-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2017-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Lex & Yacc"
-HOMEPAGE="
-	https://github.com/etingof/pysmi/
-	https://pypi.org/project/pysmi/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pysnmp[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs/source
diff --git a/dev-python/pysmi/pysmi-1.4.4.ebuild b/dev-python/pysmi/pysmi-1.4.4.ebuild
index dd807749cdf6..3ea8a33a0b9c 100644
--- a/dev-python/pysmi/pysmi-1.4.4.ebuild
+++ b/dev-python/pysmi/pysmi-1.4.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 5656e95f632e..1df6e4c310f7 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,7 +1,3 @@
-AUX pysnmp-4.4.12-python310.patch 1368 BLAKE2B e06fc35d21ad783a023186a76862c6481811060ac7d62be1d869db00ef765ea6de43db740bcac3a0739971b0fcf3f572aa10b67c11ccb2230a3887fedebf7de7 SHA512 ce55137dc7ede872ff177d5f5e429f4e9aaa15964ecdef02fd2ebcd6164debb84b9e5720fd0def6478d8fa08676a56ec3ab0a093ae5b8f9f4160e185d5bd2606
-AUX pysnmp-4.4.12-setuptools-version.patch 807 BLAKE2B 84e1db3f4da12341ed243ce65eb3a5fdad1c12a9b1398fb630e8164326acf2b739cd0c103fff9e7dd49b73ce29b8d96872e617937e5eee39a0372bf97f4842ca SHA512 432c8e8f7e001e98ff0c7fb40dae948467bbdb646cd0a5a9cace4e3227c471f792df5c7d35ceea7eeda9c1bcb96d7a35ef8bed8fbb562bdd7e36bb98d8f371e5
-DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
 DIST pysnmp-7.0.3.tar.gz 427830 BLAKE2B 5855095c40ca63bfb705293d33d061d94ad0958ab854863fb73468d6aee846ea2fd843f4444eb93a29cb8c1ec3043e1d90445628e66392b04d43d2c027c4ce79 SHA512 9c23ab7073b40ae43a6c56b81c05ef6639f99f44153dcb2f97a455402495cfb5dc8f70025331d5461e6e18a66e1de8246506947bc80465df67cba2381d0d891d
-EBUILD pysnmp-4.4.12-r2.ebuild 1150 BLAKE2B 6d1be0bcd7c8728a0a0617cd9135f3f7bff86b02a5005997590df7d5258f9a58e98b4a57e1bb043aeb8a32428c828aaca56079aa7d364f3cb8416f7361186f74 SHA512 a66daca5322ce02c53c6805876c8f2f88b435395d3bb9b66e46290f2b2ec5d58f50d308886625d1252278d8573861336ecbbbb7137e22b9a85c44160dcb6bf2b
-EBUILD pysnmp-7.0.3.ebuild 918 BLAKE2B ba0b2fc5cd69bdd8e7259d6001b198e4da2b69cfecf00338ca0b3fb869471045741f3c3a7b445b35a7d18c8f7809c03e706e54ff322692f4202f9b5db34d8a77 SHA512 a3e20609b3879a947443a6692e10179bc0f1226c8219eb0ca26401c33f8704f92e6c0391deffeabaac309398e9c85bc48aff3993262c9999c846f36c66aaea6e
+EBUILD pysnmp-7.0.3.ebuild 914 BLAKE2B c97a2ed8d6e36eb5f1a3a9c363b4bc48037c133b62006bc4628a73d284b0ea82a92c09dc30ac73146bcbd3aacd4e8003cb2ca6767fe1a59e671df6bbb616d513 SHA512 4d49cb3bc0e472ec457f5572ece1825da4c87b9edd51a69281f6c58f3c30b70ead02093b4072cc871a2f801d9240cc464caf31561a8769df3957314641cea82d
 MISC metadata.xml 1548 BLAKE2B f5677ff5c8214dee58dedca8b1c3b64058cf6824a5296d93e1ea827d24b662ed705c1b863969f6fab40314fc7a97e332695b2bc8cd44be2374c43f1eb5af3887 SHA512 b2e9ddeaef3fe6b2c3248395a7c55becb20910a1cd12f80c0daee72ec46271ffb0dbaa96d525d7d05d5dd4c7dfbfc01a4d317611428b3e716bae26b2160c7ed0
diff --git a/dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch b/dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch
deleted file mode 100644
index 1fd272d8b5b6..000000000000
--- a/dev-python/pysnmp/files/pysnmp-4.4.12-python310.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/etingof/pysnmp/pull/415
-
-From 1d83beddd61b71e71dd725a12813a7052c14f730 Mon Sep 17 00:00:00 2001
-From: Flaviu Tamas <me@flaviutamas.com>
-Date: Sun, 26 Dec 2021 18:07:09 -0500
-Subject: [PATCH 1/2] Fixes #413
-
-Thanks to @mheppner for finding the issue and reporting the bug.
---- a/pysnmp/carrier/asyncio/dgram/base.py
-+++ b/pysnmp/carrier/asyncio/dgram/base.py
-@@ -44,7 +44,7 @@
- from pysnmp.carrier import error
- from pysnmp.carrier.asyncio.base import AbstractAsyncioTransport
- 
--IS_PYTHON_344_PLUS = platform.python_version_tuple() >= ('3', '4', '4')
-+IS_PYTHON_344_PLUS = [int(v) for v in platform.python_version_tuple()] >= [3, 4, 4]
- 
- 
- class DgramAsyncioProtocol(asyncio.DatagramProtocol, AbstractAsyncioTransport):
-
-From fc5ad9c1b1b9195f49d327f471705f9519ce5c09 Mon Sep 17 00:00:00 2001
-From: Flaviu Tamas <me@flaviutamas.com>
-Date: Fri, 31 Dec 2021 11:41:09 -0500
-Subject: [PATCH 2/2] Fix python 3.10 compatability, part 2
-
---- a/pysnmp/carrier/asyncio/dispatch.py
-+++ b/pysnmp/carrier/asyncio/dispatch.py
-@@ -43,7 +43,7 @@
- from pysnmp.carrier.base import AbstractTransportDispatcher
- from pysnmp.error import PySnmpError
- 
--IS_PYTHON_344_PLUS = platform.python_version_tuple() >= ('3', '4', '4')
-+IS_PYTHON_344_PLUS = [int(v) for v in platform.python_version_tuple()] >= [3, 4, 4]
- 
- 
- class AsyncioDispatcher(AbstractTransportDispatcher):
diff --git a/dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch b/dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch
deleted file mode 100644
index e2793fd6eeaa..000000000000
--- a/dev-python/pysnmp/files/pysnmp-4.4.12-setuptools-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/etingof/pysnmp/commit/2ee8b8707d36e772d6308f434b445a766e6586e7
-https://bugs.gentoo.org/836608
-
-From 2ee8b8707d36e772d6308f434b445a766e6586e7 Mon Sep 17 00:00:00 2001
-From: Michael Weiss <dev.primeos@gmail.com>
-Date: Thu, 7 Nov 2019 18:55:45 +0100
-Subject: [PATCH] Improve the setuptools version check (#322)
-
-Handles malformed `setuptools.__version__` such as "41.4.0.post20191022"
---- a/setup.py
-+++ b/setup.py
-@@ -85,7 +85,7 @@ def howto_install_setuptools():
- 
-     setup, Command = setuptools.setup, setuptools.Command
- 
--    observed_version = [int(x) for x in setuptools.__version__.split('.')]
-+    observed_version = [int(x) for x in setuptools.__version__.split('.')[:3]]
-     required_version = [36, 2, 0]
- 
-     # NOTE(etingof): require fresh setuptools to build proper wheels
diff --git a/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild b/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild
deleted file mode 100644
index 9a510e7893fa..000000000000
--- a/dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python SNMP library"
-HOMEPAGE="https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/pysmi[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setuptools-version.patch
-	"${FILESDIR}"/${PN}-4.4.12-python310.patch
-)
-
-distutils_enable_sphinx docs/source
-
-python_prepare_all() {
-	touch docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r examples/. docs/mibs
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Example programs using pysnmp" net-analyzer/snmpclitools
-	optfeature "IETF and other mibs" dev-python/pysnmp-mibs
-	optfeature "Dump MIBs in python format" dev-python/pysmi
-}
diff --git a/dev-python/pysnmp/pysnmp-7.0.3.ebuild b/dev-python/pysnmp/pysnmp-7.0.3.ebuild
index 145d170a0ab7..10f800ed6118 100644
--- a/dev-python/pysnmp/pysnmp-7.0.3.ebuild
+++ b/dev-python/pysnmp/pysnmp-7.0.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-python/pysnmpcrypto/Manifest b/dev-python/pysnmpcrypto/Manifest
index 837309fd002c..398334f783ec 100644
--- a/dev-python/pysnmpcrypto/Manifest
+++ b/dev-python/pysnmpcrypto/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmpcrypto-0.0.4.tar.gz 7244 BLAKE2B 305177bb2cae41859ea1a8dde21879a0e5c75c02b1c00593ceb719394bdadb119b67a652d5f7ea7c80c384f8bab81ab795db747548db8e4a4f1fa96bca291b07 SHA512 ee293ecc787ac24bf7d88966e72f5104d0bf1d7458947c50607051706edb847ac5ca806ace9ef4ae5066576b6610a7eae840a0682fe830515d5024ee2a955ed5
-EBUILD pysnmpcrypto-0.0.4.ebuild 584 BLAKE2B cc5d64519304c6da2502316fdf32fdc6445cc8351917d2964ecb2c7f3c08d1843c9cade9c8f5c519c85b4d108c5d5377b1405859d451ed704e56632438afc57e SHA512 1a4542f5fadc918f9671ddb9a7d1bd7df6bc50be561f8bd6737e675403f90835ec3510b401ff9266246f491cfe5756c9733ff87aaae4333d314640271fcd62ff
+EBUILD pysnmpcrypto-0.0.4.ebuild 580 BLAKE2B 51066618ab185bdc216a2aeb0c71db11dc66aa9071702cd29da8c039ca953da29ae329c867d3d49d7479ae1074de70ba6663802cae3cd35efd8cf15ff3b7da4f SHA512 01c29366537164eb896982586274c0a65d60858b401f922b906918324cf4b7aa74132e457e0a1f5c8ca26c4e4a54051cdaf519d32ee558bca1b45219071f823c
 MISC metadata.xml 379 BLAKE2B 6d9335722539388bd3dd441771bf0fcc61c5de5ed96349d3d22621af18f567bf237168a1d422c2165335ef9810e3f596ae8512480326e3535f879dddb2b61472 SHA512 524cbb313d67fbaebdcb72ae5455652a75dcc77ea82773f44e96ba3883f31a80e3e596fa0289650e710d0eabd7bf5d8e48bf3f148f8d3b258a389dac3a8757e7
diff --git a/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild b/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild
index 5e0e4e99a2a2..2ce566b9fc2b 100644
--- a/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild
+++ b/dev-python/pysnmpcrypto/pysnmpcrypto-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 84eb01fc2d4b..a05689bee02b 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-shell-utilities-1.9.0.gh.tar.gz 79526 BLAKE2B e17b3903b8b3b9c2a8b3d708a1031c5b18beb4741006cec5cf2b8586fb1a86c0034e374927f09786dd036d01ae8811f4eacdaa28053d3205d19bb122211b6437 SHA512 532d82754d0133cc49e8f88e700b1e7469e32a829079536b886358ba15caa18ff30a8ed88e258116ce4302c4220dc986c0f254cef10561ffee81d1e399107dbf
 DIST pytest-shell-utilities-1.9.3.gh.tar.gz 79651 BLAKE2B 1506f7d2fb3b988d55006a8429b6428cb73e969ec72eac5baf944d7e4fc708aaa8e474493ac3e226608c43ece75d2f6070d094f3b656a49bde11bf46a81998d1 SHA512 5ff40043d4f597623bcc61b2c87f00a59fc1882ae6ecda223c82fadc64ae8b5670d07e8e2df54cfcb8b3bdb9483f331a314f4a683760e5ebe843d68ae4067895
-EBUILD pytest-shell-utilities-1.9.0-r1.ebuild 1028 BLAKE2B 95d34d8b205d9d8cc76c6671f637f71a489ae17de0b2309b1e1797827ec0e2428d4174d2e9e5dcf2766841dbe075239bc38e560d5613ea9c88fa4577a69e3a05 SHA512 e13507f9d159ba18350d019c22a14b0350acc17e1f76c67d3ae15b14a6d342cce277f5e6ed447153a6ecaf2e193e22faac2800e1c4677dce08d9b06f66dcc352
-EBUILD pytest-shell-utilities-1.9.3.ebuild 1028 BLAKE2B f2af2d38928d44dfc55899dd00ca809915a19f8391ae3e08c4d2b2d0cfb24ffbe41766d879235d0ed2f8ede8a48884cfa0b363d9c11604f198a65565b197d534 SHA512 fb04b0a191da472d27ad4bc68c26002a035348a93dfe53ef8048dee4613e60f0cbb6a9eb4713fbe3e54311a647c84c8d46ff184e066d7961223d48c72c12972d
+EBUILD pytest-shell-utilities-1.9.3.ebuild 1025 BLAKE2B a3f09567777b05a7833e75d3c233acddebd58e18fd367e1bc30b8719cfb1419ca3213f87a91ce6a716d57af01e366fc6885307eea3df7f391c79fb6c8af00ee3 SHA512 2bdf8dd73fd9a15167701f55d744c41c107b40196357a803b85ea9b01f0955f5f3c6e9abe40144ecb1ebf15b06854b6505e81c98ae59d00f088f06cc08a788a1
 MISC metadata.xml 532 BLAKE2B 17cc767498152869362024c7cc352f1e0019628a4a0a2099664686285498304eb053c9e6237390dea9a62c7d2471e27c9f4110c41b04902198a46c79a42c8c87 SHA512 2cd69291a69dd5bf7ed6e36ddea2a422287f5c00517d0d1d4e819885ccf975907fd4ef5e2df8ecd0feda89d7fb4b8397265c5ea07c7e5e1e1ed9fdb84afb0b0b
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0-r1.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0-r1.ebuild
deleted file mode 100644
index 0b55407201b4..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-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="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7.4.0[${PYTHON_USEDEP}]
-	<dev-python/psutil-6[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild
index 6a16f052360e..94538dbf4c7e 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 8b3b91655d78..f93b32e1637d 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-cinderclient-9.5.0.tar.gz 236811 BLAKE2B 60d450ea31357d366c0c18b6715a36f51a9700393c2e5bb0967cd86706dd552fb2deaee428816019e87bd2c272b2f9342118b1f770370ce5aba062d3ebd292ce SHA512 efcc0f4b32e1d6f8d696137c416aeed6fc4f2a69b6fa59d47f0c46dc7d38d1f2bbc5ea35d1bcbac0604e9db8b75d256d47a76d17d040b6e84fca6069a65df8d8
 DIST python-cinderclient-9.6.0.tar.gz 237239 BLAKE2B 34080bcc739db3df9fbf2b45115726df6c435ade39b9d92b8752db06a661db8d6ad92005d1358ae4f0bb313db663bbb1e6e7fc1fde0373941eee39921b22a9b3 SHA512 f2dec3927063c40046c72e090f95f996a16582c09cca8de320fedf80037e4c8dea231c8b48d3fc1ad085b89f43afc413c477e162f231940616f3373d4f86d4ee
-EBUILD python-cinderclient-9.5.0.ebuild 1272 BLAKE2B d4d0969e69b83e3a539ec432e1768fe6f5f4941fead678b43b1635f01b9da7efe011a1bd323683c2fedd424ca88bf82d050fb900bda01c9eb5cd5e6fab37ad2a SHA512 d894f2d437662a8f7674fa3c8c98059af426660666253944d8aaf75d0521c2097fb3d2f5631358c403d5387158e81b30fb1007adc0ca3cbb75c88c9ac689b45c
-EBUILD python-cinderclient-9.6.0.ebuild 1275 BLAKE2B 30df52bfe14c91fe586c5fa7435d95315a6d875258eac69ddd0915241af32c6304b959916a607dd17f56d8a638df028493327e54294e6cd45ded7b36a24dd345 SHA512 0758dc8bd99d4cae30a6edab7ad249e13cc84b826bf431936a6886038e8f78f1ebddc2f316ab658ffea9adc036d8f6fd4e85bfbc12262ef1f15f2d8a7ca36ef4
+EBUILD python-cinderclient-9.6.0.ebuild 1272 BLAKE2B d4d0969e69b83e3a539ec432e1768fe6f5f4941fead678b43b1635f01b9da7efe011a1bd323683c2fedd424ca88bf82d050fb900bda01c9eb5cd5e6fab37ad2a SHA512 d894f2d437662a8f7674fa3c8c98059af426660666253944d8aaf75d0521c2097fb3d2f5631358c403d5387158e81b30fb1007adc0ca3cbb75c88c9ac689b45c
 MISC metadata.xml 727 BLAKE2B 0017cc08edf25f27b8a2816bc3ce1374148a17522bf2c5ea643ad10cde9f5779b1b6bf1e3c91627db76d2f77b8dcbfc87a29fb2cdd8064b3140fb14d1e6e00a1 SHA512 e30e64371f7a5f5fa506396f2edbbc7f862a585c7fe9af4f6fe63e99d4bbe9f9bf3a1f002a62c40ab9d75bd90ab99446bb80bf7f2fedf5b37287eeb54e5dacbe
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.5.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.5.0.ebuild
deleted file mode 100644
index 5f33bd8d91e1..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-9.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-cinderclient/
-	https://github.com/openstack/python-cinderclient/
-	https://pypi.org/project/python-cinderclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild
index cab20f180eb5..5f33bd8d91e1 100644
--- a/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-9.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 04473b771a48..c4bf87845885 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-keystoneclient-5.4.0.tar.gz 324151 BLAKE2B a086432c7fe81e6b39661f2e582e5c81efde88f04ba9e8e4fca17d4d217cb67a9a7cc38087e41a2b47e5b4540245a2586436c31e9596a2c520ad3e3219ff9b0f SHA512 496c321cc68efc3f7eaacfcef39ce3a4e669ab816245e6d4afb8e06a97490eafa6f16135a2c957bfdaecf9fe12577f0ecb6a97185844d376e41d22beee190475
 DIST python-keystoneclient-5.5.0.tar.gz 324070 BLAKE2B e901a44285b6962ff7cfa499460bc93ad58263c9f033c39eee3a6f241592e46b3078bf180b3581f2a6ecf126fe052bce862b45c84a169370c11847720f6299f1 SHA512 f9e6300af0fcae0a1eef6b964a81ab16cc164afc51c5b6f2dcb2d391f7934b2a937554af20985311f7e74d6794e69059dce4ba0e2cf972b6f47a76272a274ed8
-EBUILD python-keystoneclient-5.4.0.ebuild 1727 BLAKE2B 34815b309d26ff0d09039da237bc9c74df1edda7ed75530a922feb41a8055746c7901a672cc5b69bb23d664c1694e79db50038c0673ddb02ed57f2f6538e9338 SHA512 2a5bcc338bf32f9e1e5a5227e529faa09cd44b191b7f45cd173b6b78b80cc09079b070c095400bb54fb3c9ce99f08d351a27e7122d3f0da16886349e59228f3e
-EBUILD python-keystoneclient-5.5.0.ebuild 1730 BLAKE2B 73a42af4f96b2092c746935899a889bc792c7ade3ab8809dbcf763b71f067c19056c0e5bf4a861174c4035a7ce4b65bd1412e851e3bd8ba978b8c4444001feaa SHA512 14d70ef0a757edc0b5c6737db1d6ec8ffaba14deb7f236a4b9c3305b8ddd812adcb8203cc46084fa1a530b0428f56dc3267f57125b7c36f3c7f88872b81f1c2a
+EBUILD python-keystoneclient-5.5.0.ebuild 1727 BLAKE2B 34815b309d26ff0d09039da237bc9c74df1edda7ed75530a922feb41a8055746c7901a672cc5b69bb23d664c1694e79db50038c0673ddb02ed57f2f6538e9338 SHA512 2a5bcc338bf32f9e1e5a5227e529faa09cd44b191b7f45cd173b6b78b80cc09079b070c095400bb54fb3c9ce99f08d351a27e7122d3f0da16886349e59228f3e
 MISC metadata.xml 667 BLAKE2B 47026519bc6a282a39e2503fc0fe2ebb54902ddf8cefac20f36e13c5dbe6589bd245588e461ff958d8b6e16c58e4d07f0937484da0fe438e4ac5367c9957efdd SHA512 df9d8fc8aebd726b4dbc63548a573352206dc92cf2db1520e558ce8bf1635ecab36589e7fae0bd38e34a62b16369ae890855b0f0390a0182e20a28ca8b48a635
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.4.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.4.0.ebuild
deleted file mode 100644
index 0fccc15d7ace..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.4.0.ebuild
+++ /dev/null
@@ -1,56 +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="Client Library for OpenStack Identity"
-HOMEPAGE="
-	https://opendev.org/openstack/python-keystoneclient/
-	https://github.com/openstack/python-keystoneclient/
-	https://pypi.org/project/python-keystoneclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild
index 4ad8f7c3e138..0fccc15d7ace 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 41b1b82749be..339435c49cc0 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,5 +1,3 @@
-DIST python-lsp-server-1.11.0.tar.gz 113347 BLAKE2B d8417fb63447c5130d88dd6583ef0dc0c724076b22006a59da914a10440e67a4fc2362fd677a45b257fcca804c965920d54ff47568ad607e49f05d13d6d3e1ee SHA512 bd96850b822dc3c2e97d5ee38f25c9f7731dc68b31fedcc2d3e0ff373bc3ad8a989f1a4b85527477bbbc875e853d5513d8583bc3cdc22a3c0545716e68382093
 DIST python_lsp_server-1.12.0.tar.gz 114328 BLAKE2B 3c94642be615822058debda5cb9de07529e7d269938029d66ade7eb7db801e7db90ae724f449e1133a813967e94bcfc71247f0392db1c495af5fff89ae66bd03 SHA512 74cbd8012f5e027fb117105302ba92e142900e88565d7f95d2dad72f2624048fff3c2c85085b648bd1ff86f6f6eb679aa34d5f6d9ae54b80e96b6ed472785b32
-EBUILD python-lsp-server-1.11.0.ebuild 3002 BLAKE2B bf331ae190cc586baf6d7abb613e0e843c949fe854dd3437d74e797e0ef9945d83c59c209ccae32f56d97ebac2a85efc650ee62bbe1442a6c435fbbf4e6a1428 SHA512 dc42c7682cc24c65cd37b8d73a8898d7a27c494fa47fe3f1f1c6aef5386591082f531eeab5dde661ed2b6e3e71ddc51d6e17143904d4c6de3bd3da4ac1377807
-EBUILD python-lsp-server-1.12.0.ebuild 2599 BLAKE2B 5df2baf310de4a8d176d1a07bbec9e0b54fb85f115726ccee487b282b7458fbdad2cb0fcea4413e4909625cc31137668ae304584743d0f472da99c28db57b6c0 SHA512 8073003457d9b71cb85ed94fa72395f3e72e989d05c3a4caca402f5c35543f4ce8b153db58842d6c64c0234d590c6eb2e1230c955e948c192562eb14aa7e2da5
+EBUILD python-lsp-server-1.12.0.ebuild 2596 BLAKE2B da2623e0de733a8834f7aa35a6c1523ad9b7903f0c9c650ec8fb72fe18fb74805afd9bfbfd9eb45a02ddf6a89c31c06f0be7c6b1b4e86757eac532607e0e3274 SHA512 e8597bd02a32ed9d3e1a2fa5db4d671dd7a280c168fc3f4481eb79b0898dce4435a303370c5e468418a162818af42e099f4c9a8a3cb6d56ab7223f823d2ffe04
 MISC metadata.xml 610 BLAKE2B e111007adc2612409df72955babe0c4725fd5726449435988cf13c1142049d78089d38e54783712e2c70c74437157ffb2049bd9d63322cec084204eb5038e724 SHA512 5e1e4b43a5bfacb6a2fcae57413ebf79c6aed917b00022140d855acd773d82e56b2d73ae8270d42675a34d9f37f9ad53c8f61930c3f447d8a9e45a521a20e9bb
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.11.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.11.0.ebuild
deleted file mode 100644
index 5b8d17ae376c..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.11.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-server/
-	https://pypi.org/project/python-lsp-server/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="all-plugins"
-
-RDEPEND="
-	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.1.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		>=dev-python/autopep8-2.0.4[${PYTHON_USEDEP}]
-		>=dev-python/flake8-7[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.11.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-3.1[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-1.11.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-# Note: xdist breaks some tests
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	# unpin all the deps
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by presence of pathlib2
-		'test/plugins/test_autoimport.py'
-	)
-	local EPYTEST_IGNORE=(
-		# pydocstyle is archived upstream and broken with py3.12
-		test/plugins/test_pydocstyle_lint.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
index a0372d60453a..1d8ed7d545a1 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="all-plugins"
 
 PLUGIN_DEP="
diff --git a/dev-python/python-snappy/Manifest b/dev-python/python-snappy/Manifest
index 8a8be269941c..68f04e9e7f24 100644
--- a/dev-python/python-snappy/Manifest
+++ b/dev-python/python-snappy/Manifest
@@ -1,5 +1,3 @@
-DIST python_snappy-0.7.2.tar.gz 9108 BLAKE2B a0f23b286f97de2d61afc51dcba188d77d0c0099b7cba26c7a0e2bc4da41045fc6a4a95d3adf3ef80d16300a7d35a66955552cf5693c0a0a38b73478b864d266 SHA512 c585e9e953c2bf2cb7d3f24ae9745d267b334d681ca44b7d842de2405df19b24af0f6915f0274de2a86e74fdcfef3715e5c27765243d84459216476c31aaa437
 DIST python_snappy-0.7.3.tar.gz 9337 BLAKE2B fbc0afbf01cb97b00855e94d3f13b8a3c92dc4a6ed6f078f1838ebb90c6643548477a880c910b07a2d5a7ee59d260be6a9dfb53719c34b7884b2071724154d85 SHA512 bb4cf220a3819622038e7aebf5100ac5126b9d42db15f4e89bd123088d1e62bab56488969adccea3a45719d760b1ed77f493051859f90fb8fc397cfe0661dd74
-EBUILD python-snappy-0.7.2.ebuild 547 BLAKE2B 5044828a80b49b07c94fca5acff0b569c3a84e9e6bd3fd2207ef46b79f37e435ef7b2f30ec645dc78401564626bbb17c136c7242816eeb76041021c0a5c1f9e6 SHA512 25828bceea30e4a920f641fbe798dda14fabe7158b3e26dc9d3e193cbfc18fcf92744511b4301e46288baebd53f780701b48a492d9942c1a28a6ebb9fcaa0f9f
-EBUILD python-snappy-0.7.3.ebuild 551 BLAKE2B c540d54b00a19fbaaa7cd6385eff084a4408bf5ab7a0bd5fa164450cfb53d0a11785dde33081d1f8be240566ff77a3f9db53a4d8e2ce84ee59e9b8da72a9d9a5 SHA512 a6ddc06194efb6faeb96329032765aad6bc2e184da17cdb5b6812bf6c11b06e7cf55a2c0d33cc78fe8a5bcfb2383aa94ef98ff82ae9dec350be43a2c04d8da50
+EBUILD python-snappy-0.7.3.ebuild 547 BLAKE2B 5044828a80b49b07c94fca5acff0b569c3a84e9e6bd3fd2207ef46b79f37e435ef7b2f30ec645dc78401564626bbb17c136c7242816eeb76041021c0a5c1f9e6 SHA512 25828bceea30e4a920f641fbe798dda14fabe7158b3e26dc9d3e193cbfc18fcf92744511b4301e46288baebd53f780701b48a492d9942c1a28a6ebb9fcaa0f9f
 MISC metadata.xml 377 BLAKE2B a539bd7584f20f7cf958969645a9c1898d7fa415d5fbab3ed0062513bedfc516342ea7d889ccf7d4f6c3eff3f6006a33355fcc9165f105f9748bc078408bfeeb SHA512 f2fae6ee6ff65e8aaa78bb2ddec004589d4ea4c5ee724fb56f009c20080d24591e64a24b0cc9b99bec04ea0d27bf92ac0aa35ebc9a4433cb2bff8ed56891d697
diff --git a/dev-python/python-snappy/python-snappy-0.7.2.ebuild b/dev-python/python-snappy/python-snappy-0.7.2.ebuild
deleted file mode 100644
index 5e880843c1d3..000000000000
--- a/dev-python/python-snappy/python-snappy-0.7.2.ebuild
+++ /dev/null
@@ -1,25 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="
-	https://github.com/intake/python-snappy/
-	https://pypi.org/project/python-snappy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/cramjam-2.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-snappy/python-snappy-0.7.3.ebuild b/dev-python/python-snappy/python-snappy-0.7.3.ebuild
index 44d2eee97a7e..5e880843c1d3 100644
--- a/dev-python/python-snappy/python-snappy-0.7.3.ebuild
+++ b/dev-python/python-snappy/python-snappy-0.7.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/cramjam-2.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index fd9728dba219..e5a5744f1b86 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,5 @@
 DIST qtconsole-5.5.2.tar.gz 439219 BLAKE2B f354d3e6132142a3da52a1cb6b290d0a07b13920bc9f33f7fb29eb307cc5b653beccc5d28e53f7cbe7483147adb6e34ffc584718a79b814c9ce2c37b57a768fc SHA512 f79e51903fe5a1164a90c0905c308d2bce066bef2c61fed2b5bb7e757a9cf56875cdd14665df9284317497cd73bb544ae09e0b23c63b527bbd4bc90b874009f6
 DIST qtconsole-5.6.0.tar.gz 440531 BLAKE2B f8d9e1ec45f310152b2c779df71c048ce6f704f8a9f366b6ed415a3dc8988553f45c4ac63fa08425e22124048e7946a4b40aedbbb15e90306bca5138426d91fe SHA512 ccd8f7b87d218237827bd52afc160cc8c00e9feecf90cde39aff55509831bdc9c4799499c91ed13538ce52a4011ed289f194662eef55b98efe09a2b9a5bd5427
 EBUILD qtconsole-5.5.2.ebuild 1684 BLAKE2B 9d2984a34b05203ddf430006d94e800474aeb880c2a0e16eadde409dbdc8b5c74da812abedac79e934239b5a68a527b34e6be3ffd658ea5ec37632447d792c72 SHA512 84b1a81bde38bc3f40249abc73f61ec9a8dfe7256e491b1e7265ed72c3918291a78a72935c3b902d22908192988b594c0511b5ece35635bfaf18fd77364f7358
-EBUILD qtconsole-5.6.0.ebuild 1644 BLAKE2B 475e93a4e76e18aa6aa1be266a354669391ae01a5372ae89433cc06c8ca73cf2986925e61bcea572d544b3b0d4c88d7cd2fd9d09181e4ece32cc3999ea18f021 SHA512 1b018e998311e362712126c98003fac7676a19d6d442a69600b972697a6104ddda31109b50ebe2710a46d637365222c7caa6f7bd5b96628c3b9b5523b23277fe
+EBUILD qtconsole-5.6.0.ebuild 1641 BLAKE2B b9d7f9e104ff8728c95905bf035076d7e800a6caf056bebc0e435347359de442f9263a2a7c44d6e7618adee0b4eb4f9a1b5695970f1c15e2338850801b80db55 SHA512 c731c921901bcd2b891956654ff01312e3d66475bf516ee61000e40f7f5ba4202f1533862fcef8abdd73c2b3c9bec7d08ad88727529c7305a56b06bb797da54e
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.6.0.ebuild b/dev-python/qtconsole/qtconsole-5.6.0.ebuild
index c9b6137a741c..bb20cd7c90f4 100644
--- a/dev-python/qtconsole/qtconsole-5.6.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index d4a7b3a430e7..45f7d090eeba 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,5 +1,3 @@
-DIST python-quantities-0.15.0.gh.tar.gz 91327 BLAKE2B b75371e99b0f270d97cf6e9b80df1e7a0afa8ae8eb5d18750196e9b874737d58d3e3189ef9fdca4b312d24a19b406fe21f7eb304f0c1f11987873528190ca2e4 SHA512 987fb30d25a7b14e681d6eb963fc2cc68f954d017eca256739e897062249fce606adcb3224e3c8f0d371e49904caef7171a9a8ba4a7e60baa2fe063004846439
 DIST python-quantities-0.16.0.gh.tar.gz 92228 BLAKE2B 2570b50a983cf1e84fc6df0590a2de251f671d15af06191c4fbf673c7bb75ec419e04f7bcc1a1730f87ed2269b40d707aa6a1103d1238421c19b939f2bbc7f2b SHA512 592001add7201868844197e67ac3a200d4a82c11f02c0d2ce4f007bda5b8c66c29c0f30563da7fd214c3aede4564590b1de9e29b2e9dac0a77a1db0b410e750d
-EBUILD quantities-0.15.0-r1.ebuild 1000 BLAKE2B f6590a89cb04ad2117df7455dfab4fcc4af9333cb26488e4b3dc0829e165849ee80d0fc3922f0877b0a7f5a8aa7951edfbe0249f75d9466bc6c223b4b4762f1c SHA512 b355b2beb0649913d2995b7215a03803bfad49d6c12b76bbcb5bf5e1f7e6d089dd86cab19c6041b85b5ae9c185db16a845a4036f4e3b96487a30d414b80305ba
-EBUILD quantities-0.16.0.ebuild 844 BLAKE2B 332b72e4581f966e7882eaee28b9548ad587cdd8ccd63e8afd05eea4807777d9825f9b12f3e018d87dde7189ce36a5dcec4fa16ffd99d8677ae9b1d2269c34a6 SHA512 111570ba92086c605b668defc5967a364a66d1951a86b94a2a8ba993ef48aee5f72ca04885b7663886358ec5e37c9c08724000fa65c501b2551c2ca5d0a0183e
+EBUILD quantities-0.16.0.ebuild 842 BLAKE2B c1a03899b0d49c4eb05626793895a44d6c2c86faad5530124dcbc950ff488f967cb3104177bdfc96b1f5bd9f8908b0fbdf8b1432f57a780ed2905c0b49c10add SHA512 634f8abeae66f63daa31967f76384a1f7bb2e8e240a5c4b54b11a17708f1672ffb4001333b1104d1b5279805a9750c5e14b4dff7c760e649bc59ae4b0367aaab
 MISC metadata.xml 645 BLAKE2B d6965f033a9f7b6e78c5b2dcadda6a036ec1becac8cdd4bf3a7d2a7d0739cca4b51c29f874eebedc963d5a54d1906dc18a8ba628e44b4d3d12c81c91f6f97b29 SHA512 d2f88066eb81f72611dd94b323c9d42dbdb02d0953cb43a06b991bc7b134cff85d86979aabc155dee463645ab984127bdebfa7ca125ba36febaea451dad39143
diff --git a/dev-python/quantities/quantities-0.15.0-r1.ebuild b/dev-python/quantities/quantities-0.15.0-r1.ebuild
deleted file mode 100644
index 7a00fb00b973..000000000000
--- a/dev-python/quantities/quantities-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="
-	https://github.com/python-quantities/python-quantities/
-	https://pypi.org/project/quantities/
-"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# >=dev-python/numpy-2 is not currently supported,
-# see https://github.com/python-quantities/python-quantities/pull/232
-RDEPEND="
-	>=dev-python/numpy-1.20[$PYTHON_USEDEP]
-	<dev-python/numpy-2[$PYTHON_USEDEP]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	epytest --pyargs quantities.tests
-}
diff --git a/dev-python/quantities/quantities-0.16.0.ebuild b/dev-python/quantities/quantities-0.16.0.ebuild
index e30d4a40296f..ae7845115965 100644
--- a/dev-python/quantities/quantities-0.16.0.ebuild
+++ b/dev-python/quantities/quantities-0.16.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/numpy-1.20[$PYTHON_USEDEP]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 1adc9b37c1bc..4b25389972bd 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -4,5 +4,5 @@ DIST selenium-selenium-4.23.1-python.gh.tar.gz 77116002 BLAKE2B dad444b109d2494b
 DIST selenium-selenium-4.24.0.gh.tar.gz 77126013 BLAKE2B a909714b93b0cfc92a9d70d8cf20609eec65ebce3470fe487a23c86ac4f6f3dbf2e2ef88e00883999fe8b5e2842a05039fec94f6617961c436649baa618c59f8 SHA512 bc6f8066efba5a4f5a27abcc37eefa303e9efd89423729fedb4f466d98ed57e68c8593248206e4fc13cebd3446fa25a5a856d5f4c1d05940d73cecc920b4c522
 EBUILD selenium-4.23.1-r1.ebuild 4198 BLAKE2B a6491668cf8da465c3c221de03915bcfc6f8df88397053b65e69b4de6e682a06e5d4be088bc3c155c34cd2b079a43a57961cbf503d1bf0c082b6b8f4b37bba1b SHA512 b93f162c60fdf8ce7ca996b4bf6b84a9477cc8d9a6329b109f9574152bcb0a61e0ec5cbee80d4db5a9b5270d4e8f9dd52410f5cfb6897546f0cd9f9afd636712
 EBUILD selenium-4.23.1.ebuild 2258 BLAKE2B 9efc8777585aa514202b530c579cca4e79d95fa4062b9fbbe6b3c0549308be0bfe812fd21d5fb182c8690d2194b7f60fac29e478efff3a196588f8e6eba6b7ae SHA512 1d69b5fe837a5be4bb066abc4dbec846b1d09ac40997079fb8915fb4c0629be1f406d3c32222d7eb67a7b2952097be3187029eb7250a0057552c85eefe5dc6dd
-EBUILD selenium-4.24.0.ebuild 4201 BLAKE2B b0ed725b0b4b250aa95d2decb5035cee2a35e7f10579b8524f1b7a05b1791b865a6d23891247ee05aac3088794b01b1c6937c6f57f0569317d751aa2d6d8ee87 SHA512 35d3ccd18f33d22336bceb9af0fe90e6011db93e17b8f40f043ab827a6cc34a150ed30d7bbb02e0ccf3f3ed1167af521cca1ef09fbec1feb6414e6f155fa0482
+EBUILD selenium-4.24.0.ebuild 4199 BLAKE2B cc62cb11c2713f62c93da0df1129eba38fed705092b0ea6fd68e068c8c28c1d6bfdac7cff5b2ba9d425fcebdb62e76678b49c1839fba6e75af528f413537ba07 SHA512 5e46eb8c69af06b42746db9dde5244261a1fa9b407f25e72da551e72ca1fe263c9aae4f098c79fe7191b62463d36ae7a36f513a51791f63afbb4510907b043f0
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.24.0.ebuild b/dev-python/selenium/selenium-4.24.0.ebuild
index 546d13f5cd0c..5f72269b4bc2 100644
--- a/dev-python/selenium/selenium-4.24.0.ebuild
+++ b/dev-python/selenium/selenium-4.24.0.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.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"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index b1d724e50708..69fe28746b12 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -23,6 +23,7 @@ DIST sqlglot-25.20.1.tar.gz 19429085 BLAKE2B 65162c038fc19fe28e6cbd278d963477f57
 DIST sqlglot-25.21.0.tar.gz 19431993 BLAKE2B 43fb5883e12f223d7d62d61b79b101baeba6449187463fa09fa18ed1a54d24cfdcb7684a0d8182c74ea632a6b6e6bcb1ac3037115a1309687b5f6970c649b72f SHA512 2a6e785eb6f0e5aca7fb09988156eda2681ea233094df4d9a99af900a53ebb26ef804c4de59f7f7a7cbb1ed12afb6d7123fb228690cf41937baa509317ba15c3
 DIST sqlglot-25.21.1.tar.gz 19444895 BLAKE2B 74e8ee2945e5bd113be3f16146893f9a00b07c62256cb2795044be157570620e229690eb5cab72404d485b7cbf281309a6aa60e45491f6e333ca47d0900e4471 SHA512 fa9eb6280fabce96fe40945ed89df3414ba203540f71083952afa6a53ee26c90eefd4a29d9a026a2fe96edcfa7f5fcb7d570815c02d2d21161598838b1d7ff6f
 DIST sqlglot-25.21.2.tar.gz 19443387 BLAKE2B 664f6d2a6d45a1313a6f047d4f86c69e265c3071a49fe4e6d8a19df4ecc8698491737c5d24ddb336064c6c6ba0bee7839a698f15584730881c206eeef9393f48 SHA512 e0b7d28ebf7504d066258ea14dd150961c7f415a1835f45b9606710839a6ebb710c74638af55ee51ba9ff7316ae9eef9447edd6bd07afc480af29c469ca119b8
+DIST sqlglot-25.21.3.tar.gz 19444383 BLAKE2B accc37e7fc817e94b33a5bf3139637c8df132259375b42fcafce051ff9aa85631a0e5d677ce21e439d38ee90425187da45bdf4641a3d80a300d8743827b85180 SHA512 87d96a29c266f81c2a114a1ba4d8bfe221cc406c8994c77f0a3e49a91351e4ce97882d625a55cef891aa5786342a255c13ca5fddf9d613bd9f0d3516c3f65b8a
 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
 DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -39,4 +40,5 @@ EBUILD sqlglot-25.20.1.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f6
 EBUILD sqlglot-25.21.0.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
 EBUILD sqlglot-25.21.1.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
 EBUILD sqlglot-25.21.2.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
+EBUILD sqlglot-25.21.3.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
 MISC metadata.xml 611 BLAKE2B 10bf684677182565c9932d51ed9b3b9c80d376d6db945bd7b0dd0d9a19a85dc0d10cb169ff2048ae5f7f73d0f438d259b6231c13c525b5374ec99377f4ffdd10 SHA512 2b26d0f77962807052b94ad78addcfdce9859042af3be34df267dc6e70b6231dd779563935fd21955cd8646fd0cce3fee8c939387ac8056194a0b777743dd2ae
diff --git a/dev-python/sqlglot/sqlglot-25.21.3.ebuild b/dev-python/sqlglot/sqlglot-25.21.3.ebuild
new file mode 100644
index 000000000000..456b6e98cfce
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-25.21.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+CARGO_OPTIONAL=1
+CRATES="
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	heck@0.4.1
+	indoc@2.0.4
+	libc@0.2.150
+	lock_api@0.4.11
+	memoffset@0.9.0
+	once_cell@1.19.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.9
+	proc-macro2@1.0.70
+	pyo3-build-config@0.20.0
+	pyo3-ffi@0.20.0
+	pyo3-macros-backend@0.20.0
+	pyo3-macros@0.20.0
+	pyo3@0.20.0
+	quote@1.0.33
+	redox_syscall@0.4.1
+	scopeguard@1.2.0
+	smallvec@1.11.2
+	syn@2.0.41
+	target-lexicon@0.12.12
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+"
+
+inherit cargo distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+SRC_URI+="
+	native-extensions? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+LICENSE="MIT"
+LICENSE+=" native-extensions? ("
+# Dependent crate licenses
+LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
+LICENSE+=" )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	native-extensions? (
+		${RUST_DEPEND}
+		dev-util/maturin[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	# remove fragile timing check
+	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use native-extensions; then
+		local DISTUTILS_USE_PEP517=maturin
+		cd sqlglotrs || die
+		distutils-r1_python_compile
+		cd - >/dev/null || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# timing, sigh
+		# https://github.com/tobymao/sqlglot/issues/3961
+		tests/test_generator.py::TestGenerator::test_generate_nested_binary
+	)
+	local EPYTEST_IGNORE=(
+		# Tests require pyspark or duckdb which aren't in the tree.
+		# Pandas would be a requirement normally, but it gets ignored by proxy.
+		"tests/dataframe/integration/test_dataframe.py"
+		"tests/dataframe/integration/test_grouped_data.py"
+		"tests/dataframe/integration/test_session.py"
+		"tests/test_executor.py"
+		"tests/test_optimizer.py"
+	)
+
+	# make sure not to use an earlier installed version
+	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
+	rm -rf sqlglotrs || die
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 1ab7e6050191..197419aa6f3f 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,7 @@
 DIST stripe-10.10.0.tar.gz 1313050 BLAKE2B 6a37c70d8faab0a23a52505edf722cbdb8b40f89fc2bfd9d73ce94c3c40877ca6080ac4f8973d9ac01fd7a1d67f8e62366b3dd498673fadbd29e8dbd3a0c1d8d SHA512 1049a27f07c0fb870735786cf8e971cf91095f3799e094cf81e3529839f1710f10133ccd20d2cfe249c460ee7753cb255e876e864e56ac1bea7f280771df197c
 DIST stripe-10.11.0.tar.gz 1317883 BLAKE2B fa533f6a3ab66a844ff16513ad8cb8b6a8d87677fa01ea93c406cb229577456ccc567b63196c3616878a1cb78c5b91e56ac9fff8d53e0b961702cbd65ab9024f SHA512 64b6adaf3eabe77ab863fe3ef2e0d20d6cfa0e266bb58cde0b0d2edd87dd240a0a8fedf11c35252f3cc6cd517cc767b2c4714facc29475597270e7a143e091dc
-DIST stripe-10.8.0.tar.gz 1312236 BLAKE2B 72c8c111f86388a0e19ed5c5688ac8c8e5437251b1972aa4316dadccbecad03ad7db625c73110d6c617553eae15e1a5a7c571ff209ffa1ca4fa40f091c171361 SHA512 520df4a0866defc2efdaf4ad0aa5351df04669e9283298ff862a78f4d5894e5422eba48b4bb0654e1a1a41973dcd245bc4e37c3166210135c5864470fc0f7db8
 DIST stripe-10.9.0.tar.gz 1312738 BLAKE2B 6be3b40695842c164620a8abab4a8753c44cb68dcd39b7e8f62e5a359ae5ffa0faa6a8890a1b0965dd1b1f32c95fa857abe44003c94043d2e76c59a9d52fc152 SHA512 39946c7efcf7597347835495f80810987f6812be337b2f9d84bebe029b2f6d326c9a73ef0c06f3c86786f59a1fb7d227e6a0cb800b8101216df6d0fb05709ea8
 EBUILD stripe-10.10.0.ebuild 2482 BLAKE2B d41cf1130ba524c02435e623798554a866081bd5b1932ad5bac674b789ae68df6cb444b3a968ab13cefd73da7205c69860939f4cebdc28ad62680cea45dd53a9 SHA512 ece77ea1c315f239297549734c61b1e9645ba881bc2eb487ebf50cfe213f847e3fbc5551a148e8ad2d43db5ddb66e1d05d49732192204ee94881b1cca7d2b7e7
 EBUILD stripe-10.11.0.ebuild 2482 BLAKE2B d41cf1130ba524c02435e623798554a866081bd5b1932ad5bac674b789ae68df6cb444b3a968ab13cefd73da7205c69860939f4cebdc28ad62680cea45dd53a9 SHA512 ece77ea1c315f239297549734c61b1e9645ba881bc2eb487ebf50cfe213f847e3fbc5551a148e8ad2d43db5ddb66e1d05d49732192204ee94881b1cca7d2b7e7
-EBUILD stripe-10.8.0.ebuild 2479 BLAKE2B 8ab9df0009ae15ca658d143fb49e9d9f8507549074fae6f947a00be821a16d859f48c4faef9e5803ebbe64e442bda7bcad76e81999c8d599f6f0944230e18365 SHA512 aa50f6adfca871d93e842005baedbcd538e1a7879d4e794d0a7a71f169095c49410e99b68a29f306ea70854f5e31fdedc9df1f10d78e5d4b1f7a641180ae0f6e
-EBUILD stripe-10.9.0.ebuild 2482 BLAKE2B d41cf1130ba524c02435e623798554a866081bd5b1932ad5bac674b789ae68df6cb444b3a968ab13cefd73da7205c69860939f4cebdc28ad62680cea45dd53a9 SHA512 ece77ea1c315f239297549734c61b1e9645ba881bc2eb487ebf50cfe213f847e3fbc5551a148e8ad2d43db5ddb66e1d05d49732192204ee94881b1cca7d2b7e7
+EBUILD stripe-10.9.0.ebuild 2479 BLAKE2B 8ab9df0009ae15ca658d143fb49e9d9f8507549074fae6f947a00be821a16d859f48c4faef9e5803ebbe64e442bda7bcad76e81999c8d599f6f0944230e18365 SHA512 aa50f6adfca871d93e842005baedbcd538e1a7879d4e794d0a7a71f169095c49410e99b68a29f306ea70854f5e31fdedc9df1f10d78e5d4b1f7a641180ae0f6e
 MISC metadata.xml 673 BLAKE2B 6b85b1f88713d2365274fcff21648748039b48028b3c34c1192e16ca12d0f3b4d14ab13c7c2a744c381898ea0c1304bda8be52d3fadddc1a1b787f010b001398 SHA512 e3178927a69d14f59673acc5eaedda59db5a07e2145ed6fb0597363b60183cb3e7a7b0feefc1d4c9095d52ed96e0be32ef5dc23ad0c20fd6e6b33c830177c0be
diff --git a/dev-python/stripe/stripe-10.8.0.ebuild b/dev-python/stripe/stripe-10.8.0.ebuild
deleted file mode 100644
index ffd0cdf1d337..000000000000
--- a/dev-python/stripe/stripe-10.8.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.188.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-10.9.0.ebuild b/dev-python/stripe/stripe-10.9.0.ebuild
index dce53ce91aee..ffd0cdf1d337 100644
--- a/dev-python/stripe/stripe-10.9.0.ebuild
+++ b/dev-python/stripe/stripe-10.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index f7b11749d819..054114d0ea99 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,7 +1,3 @@
-DIST types-setuptools-73.0.0.20240822.tar.gz 42177 BLAKE2B 71b6edc781ee90d02e0a14b47aaf130a1ef5d07a081047af130593569c60904a19d0979ccc46a1e0b0efa1b0892e653a9bd0232a8b90b0977500f16817b7f0de SHA512 57c0c807f0d10a92c8bf3a0f07cd506706e2c0924f16e12a77b9a8720f732861abdce03c17cdf3825e185fef120667e694cf651d074623f3a1dc364d94079e5a
-DIST types-setuptools-74.0.0.20240831.tar.gz 41726 BLAKE2B 2f69d9d6fd82b5e514ef789028e45305068dce801082e9247d8761e68090c8e232ae377ebcfeb082b718f9ac882ec4aa0ae34ef53ed4dff240da859c28e9cfcf SHA512 35fe7e34cd65ae8dae67cd23668221ae0ac1e9c73f422ae6f03e5a101aa1c6af66d3b1f396b0c8fa88c69b07eab3ae5483964969e786d15f82983cedac7cf2fe
 DIST types-setuptools-74.1.0.20240907.tar.gz 42970 BLAKE2B 06ceaba13ee061d231a0c02196fc97b3e64a7a13d9a728ab0cb5cab728d8944b2ebbb73d77b6c5d805f7fe1cc5f2b34dcae2bf62a12e27d265cd03507092d31e SHA512 623e5904e3d102a603feaa88ac7a4558a06cfc8e25888c013352d3016efdc296fd7dd343466cd646ccc41d9d6c65e789467eb309a5946b282110550589d1126f
-EBUILD types-setuptools-73.0.0.20240822.ebuild 440 BLAKE2B c734df29e57433a7e8e2325687fb52987edd825cc42e801f8fb8fd77f870f1de03e3d776df8ca52530423e298af5bf4fd1b3b5edec322c5e8556c4ef7fa9c90d SHA512 292081f2e1d3e3c8fa152a361d7c1ecfac6222dafced339663b7a5a40a5bb40e4fca30a18a3028cd9189c2c63797e2c6cafc3110d06478cb33382ae853d7f72a
-EBUILD types-setuptools-74.0.0.20240831.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
-EBUILD types-setuptools-74.1.0.20240907.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
+EBUILD types-setuptools-74.1.0.20240907.ebuild 440 BLAKE2B c734df29e57433a7e8e2325687fb52987edd825cc42e801f8fb8fd77f870f1de03e3d776df8ca52530423e298af5bf4fd1b3b5edec322c5e8556c4ef7fa9c90d SHA512 292081f2e1d3e3c8fa152a361d7c1ecfac6222dafced339663b7a5a40a5bb40e4fca30a18a3028cd9189c2c63797e2c6cafc3110d06478cb33382ae853d7f72a
 MISC metadata.xml 399 BLAKE2B 6e130dc38e0e0e0e6e02567d750d37c6f28ea40c4742a9247f347f29e1700fc420015e7ff951f4a11c156c2df88d7e3b7f03be7759d05872a7783a2d25e35b1e SHA512 bbc9cb552e652e7644d4d635cfd74fdfffcf6426160025411843d53d37b02fdd65f7e1fb435fee7b628033cef517e3f5a902466b5786b842592ccfad068edc15
diff --git a/dev-python/types-setuptools/types-setuptools-73.0.0.20240822.ebuild b/dev-python/types-setuptools/types-setuptools-73.0.0.20240822.ebuild
deleted file mode 100644
index 7868f39fe54a..000000000000
--- a/dev-python/types-setuptools/types-setuptools-73.0.0.20240822.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-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="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-74.0.0.20240831.ebuild b/dev-python/types-setuptools/types-setuptools-74.0.0.20240831.ebuild
deleted file mode 100644
index 50edc0c91a3c..000000000000
--- a/dev-python/types-setuptools/types-setuptools-74.0.0.20240831.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-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="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild b/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild
index 50edc0c91a3c..7868f39fe54a 100644
--- a/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-74.1.0.20240907.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 0376c183e380..a92b5e15c13b 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -78,5 +78,5 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 EBUILD watchfiles-0.23.0.ebuild 2662 BLAKE2B 6f2047f2c2d8a0cdf2dea20522b803b6b5a0ddb9eb339eb8ddfe03a0ddba9d15bb135c50bc4dda51aff362d3a14f09648a728250df14557d4a3e992024133245 SHA512 af51eb0dee88edcc8bd9920e7bdc9c415267c56345d107752f6c7d6fe8affb9224ce08289fe3430d5b2e3dd40bcc277e25d6af01645dd21b8e4e926967cf4fac
-EBUILD watchfiles-0.24.0.ebuild 2981 BLAKE2B 72adc1dba74ad3b1c3e019bd123db129f5965857bc87e5d76685989450e314026c24a18a38f4d4333568fce8f9a88c424093caad1d8235c015e22609e0ade9d3 SHA512 bef206a8bc81eb1f0f348141e181213f6615b539384d3ebae7e44f948fe91ad6d7fcef42a3298e40d9c1be42878e5ce82024ad688ffeb3a890356fbb2ee816d7
+EBUILD watchfiles-0.24.0.ebuild 2975 BLAKE2B c81b616581ac976cd03085fabe09e181fe34b97c1a7b752761d3fe304b8ff7357ffa24775e928b513aa6f6e57fdeeab1638e7c56d4efdff7cedacfb08950c460 SHA512 6c1a7d8640cd80f4542388d729e3a72584c992cc464ae354623ab742f1edd10e6d5d52cfcecb4ea8f7bbdfb79e44cbcf98a0168138968afbf528a6ece18833c9
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.24.0.ebuild b/dev-python/watchfiles/watchfiles-0.24.0.ebuild
index d11306fff855..9f8f86a15140 100644
--- a/dev-python/watchfiles/watchfiles-0.24.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.24.0.ebuild
@@ -94,7 +94,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT Unicode-DFS-2016
 "
 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/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 361a94e7dd7e..4761a664c10b 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,5 +1,3 @@
-DIST ytmusicapi-1.8.0.tar.gz 283301 BLAKE2B aa0d0a8b30b75873865360dfe7b0aec436debf5b2e0f96f2d4008f5234d42802a3a84acd55f83244c03995d605718139f30cda21a798d23c841cc4f9a395d4a5 SHA512 5b7d3fef54eef586b007b6bb6f5c81aaf068302de2493fff8e6ce6bdd9387836615bfa9ecd10ce2516effe1707d11de55ad8a967562e8d6faa527c7e808c377a
 DIST ytmusicapi-1.8.1.tar.gz 283291 BLAKE2B e6894c0bede054e41c485ffa86eb6217d09cc3d619d9ec89777f3575325152acfce98467695dcc95d07e8bb4e3cd8de7c93ee9872373db1958eeb1cabe0ead3c SHA512 37b166e550ead565b752e466ab0ec0fd238474f669b79596a3d16626ed2480ecfe0066715c685f39376ed2ea528993ca2a0330b3c4eac9d4fcd096c8d4c20884
-EBUILD ytmusicapi-1.8.0.ebuild 520 BLAKE2B cda1a860fb0a1b9f837c1e36957aa77453ec72746a7c433e5127c0b3dfd2a27adcf4e56176aecff97b834d86fce98ea7cff2d391632950ed45f684076ca066cf SHA512 1548ad80bf5f264a616be9f242674e930d348ea1ba591b2f28fccdbe4758f87c580de15872546bb7285032f0cfb3466d3ca92d5d4ce615018bb8e9573f445c3c
-EBUILD ytmusicapi-1.8.1.ebuild 521 BLAKE2B 6810bdc354b952ed13e5573458953c417085690055c4f7088c3d02f59253dc7be3f43601f424ae0762d3046d0dd7b5a67bafa546e16604d955f16b067532b1a4 SHA512 8f591c50e80b33969c9492e5d24d6a7d54e215558fe29f54c7fbde50482cd2478b70def5990e09bfc3b0c81d799c995d5720f7f71d4a0d12e1ca4c9ba6950c0e
+EBUILD ytmusicapi-1.8.1.ebuild 520 BLAKE2B cda1a860fb0a1b9f837c1e36957aa77453ec72746a7c433e5127c0b3dfd2a27adcf4e56176aecff97b834d86fce98ea7cff2d391632950ed45f684076ca066cf SHA512 1548ad80bf5f264a616be9f242674e930d348ea1ba591b2f28fccdbe4758f87c580de15872546bb7285032f0cfb3466d3ca92d5d4ce615018bb8e9573f445c3c
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild
deleted file mode 100644
index 7ac6cd99eb25..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild
+++ /dev/null
@@ -1,24 +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="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild
index b1568c0ab835..7ac6cd99eb25 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.8.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 7725e57a45c2..7561467b5188 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,5 @@
-DIST zeroconf-0.132.2.tar.gz 170698 BLAKE2B 7c76e2a00571a19b23f288dc1183da6ce274ebdf3f64f323e282f444011f7cbf90a63e02a991936a2cfa2d227568b31444b8f61f1110588638d4e888dd8749a6 SHA512 686cdfd2f32c6bad03fb5fd287b1e22f2f0b5099a8971dcff1d9fca7e63bc8069b195feb97be710c20fae8c524ab92143e395cdfec26ede103295d1aa4d32a8f
 DIST zeroconf-0.133.0.tar.gz 171328 BLAKE2B 2a32186bf17120d2448383af252a4a47e83c5900187e841974fa7b1fc4ae70b1227cf5baf556f7d24650f75e6f27a6a4a5b4f2f797b47c55d5016d20a1263c1e SHA512 06ec5f4face3578a16a38ebd750c9f74cc38932e840c8615d597807a3b5781adf9bd5bf2f8b438df165993de4f429c45efe9f4751baf7d00b4ebabc348984b41
 DIST zeroconf-0.134.0.tar.gz 171689 BLAKE2B feac4312bc418ff8e703afe4248a2639d55c829ad4ff817d2b07da4b5e486ae4e4c09949522f0241831712b1217496155aae5a523797f78d5d9dea6ec784aca7 SHA512 1d0d9f4a55555f3a1c28ae5c446d6a284a29e35e0cae51d0c2ef7d86f9f55c5b175d644a086adbcc9594d2aa9875d41e9601668514f4b91ff251a77926ee25ee
-EBUILD zeroconf-0.132.2.ebuild 1408 BLAKE2B 015a112dd6a16d643d7351e9730e1b7eeb5fb177afb47e008376db45246f0f24afa829cb966e7450315046c3b07d159be487b5a1d4ccbdab79a7a168be1254a9 SHA512 cf1db8dde3188c51b484007d62f3d8a6e8c714046c1e45bf9c4d39c673071689bae4169d896f7f738ec9181061029fc27586474a1957ab08c5d47fba78261e5f
-EBUILD zeroconf-0.133.0.ebuild 1411 BLAKE2B 7166d82c05eb3fe373e6ba396797ec6fb1d4871ce736abf26859bdcfae044c33a5ca689d3db9ed2c927302671fbadede01c38b5df9624657b800ea2911c3fc17 SHA512 b4b8a38a57586f961a4c8a0af275e743abbaf35aa485c49c5826767dadca2e7eb56c9cfe61a2b2c39d88d6e513f9dd08fe617a51035c7cb65956777262c80991
+EBUILD zeroconf-0.133.0.ebuild 1408 BLAKE2B 015a112dd6a16d643d7351e9730e1b7eeb5fb177afb47e008376db45246f0f24afa829cb966e7450315046c3b07d159be487b5a1d4ccbdab79a7a168be1254a9 SHA512 cf1db8dde3188c51b484007d62f3d8a6e8c714046c1e45bf9c4d39c673071689bae4169d896f7f738ec9181061029fc27586474a1957ab08c5d47fba78261e5f
 EBUILD zeroconf-0.134.0.ebuild 1411 BLAKE2B 7166d82c05eb3fe373e6ba396797ec6fb1d4871ce736abf26859bdcfae044c33a5ca689d3db9ed2c927302671fbadede01c38b5df9624657b800ea2911c3fc17 SHA512 b4b8a38a57586f961a4c8a0af275e743abbaf35aa485c49c5826767dadca2e7eb56c9cfe61a2b2c39d88d6e513f9dd08fe617a51035c7cb65956777262c80991
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.132.2.ebuild b/dev-python/zeroconf/zeroconf-0.132.2.ebuild
deleted file mode 100644
index 014d1b6ea1d2..000000000000
--- a/dev-python/zeroconf/zeroconf-0.132.2.ebuild
+++ /dev/null
@@ -1,56 +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=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.133.0.ebuild b/dev-python/zeroconf/zeroconf-0.133.0.ebuild
index 42ef77fc404f..014d1b6ea1d2 100644
--- a/dev-python/zeroconf/zeroconf-0.133.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.133.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 0dfe9450e03b..1d07ed9745e2 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,5 +1,5 @@
 DIST zope.interface-6.4.post2.tar.gz 294539 BLAKE2B c6d892357e2ead04841cc5dde924b560e0cd968d84c607e3d1d2ebd804c2d1fbc764a721e8182ffd373a6339967b5230153e3e4934359028e98a0ad4e26c92a9 SHA512 da53c2136a6057de49374a428e855ad731288e45f27787d255073adb188680cb46a7b493258da01d6bbce5d7c7181306b64eb90609520aab361ac07dfba00d4b
 DIST zope.interface-7.0.3.tar.gz 252504 BLAKE2B 958605f010f7d282c8850160322bcc8ae4343508ff56d4ae2547815ac5dee76b39d9f7296402d1ccb9d410c64eabf5001be3df59d3768f9a400eaf0f4c94f1ad SHA512 fd086290943b6748b451ea0d375cd9d11a94a1d13c734cbd2834b062600400b5f7381e2b00fcdf6abbaaabf1abf687d15d44e81dd6967c39cbd19f9833b6c4dc
 EBUILD zope-interface-6.4_p2.ebuild 1113 BLAKE2B 31dbdd9168a809857d798995f9a3d3825472675561ce31d831bef275e085e28dec41a0611fddf4247ffb808d3154ce8b5e81086ef1aad0c850cddec1a1e9f55c SHA512 b04a4177d0368d06ec5cadcab679e5f0a4f6649d7817f412f9be235db570a385455295109a1019c83ae95cad9bccc2ef54946feab42215f613391e3ea7053482
-EBUILD zope-interface-7.0.3.ebuild 1081 BLAKE2B 41b5451fc45b9f40b17d7a5307a087688f996ab3b72f2e336a0c83ef66f8bd8f8e5de15676858538916022d12a3b92c16c14971e7a96e66246cb824ae64fcd9f SHA512 be9d8c2419b979133f10fd0e6b6fe385121d7d35a4de529d3e26d2bb722546f52de2e1fe2f50d89fccb25a0b8cda2f8cb5a471998fad06d0300ff8952a7ac417
+EBUILD zope-interface-7.0.3.ebuild 1075 BLAKE2B 9fe3098e73ede6b85f692becb0d2bbb4b4ff68c9731360853ef5ccae88fb3a2c6791805d5e5fcf64fef7f7695fbb1e27261d0b5c86045fadecfb7b3962ca4151 SHA512 38c70376a1a06640d7ddd235aa10ca973578f7f05cfdf0b293cf695f264b55793977d0f6d3384fc4023ef92236df1f93e14423e7e2e8152de7603eb819738a94
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-7.0.3.ebuild b/dev-python/zope-interface/zope-interface-7.0.3.ebuild
index a66dee3f1685..6ca1f8f742cf 100644
--- a/dev-python/zope-interface/zope-interface-7.0.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-7.0.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bf788e26364c..28b9726782bb 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index eaf3797a25ff..2814ebf6552e 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,5 +1,5 @@
 DIST execjs-2.8.1.tar.gz 425838 BLAKE2B e81c2cfb803e3ffcfb9fbde3ce907147e577f81563500dd74a6a6aa560f13a0318246530a4e54c7139f86c8fe76fe79c9a2961c3b0d685e65c5e7d9d395ba82d SHA512 ec808d3feccf1cfa2500f4ce17a497a31e5886cdd7482c56fdc0cc952aa8967ca50f09c33eb83545713e04aa73fbb8a201459cdb72647e8f8c291f8846f3f230
 DIST execjs-2.9.1.tar.gz 427442 BLAKE2B 5fbead63cfe02d3ba8c1b34fc3ff35a6971c0070f297aef20ab830ebe90e13939ef683baa21cfa921985ced7389db8c4a3fc87a86b180e5c372166685ddb9d6b SHA512 87d2c7f81c47e15c33c6752c6985823fe953d02c7bab70af8d4cda7e9e390ae8972d0077b4f955a16ac9eb9b00d3c86fe76cbc8b8ac3a67ddc9eb2e9aef182bc
 EBUILD execjs-2.8.1-r1.ebuild 1037 BLAKE2B 9e367d398eda92c2db78bcdd08eda02446002707f7867e4c126d9a18e6196971fdbdcb80e248662ba0207f880ccd87866e003de5d1505614c31908ca0030715b SHA512 1be4e069f71eb6599fcd4e1d79413440e660a317082b3ecba8c419b6b944dea0ab9633f6475dff1bdf6ec65c1ea5a82a671f17ed2e45884098b13a0760916eb5
-EBUILD execjs-2.9.1.ebuild 1032 BLAKE2B ea63c21281338d8e6e2c0c178ff1ea9bc59d6a8e751d77d9c0c304d91c32fe1996f70e5d7b7322ca7b83e938af3cc2b676a860ebdc53c98645c854085ba9dd54 SHA512 4ad8f8aa0aec61f5d436eb2f48b4e3087b6261c5bb5bb899416ad41c39327b891c0b712e67fac1545042300723f4d50559299047ce4debb0e67fe39a1c09a4b8
+EBUILD execjs-2.9.1.ebuild 1031 BLAKE2B deb69972c4d5e249bd3cefbc6e63f51af6ff676284c73e1bcce4c8852b2deb302f7a440bdfb6ed5abbc80ea286b7dd9268b88aed8de2183cb62f02756c8b34bf SHA512 f963d1ae176582bbf290d4bc1db81bfb4b3017b25a7f9ae4a571b6be30d8499629858f725c8506514dcda5f99e2ab97ecdac8820c902a2a05473f07e786560e9
 MISC metadata.xml 339 BLAKE2B c570f6191f5de8c4aabc788863f8543fa3cc298d6a86653c3be02ad26c7648232ca2f6d53fbcad6efcb2b7443626885c76b4755a36d1d7835dc164388f3db0bb SHA512 b9032df75adc4978d11fbc0d62dec6a9c26c86369c0debe38b0c9e1656b9a6d7c166398ba3e4628ae4eb4d4a3e75307e2e5780cec81db0e3b05183b1037080e4
diff --git a/dev-ruby/execjs/execjs-2.9.1.ebuild b/dev-ruby/execjs/execjs-2.9.1.ebuild
index 31b9be6e2246..8b0787af8dd0 100644
--- a/dev-ruby/execjs/execjs-2.9.1.ebuild
+++ b/dev-ruby/execjs/execjs-2.9.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
 
 IUSE="test"
 
diff --git a/dev-ruby/timeout/Manifest b/dev-ruby/timeout/Manifest
index ec4191a071dd..8b9dd8a802a9 100644
--- a/dev-ruby/timeout/Manifest
+++ b/dev-ruby/timeout/Manifest
@@ -1,5 +1,5 @@
 DIST timeout-0.3.2.tar.gz 16920 BLAKE2B ec3bb38a8c60b9156a8fb8b5bb99b74a606ee8d18aa81b4b5ed5067c38cea1856ccfc00a841cc58c33cf5159fc1065f68728c48acec6df2eed28f364a36fc7a5 SHA512 70220781ecaec61a4243dfd95c6be13050513e78dd3239b58b0c8f6904b29c2bfbf895f769a1e122a30fbdad761577c2ddae94b328c4ee390867d1ab6391b8ec
 DIST timeout-0.4.1.tar.gz 7197 BLAKE2B 182b8904345228f90406b2b567a9342b0724ad0abb103392ec2682c8040168e1bb98c90256d3715d5938f09bf92e9650fc3423903dacd620b753d5119f143910 SHA512 1ca23bfcaf2c67a59805f814b20a9fe6e492b8f68e492c86290d6c638b07ea9b6f14c4cc84c14b891b5aaf611f46968af8947565ea83d783c90144df4e3e612f
 EBUILD timeout-0.3.2.ebuild 816 BLAKE2B 42ac62eb5608ceb926a6f4d2d45261e7a2faec353b26e729cf9b572ea139644c733d99d6285e7c91488fe988f5935732b8f21747c38f7cc82568f4b3b74f31e0 SHA512 eab94c86288519eedfbe0e328f882eba2cd5d88b51acc1b16134d2c89619432f6bd927b23f6f8bb68b6606354f78212ebb880214ba36ea6454306e3fb4be1355
-EBUILD timeout-0.4.1.ebuild 888 BLAKE2B 9d6e5bad72036cdd60f978d17517a58dd6b48129871bc9082da42d48821aaf59242753b6cc7de5567762129dc8da58b158effa035d32a9bb79241a27678c5278 SHA512 81d03995c2672290123be79c8031427801931d3891da3a2e649046ff6ddce07006376564af7982156a0981019b3c435512639d37f8eafbe26959f5a115603711
+EBUILD timeout-0.4.1.ebuild 887 BLAKE2B 32ca479684a04a5c2bdd50a3a3e335ccad36b8de855df6d5c526fd8e07edf49bd9dce38326e5aa5e73316668babe8c971b6d66c5a23ecb57ceb093af802b2b10 SHA512 10e395e2058245c0b820931559f21af62290da0259b391469ab2dab6efdcac231ea9ea8cf342629321f9195d4d90a26e6c6f909d6d1017c070f396d2d8c7eccf
 MISC metadata.xml 339 BLAKE2B 631c72fbacd33d4ff5bae080f6c0c30c59f241e045056f8e4cd8330869a682cc4bdad6c13757f7f151f9171277a3ff227decbb87a20b2a4da7f83ad12d4259e1 SHA512 bff9f7fad39a8eb72caac724534d0d183da7aa43a4f57011e823a4d0b68d53418f858859aff22d46db2b6df3223309322837d2dd2badb0c1eba965cbb1fb3d29
diff --git a/dev-ruby/timeout/timeout-0.4.1.ebuild b/dev-ruby/timeout/timeout-0.4.1.ebuild
index 418f40507d17..e57eb0b30a33 100644
--- a/dev-ruby/timeout/timeout-0.4.1.ebuild
+++ b/dev-ruby/timeout/timeout-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2af65c1c77e9..ec81c7625b95 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index d2a460e0276c..2942edcc70b7 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,5 @@
 AUX qbs-2.3.1-qtver.patch 196 BLAKE2B 6cfabd1bbd16b2e342ff9eeb2748ce2215ed25d18203f59e0f181f465e02dfe1e2416b8ab2b5c8eb3b5aa6ec9e7c37e938e389165b1a995ed7f48233f257af79 SHA512 f3f95fc9d1a96767d9a3e74ac428e9b00f4e460959d04298f3f6ecc99f5eb72a57290e6d248f82d1ba8ca7e655fe729b8320a77da585b145c48ac90b9a315181
-AUX qbs-2.4.1-ldconfig.patch 698 BLAKE2B 35b1145f587afe670dcccada359ee22066f3075880f82a944d98c761a7fa4dc7f2e90fe696abd3509c5e914813c996264aef0f739d6e40e0e8a52c5966f64bb3 SHA512 cf89a0d8040d5aaa846ed4b3a2ccabddd1736d3d20e10f6f80bf85896344564aa62f243e1e2ab7db06d3e4f7509ccfa244be63370106bec1994607c90c01d8ca
+AUX qbs-2.4.1-ldconfig.patch 696 BLAKE2B eb0339773ebddbf913e09f6e50fc366b50b8a7974262e6f568da879cd96035d8c93cfe7c8e9a891f4716a5af3ceff27e0a753c5e6ccfe78481d696dd068e7cf7 SHA512 07bd268c6e95c306c1f69e29164e2e54b3290d415a96dac143c9438021acf8a8e42fbb1ae750308560279ac4762984dd74b4e18fe3be84a9c9933c9dd7d1a752
 DIST qbs-src-2.4.1.tar.gz 5739646 BLAKE2B 5455779be27a5eed316372303ec4264a6af8238684e9c4ae46dffcf7f9038b9aaff75dab29c84e761808158ce60f408c46eac829ef226168ad86c85df2fe7cd2 SHA512 caeb9289a208ca227fc2a16c38d88594b3b958c33f9108f74463bfad412a07ac7f7c4f85b6a741d3ee4c842e5a5d980d88b9c279ff8636cb2e98f67a70ee54b3
 EBUILD qbs-2.4.1-r1.ebuild 2464 BLAKE2B 3db130cfbad56cdfb8e8d80088dcc95516fc2b7bb098a765fc802d8df40add84dd7eb5238daa98b7a6900ddbdf236d62ddd994a2d17aaa527b726ef6aa7ace30 SHA512 48731ec065caeb88a5a61c521e4fefde65fceb0d6c9ca885cbd942f4f5f01f1edbb48befb2c673362606294a4f7b262adb68b203cb093ead784d12ab6ffc4b01
 MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6
diff --git a/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch
index 7638d5553d23..aa20ee42c57e 100644
--- a/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch
+++ b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch
@@ -11,7 +11,7 @@ can figure out the right fix.
              var ldconfig = new Process();
              try {
 -                var success = ldconfig.exec("ldconfig", ["-vNX"]);
-+                var success = ldconfig.exec("env", ["ldconfig", ["-vNX"]]);
++                var success = ldconfig.exec("env", ["ldconfig", "-vNX"]);
                  if (success === -1)
                      return;
                  var line;
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2d390e007b2e..697e008dc025 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-absorb/Manifest b/dev-vcs/git-absorb/Manifest
index 4ca1cddbc5af..61112adda598 100644
--- a/dev-vcs/git-absorb/Manifest
+++ b/dev-vcs/git-absorb/Manifest
@@ -24,9 +24,7 @@ DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53f
 DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
 DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
-DIST git-absorb-0.6.13.tar.gz 29062 BLAKE2B a316f48d008946932b65c191023e451258bb0eee9cb3197ca7983d8fa5700d2a5feb99d4978ef78802e026e5cc0abca6f6ac4a09f41482db3fdff70792f3026e SHA512 ce4dc7dd17562765425684d0ec4d6a1d78bbd705b7d44c59e2ee86e421710793f2d85a4cfd403eab385abcfb99dbd99864c11ef5b70331ac03cb98da6a6944c0
 DIST git-absorb-0.6.15.tar.gz 29061 BLAKE2B eaf562d7afdab01863989cae2ab9b4813cc73e8c0d44127eb97f5a728cef9f176fc6da14c41de5c76e893e8a693a8bb44bf102416a45bd49a0c28180eff81771 SHA512 290ad9ba918284627c8407992bf9b17d15e53d77c57a0b54e526b99bf0329ebfeb3646e93b2971f30201ec0e8b456a5ca298195d33d8e877c92aa18578fbb39a
-DIST git2-0.18.3.crate 213009 BLAKE2B f0df4ba154d08f7e7ccd2f5bac9c41c60dd4af7c49d525b0b30fe9fc563c8fe62cf6be833e867f86d61103b946223a7cff9171aad569b8596c340deded56e419 SHA512 f74221d0d96c36d9362c762185b6715f93adc78d5b4db89a3008a2baeb4bb05d5cee2f3c53f59fec97e9a690f82ac3a4f29a1633445f63c6137512255fed48a5
 DIST git2-0.19.0.crate 215910 BLAKE2B e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83 SHA512 9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
 DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045
@@ -34,9 +32,7 @@ DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e51
 DIST is-terminal-0.4.12.crate 7470 BLAKE2B 6d1db6148198299d0775539734dc62a3c7e453d621d69e01c3addeadbec4e88dde6082e4e12c7b7e8359cbd93b68c0af314d4a8df4600061a9534834699cc38a SHA512 9eb840a419f530c60d6acc52fdc9d6477818fb513bf9c3e8ab808ecd19087a52933e958a930e7a8c316d5e5a3e5beb56c34b560dddaa03c744ad37cfe6554a0f
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST jobserver-0.1.28.crate 25543 BLAKE2B 90fb1d8696b575b16b5b12d6fa4e7bc7890f5f09110b147d65eef8888a16ace1446a789f8079a3706f0252be8a04061d989bc8fc53e6c004d6b8a4094baf1642 SHA512 8ffb33b8c162935de1226e0ca4048f36e6e90bd1731cc7f06110bc97e2adef904f777df0ca4ed48b3b8ee4f2c243b2f883f6897427867904aa3385098abcbcee
-DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b SHA512 45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
 DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe SHA512 4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
 DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST libz-sys-1.1.16.crate 3958920 BLAKE2B 1780cfc7181a3c33dd8f693ee93e46bf0f70c1958503e8eb866d6ecb6732c8ab7bec56397c5384d582680fdbd8762ae37ccca7063616f266c59a7eff7801c0db SHA512 1d6b65b5a5293d470cf8ed48293a6f8273828a0cdf096d286e777d438b2c4d076360b5492ee3c2c83b27605d51389e6a3eda7eaebfb09a6041a877a48540aef1
@@ -68,10 +64,8 @@ DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f111
 DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578
 DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b
 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
@@ -103,6 +97,5 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e
 DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1
-EBUILD git-absorb-0.6.13-r1.ebuild 3141 BLAKE2B 2244c2fe2038502277ec2487c0b916ab6c04e95442331ad7bfc1d68aff46378b2ba3d20c01fda8c5fda278e8da2fdf143f8130b6de125b26ce1fc74c99ce93f7 SHA512 8578681546b34c52cb0427a6b71dee353fb0845fdd464ecb7debbc8119cddfb4a9f1f238640a1ed88e57eb0a9ab4305ae155c9e644d509db7d0e1d782f8a5f47
 EBUILD git-absorb-0.6.15.ebuild 3147 BLAKE2B a382185d17bdb1286c8705b9a4fd114ddff08ba35f0988731b574a0a533ea475682d0c816426336388722535038c46e647ee8872d76e29de1d9471184e3d9db4 SHA512 5877cd223b82fcbe51581691905c71bfaf364afad0a047ccb2dd04fda2e21a7e944071307766c3527481c5f53995da7c832b7430fdb7866769b8e5c5ce6683fd
 MISC metadata.xml 326 BLAKE2B 1ce61af807d0db7a5decbffc79fc653d7213c40b44fc1fe7441a0e787034e408ee167d5d2c4adc3f004b90c6ec520952504d66add287bbd540b3418c36f47de4 SHA512 9e288f04912600a55bbf5464eed414de2ea8911ce5bef9fe92d99e5d2a872652b3638d00235fea858151eebbf46905ed9108003297276202d4a1bd80ac0fc720
diff --git a/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild b/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild
deleted file mode 100644
index 133c6490b757..000000000000
--- a/dev-vcs/git-absorb/git-absorb-0.6.13-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Autogenerated by pycargoebuild 0.13.2
-
-EAPI=8
-
-CRATES="
-	anstream@0.6.13
-	anstyle-parse@0.2.3
-	anstyle-query@1.0.2
-	anstyle-wincon@3.0.2
-	anstyle@1.0.6
-	anyhow@1.0.81
-	bitflags@1.3.2
-	bitflags@2.5.0
-	cc@1.0.90
-	cfg-if@1.0.0
-	clap@4.5.3
-	clap_builder@4.5.2
-	clap_complete@4.5.1
-	clap_complete_nushell@4.5.1
-	clap_lex@0.7.0
-	colorchoice@1.0.0
-	crossbeam-channel@0.5.12
-	crossbeam-utils@0.8.19
-	deranged@0.3.11
-	dirs-next@2.0.0
-	dirs-sys-next@0.1.2
-	errno@0.3.8
-	fastrand@2.0.1
-	form_urlencoded@1.2.1
-	getrandom@0.2.12
-	git2@0.18.3
-	hermit-abi@0.3.9
-	idna@0.5.0
-	is-terminal@0.4.12
-	itoa@1.0.10
-	jobserver@0.1.28
-	libc@0.2.153
-	libgit2-sys@0.16.2+1.7.2
-	libredox@0.0.1
-	libz-sys@1.1.16
-	linux-raw-sys@0.4.13
-	log@0.4.21
-	memchr@2.7.1
-	num-conv@0.1.0
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	pkg-config@0.3.30
-	powerfmt@0.2.0
-	proc-macro2@1.0.79
-	quote@1.0.35
-	redox_syscall@0.4.1
-	redox_users@0.4.4
-	rustix@0.38.32
-	rustversion@1.0.14
-	serde@1.0.197
-	serde_derive@1.0.197
-	slog-async@2.8.0
-	slog-term@2.9.1
-	slog@2.7.0
-	strsim@0.11.0
-	syn@2.0.53
-	take_mut@0.2.2
-	tempfile@3.10.1
-	term@0.7.0
-	terminal_size@0.3.0
-	thiserror-impl@1.0.58
-	thiserror@1.0.58
-	thread_local@1.1.8
-	time-core@0.1.2
-	time-macros@0.2.17
-	time@0.3.34
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	url@2.5.0
-	utf8parse@0.2.1
-	vcpkg@0.2.15
-	wasi@0.11.0+wasi-snapshot-preview1
-	winapi-i686-pc-windows-gnu@0.4.0
-	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.4
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.4
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.4
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.4
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.4
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.4
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.4
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.4
-"
-
-inherit cargo shell-completion
-
-DESCRIPTION="Automatically absorb staged changes into git current branch"
-HOMEPAGE="https://github.com/tummychow/git-absorb"
-SRC_URI="${CARGO_CRATE_URIS}"
-SRC_URI+=" https://github.com/tummychow/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-# Dependent crate licenses
-LICENSE+=" MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	>=dev-libs/libgit2-1.7:=
-	<dev-libs/libgit2-1.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_compile() {
-	export LIBGIT2_NO_VENDOR=1
-
-	cargo_src_compile
-
-	GIT_ABSORB_BIN="$(cargo_target_dir)/${PN}"
-
-	# Prepare shell completion generation
-	mkdir completions || die
-	local shell
-	for shell in bash fish zsh; do
-		"${GIT_ABSORB_BIN}" --gen-completions \
-					 ${shell} \
-					 > completions/${PN}.${shell} \
-			|| die
-	done
-}
-
-src_install() {
-	cargo_src_install
-	doman Documentation/${PN}.1
-
-	newbashcomp "completions/${PN}.bash" "${PN}"
-	dofishcomp "completions/${PN}.fish"
-	dozshcomp "completions/${PN}.zsh"
-
-	default
-}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index f48b304e2dad..c7c8e35e01a2 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 14ed96d06a52..3602a28fc86b 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -20,6 +20,7 @@ DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone-soup-0.31.0.tar.gz 22432560 BLAKE2B f3e696915458674e3f7ce2a47d19c740c53de897ab40227efc9c127be42dcfbb4b3ee93258ea4094fb1a18aceb37c4341aac86c1174c42ab1ce300bca3281fc6 SHA512 ad354d57a39d07ad8a1a89a7fd20b33a4cd88fcbf1f2276cdefe8890c223272b7a34969a373f6b1f39cff72499c1e2773592ce368e887307908acd59ca00ca4b
 DIST stone-soup-0.31.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.31.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
+DIST stone-soup-0.32.0.tar.gz 24408342 BLAKE2B 884c8b067f692bcaeaed0098ab4d89936095c6bda068e9f7cc713357f709879b282f57c831ab23103e4639a0966ec940649e469e7f07db890d03bb6283254b42 SHA512 2c9dbe34158c1c00d58069be21226a739ed8f9da724d9ac615d4420473272e91699bd462c187041ab5744d661dc77b766f95b9dce8ae97a616098c0d7b477c5f
 DIST stone-soup-0.32.0_pre20240626.tar.gz 23577520 BLAKE2B 43a7d9db8037cb1f37ff821da95106d77fa46b0bf34a6b0ef02b66023e1e77a76cc906d2f34d66d6bdea4e9b3859728e2e93909f2c9e1898caab52955d218de2 SHA512 f7a3c58a9f266f354e01175fcc9e2978f4afc5d4e1fc7b5f84979e36213057f2e3bb15f600d40988135e06dc01b65540a4342b16c82edf1c3cfb41421ea92285
 DIST stone-soup-0.32.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.32.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
@@ -34,5 +35,6 @@ EBUILD stone-soup-0.28.0-r1.ebuild 6467 BLAKE2B cc8374aedcb5bcda53932d12533e2e25
 EBUILD stone-soup-0.29.1.ebuild 6419 BLAKE2B 108cd8a40ead709a8c87fbc6ada1a8d5f4079483d54907a206b78333c1dd51a8e62b10a36f346cf3730e0f19c6dfaf755b90511ca18c9c6610fc0a2ce9aa62c3 SHA512 7eb9c238fb908966b599836d189e6ef5e19c3fbc63a5759ead5696ff3d788b64d090722b1bc841e9c983e6695d7ea63c47cb86a07c5f20ef3ef7fe7708fc38b4
 EBUILD stone-soup-0.30.1.ebuild 6422 BLAKE2B 6e2ef0c1404b05c73834dfbdb0cd579b37609c3ab0563442dbd00afe0b58a1698abdddde4eca8d3840af42eb5756c7abef39b8d5886021013a7caf7b9d0e75f2 SHA512 cb95b93e760007374d2617ab42baaaacc1712cea2d4a7b3a083357711b792b355239fcb5c0149d462247fc2df0499298a7dd9f40d3b520658295a92e59ad3bb2
 EBUILD stone-soup-0.31.0.ebuild 6422 BLAKE2B a524e779c680eefcfea799957d90fab631a62a028fd7c2336b3726491e0a38892799e35c0133f84c9927507ce071771dce50efe5b2d0250e5990e53c755aab8e SHA512 f8ad0683334ff8432a28b586d8f65de3ae37ffe42159d4282ca3fe97ba3be3d2cae9ac1180cf2df7d23e13bea6c310d454a15391166343831266aa5122f1e079
+EBUILD stone-soup-0.32.0.ebuild 6424 BLAKE2B 33372baccd4db7c8812c8b1e0334c4435df174897f808051b327f7a651495a6fdc43195ca68f400a123245b953fa6f44a08d73e8fbb3ef2e95045c1255ccfa50 SHA512 2149e8a0bd8a096c0a5762bda440c4be933b9523ced863c2422461d4d0862ec15b1f3f33eafc658696d8237b1629c24bcde0cc83c12467795667781bb84e04c0
 EBUILD stone-soup-0.32.0_pre20240626.ebuild 6462 BLAKE2B ca6105b136dc655a4772a038513c02910d829218a7902651357a86a62e3302614d10fe05cbcec36444156a6a88e835d6d1bc6a77f41468c2b3c290fdd93f1e29 SHA512 115b8f92d599468c6c238ae70b51064b67a6cbe52c87b821b4e51407a3bb3953b9afdbf54da2dc7dea5d00492d6f36a418ac4bdc9a07cd30016c608a7833aed7
 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild
new file mode 100644
index 000000000000..18316a1186e0
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.32.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# There are many slots for this package because people in the community
+# like to play old versions.  Every release includes content changes
+# where species/spells/monsters are added or removed.  The public
+# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
+# versions back to 0.11.
+
+# It's not necessary for Gentoo to support these old version but it's
+# something nice that our distro can offer that others don't.  If the
+# maintenance burden becomes excessive than we can revisit that
+# position.
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10,11,12,13} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+
+# Leave empty string if not a _pre release
+COMMITSHA=""
+if [ -z "${COMMITSHA}" ]; then
+	# This is a tagged release
+	# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${PV}/crawl-ref"
+else
+	# This is a _pre release
+	SRC_URI="
+		https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
+	"
+	MY_P="crawl-${COMMITSHA}/crawl-ref"
+fi
+# MY_SLOT to satisfy pkgcheck variable order checking
+MY_SLOT="0.32"
+SRC_URI="
+	${SRC_URI}
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${MY_SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${MY_SLOT}.svg
+"
+
+S=${WORKDIR}/${MY_P}/source
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+SLOT="${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="advpng debug ncurses sound test +tiles"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3.0.0:0 )
+	tiles? (
+		sys-libs/ncurses:0
+	)
+	"
+BDEPEND="
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	app-alternatives/lex
+	tiles? (
+		advpng? (
+			app-arch/advancecomp
+		)
+		!advpng? (
+			media-gfx/pngcrush
+		)
+	)
+	virtual/pkgconfig
+	app-alternatives/yacc
+	"
+
+PATCHES=(
+	"${FILESDIR}"/make-v3.patch
+	"${FILESDIR}"/rltiles-make.patch
+	"${FILESDIR}"/avoid-musl-execinfo.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+
+	if use advpng; then
+		eapply "${FILESDIR}/make-advpng.patch"
+	fi
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+
+	# File required for a _pre build
+	if ! [ -f "${S}/util/release_ver" ]; then
+		echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
+	fi
+
+	# Replace bundled catch2 package with system implementation
+	# https://bugs.gentoo.org/829950
+	if use test; then
+		cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
+	fi
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+		# deprecated (in 5.1) luaL_openlib API (#869671)
+		CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}-${SLOT}"
+		FORCE_CC="$(tc-getCC)"
+		FORCE_CXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl-${SLOT}"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
+	fi
+
+	if use tiles ; then
+		emake "${myemakeargs[@]}" clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  catch2-tests
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  DESTDIR="${D}" \
+		  prefix_fp="" \
+		  bin_prefix="${D}/usr/bin" \
+		  install
+
+	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
+
+	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
+	   || die "Couldn't append slot to man page name"
+	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
+		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
+		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "crawl is a slotted install that supports having"
+	elog "multiple versions installed.  The binary has the"
+	elog "slot appended, e.g. 'crawl-"${SLOT}"'."
+
+	if use tiles && use ncurses ; then
+		elog
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
+		elog "tiles binary is called 'crawl-"${SLOT}"'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 24faec9264d0..2be205805c51 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
index 0bc5fac3a4b2..1ee1d0515a94 100644
--- a/gnustep-apps/gorm/Manifest
+++ b/gnustep-apps/gorm/Manifest
@@ -1,5 +1,3 @@
-DIST gorm-1.3.1.tar.gz 7090395 BLAKE2B 55abb7a6e367e5e100d30edc3abda0b8e0903ad71d01952131e4ab7b565c8bec944126f3b8932e1cc24a16e76ce0e55291d1bab59ea03b1c41e14dda070de500 SHA512 9c2474e01145cbe8ae97e00baa7aa8c114b2fe3853b44c9e893eeef444dd7e2fe036111a8d09745c3e624383e8e5e692a8d7cc845cc6c85860f111e54f085e00
 DIST gorm-1.4.0.tar.gz 770167 BLAKE2B 38e17454ae1a73dce7818731b4e10b62f2a5b2070b1a111c5d0ffadbb13c753fb077f0ce192e72bc948e10e7299397f165d8074d2707d52cd697181bceda1c1f SHA512 5d816a381759b89465aacadbf0d5f82630201db428e29dd11418f6ad52f3fc2ddc25e907470deffd5e564fb0c56d70d120ab9dea9b6df64cf3e58652025a4dad
-EBUILD gorm-1.3.1.ebuild 948 BLAKE2B ffc43cc97b844c369141be4c41c143d24bf7cff63fa522c15d341cee906ca6fe43bb1709991f75e7e7ef12488961d3cf1f3a7e37db9bb68d6b4941b8a556a4db SHA512 8071d0c9b2b22dc22e6cabecdbd762579049a97d42dd7dd7dc9aaf7dc324d17560aed89e6342938f9eb93c59ad3b7a56cf5d42a78e7d01549adc54e587b9e669
 EBUILD gorm-1.4.0.ebuild 981 BLAKE2B d2fa051c09aa17cf5b028b7d71a7532bc425b749645e39aa4c4b71352192c90b5c2af6e00a99cf3bc030422771a8527ae2a9465a3b93017e2785761f40732200 SHA512 cd47f4eca576216c282433a551f2bd7659f81790794bcc22a40ba909bd6347f54f8d806518e2c6e489f0ca1b33e9342394212ad17f26d3fe2ed701d86a5f2b13
 MISC metadata.xml 1583 BLAKE2B 865c14f102c34b688dc2c6c46456b44f463ae1b0924662a904ef73a3271d552c247c9c97038059c8a303364424516e2d46be46cc146795863727f20957d00b46 SHA512 54e9cb47a4b8e880b4da836aec77ce06a0594ae577a00409787a61dfd39de8ac5a339da7b54f75e73b4544803ac4a3db76c5f7f99fe214b5e77d5b9dfad3194e
diff --git a/gnustep-apps/gorm/gorm-1.3.1.ebuild b/gnustep-apps/gorm/gorm-1.3.1.ebuild
deleted file mode 100644
index cdddcf9f7d5b..000000000000
--- a/gnustep-apps/gorm/gorm-1.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="https://gnustep.github.io/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.22.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		Documentation/GNUmakefile
-
-	default
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d6af60adbc1a..1035e9969d81 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index d5a69112ef07..97d7771cb59c 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,7 +1,8 @@
+AUX kajongg-24.08.1-fix-w-o-pyqt6.patch 5064 BLAKE2B 98175c518d56e6ab9757d941646afbe7e0621d96b91d84a796ea8c99defc541408de7355bae1c29eb282a5f08181fde1e2aba8f7ae2a1dacde72248cbd34aa7a SHA512 41a14617142c50bafcb10a0596cb473710a0447af6b75146c01cc7150f139116b70529d37e202618f577f99783b3498778520ce78ece65f92ef57228c90cf996
 DIST kajongg-23.08.5.tar.xz 4592668 BLAKE2B 6155d5e483c5c0e46c2486b445a1e4e73a3a489188ab3eed5178918ab45802eab1a09cbec4d17c27679cd1b677ceda41006a88de7dba0550d346f3893f71cd8b SHA512 3a2eab57e71dc74e9f846705aebf827190d7927993d8442689961f42ec9ca5970f104a9ec14a80cabe8b18ef14fd44df8290eaf34914445ec4e4fdd32c718f10
 DIST kajongg-24.05.2.tar.xz 4601924 BLAKE2B 3c14def1edcc98d672adba7b87706894dfceda2f7b766e30d24b9130c785d0f4eeebc60611895ea97d3254867d3df0670dbc13feb2cdacf8db98a0fd0e597755 SHA512 6c5d1ac85204dd3a7f2e775660a0fbaf6b590d0d4fd64658d200b65b30edb09258a5ce4f7a5484467acef52324b28ed61022697b23100e32f1276c344b134075
 DIST kajongg-24.08.1.tar.xz 4606224 BLAKE2B 64c81b6a1d6e56653a3ab48105e8db7520b0c06d340318060a7d220de76709212bbea35b6a3c0e5d03168279ecdcb18508a51cd4275aa247370fde3b2b18138b SHA512 28f7dd5ba670b4a7e218f168340fa6b68e04a83abdb8060025ba20734131cfa424ff378d68ac3c47d3c31af22473175f55596fe3459dfffa30f9ab94e913d65e
 EBUILD kajongg-23.08.5.ebuild 1029 BLAKE2B 259a092855ee3b7138512f88a35bef4f28856ba1f25916fc293cb0e9c4bbb1a04dce44b24ad0daff2a3e001a7ec9d50cdd95e06df91314a5e7120f5879817cdd SHA512 c3b70b109d5c31f4cdcdd1fdb9ffe3c4f67d4bf87a61e9b60f34a917bd230cbbbfde95e1581d5a7e0b8cb632b735fa87095c844c2cf04cea024341a6368d8fcd
 EBUILD kajongg-24.05.2.ebuild 966 BLAKE2B 2b31bc2b22d3cac1711ce1bcdc7865b161374e87fd52bec45d2d60ef3b37ce3c18b68b932eba29a9038beb341e84374e4fc8ec9cbec0518cd83835ae6690ba5a SHA512 91d54cb8186ba7109f9865afa45d56ed4879c9cb363d9f9a80484fc0615dc2601ff891d3a6729468eb2c746bde9c544ea81428a0d9e3c36a75ca4e48bb45a028
-EBUILD kajongg-24.08.1.ebuild 1012 BLAKE2B 6851838de1bd942d213c8a7742315dd9b08ef01533d2ed5d8a60bb5ba826e0280eec4c59d94a50fc4d0295a5b284d4e0bae36bc23f9a6fa36b424fd5dd4c568c SHA512 23cf4eed07480455d4c47f612f03993a3cd2f07e264488b5634738fe915e10f75e2dac9db2090d930966c79dc618bc564b8e506e15de54c4491f2d9234ecc45f
+EBUILD kajongg-24.08.1-r1.ebuild 1077 BLAKE2B 22cba3ff04030408f60f4baf4b94d800233eb814707a7719ffbe330724e12486d3c9778c376823232a8208cfa8ea57f4356adaeaf3bbcace349ebbad078499b0 SHA512 fd4ac715c37bb310aba0546dba650f5c981941d2fcec7ae3f698a3ad7b6ed7137be5e3376e416bf49759f2de628355aa72b6c5a63e10660f41d6a6e7de85f418
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kajongg/files/kajongg-24.08.1-fix-w-o-pyqt6.patch b/kde-apps/kajongg/files/kajongg-24.08.1-fix-w-o-pyqt6.patch
new file mode 100644
index 000000000000..5ac159bd13c3
--- /dev/null
+++ b/kde-apps/kajongg/files/kajongg-24.08.1-fix-w-o-pyqt6.patch
@@ -0,0 +1,156 @@
+From 2628e367759fab2ff9365b4ebaf1b76cc3e8c301 Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Tue, 10 Sep 2024 22:07:43 +0200
+Subject: [PATCH 1/4] did not work with QT=API=PYSIDE2 anymore
+
+(cherry picked from commit 8354d9b0fda654c0520c6c97d96f8b9a2f1eec34)
+---
+ src/kajongg.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/kajongg.py b/src/kajongg.py
+index 5f369889..139a061c 100755
+--- a/src/kajongg.py
++++ b/src/kajongg.py
+@@ -15,7 +15,7 @@ import os
+ import logging
+ from typing import Tuple, List, Optional, Type, Any
+ 
+-from qtpy import QT5
++from qtpy import QT5, PYSIDE2
+ from qt import QObject, QCommandLineParser, QCommandLineOption, Qt, QGuiApplication
+ from kde import KApplication
+ from mi18n import i18n, MLocale
+@@ -190,4 +190,7 @@ from mainwindow import MainWindow
+ if QT5:
+     QGuiApplication.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps, True)  # type:ignore[attr-defined]
+ MainWindow()
+-Internal.app.exec()
++if PYSIDE2:
++    Internal.app.exec_()
++else:
++    Internal.app.exec()
+-- 
+2.46.0
+
+
+From f47761e86c1c97fcce543437a580051f5bfdf6e1 Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Tue, 10 Sep 2024 22:09:13 +0200
+Subject: [PATCH 2/4] Help/About did not work with QT5 anymore
+
+(cherry picked from commit 7b69cc0a7fd8a999a41b1f874460f9634d1b1bd9)
+---
+ src/kdestub.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/kdestub.py b/src/kdestub.py
+index 651137a8..0985b75f 100644
+--- a/src/kdestub.py
++++ b/src/kdestub.py
+@@ -42,7 +42,7 @@ from configparser import ConfigParser, NoSectionError, NoOptionError
+ 
+ # pylint: disable=wildcard-import,unused-wildcard-import
+ from qt import *
+-from qtpy import QT6, PYSIDE2, PYSIDE6, QT_VERSION, API_NAME, PYQT_VERSION
++from qtpy import QT5, QT6, PYSIDE2, PYSIDE6, QT_VERSION, API_NAME, PYQT_VERSION
+ if QT6:
+     # pylint:disable=no-name-in-module
+     from qtpy.QtCore import QKeyCombination  # type: ignore
+@@ -1130,7 +1130,11 @@ class AboutKajonggDialog(KDialog):
+     @staticmethod
+     def licenseFile() ->Optional[str]:
+         """which may currently only be 1: GPL_V2"""
+-        prefix = QLibraryInfo.location(QLibraryInfo.LibraryPath.PrefixPath)  # type:ignore[attr-defined]
++        if QT5:
++            # pyqt 2.3.0 does not seem to handle this
++            prefix = QLibraryInfo.location(QLibraryInfo.LibraryLocation.PrefixPath)  # type:ignore[attr-defined]
++        else:
++            prefix = QLibraryInfo.path(QLibraryInfo.LibraryPath.PrefixPath)  # type:ignore[attr-defined]
+         for path in ('COPYING', '../COPYING',
+                      f'{prefix}/share/kf5/licenses/GPL_V2'):
+             path = os.path.abspath(path)
+-- 
+2.46.0
+
+
+From 534d598b4d19149e984cce22fc5431091dd2d47c Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Tue, 10 Sep 2024 22:10:23 +0200
+Subject: [PATCH 3/4] this should work with PYSIDE6 without PyQt6 being
+ installed
+
+(cherry picked from commit 3f12d305cc56814b72c561b36271494a21cf236d)
+---
+ src/qt.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/qt.py b/src/qt.py
+index 38679abc..b9cf96ca 100644
+--- a/src/qt.py
++++ b/src/qt.py
+@@ -150,6 +150,9 @@ elif QT6:
+         return sip.cast(obj, _type)
+ else:
+     HAVE_SIP = False
++    def sip_cast(obj, _type):
++        """hide not so nice things in qt.py"""
++        raise NotImplementedError
+ 
+ def modeltest_is_supported() ->bool:
+     """Is the QT binding supported."""
+@@ -158,7 +161,7 @@ def modeltest_is_supported() ->bool:
+     try:
+         _ = sip_cast(QSize(), QSize)
+         return True
+-    except TypeError:
++    except (TypeError, NotImplementedError):
+         return False
+ 
+ SIP_VERSION_STR = 'no sip'
+-- 
+2.46.0
+
+
+From b025fef86626f7b3af17924de8ca7ae1cdde6b87 Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Thu, 12 Sep 2024 21:09:54 +0200
+Subject: [PATCH 4/4] workaround: qtpy sometimes uses PYQT6 bindings even if it
+ cannot find module PyQt6. See KDE bug 486171
+
+(cherry picked from commit 88a0beb61b97682307d5cd70aa61dd832759f293)
+---
+ src/qt.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qt.py b/src/qt.py
+index b9cf96ca..0799f6c2 100644
+--- a/src/qt.py
++++ b/src/qt.py
+@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0
+ 
+ # pylint: disable=unused-import
+ 
+-from qtpy import uic, QT5, QT6
++from qtpy import uic, QT5, QT6, PYQT5, PYQT6
+ from qtpy.QtCore import QAbstractAnimation
+ from qtpy.QtCore import QAbstractItemModel
+ from qtpy.QtCore import QAbstractTableModel
+@@ -138,12 +138,12 @@ from qtpy.QtSvg import QSvgRenderer
+ # pylint:disable=c-extension-no-member
+ 
+ HAVE_SIP = True
+-if QT5:
++if PYQT5:
+     from PyQt5 import sip
+     def sip_cast(obj, _type):
+         """hide not so nice things in qt.py"""
+         return sip.cast(obj, _type)
+-elif QT6:
++elif PYQT6:
+     from PyQt6 import sip  # type:ignore[no-redef]
+     def sip_cast(obj, _type):
+         """hide not so nice things in qt.py"""
+-- 
+2.46.0
+
diff --git a/kde-apps/kajongg/kajongg-24.08.1.ebuild b/kde-apps/kajongg/kajongg-24.08.1-r1.ebuild
index 806b66ab84db..b33c2a7a6bca 100644
--- a/kde-apps/kajongg/kajongg-24.08.1.ebuild
+++ b/kde-apps/kajongg/kajongg-24.08.1-r1.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/libkmahjongg-${PVCUT}:6
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-w-o-pyqt6.patch" ) # bug 939423
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	ecm_pkg_setup
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 39206cb424fd..b01d0b0f6134 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index dc2eb000b769..29536414a465 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,5 +1,5 @@
 DIST k4dirstat-3.4.2.tar.gz 411899 BLAKE2B 356844373c35def5421c234ae5b07bd11402f56309c30fc68a64766be634fec5f6d04a8931babe21efad6fc36ec992e8ebb08a29dc11a58b2b08f1072b3a8f18 SHA512 d29c9b18b4bc8e94af1f4b494418284a05b95a1b17dbb23614823b0e3e7cd2b470b8330d3f52c584c0c257d2c0dfd4d06914a3eb90a51f7b679437bccc695477
 DIST k4dirstat-3.4.3.tar.gz 412329 BLAKE2B c87a5c0d37616607e2c7bcd95803f3d4411b6331fa259d899245773d91dd5b0b5ececae658f4fb80536dedde972a69ebded5442be79e3993a5857f2db07a136f SHA512 f7d77fa338e035dc973317dbe39111bf2fe51b96bf27c1dc8812e909ac07a3e778899a1dd9b2b1c94771b9151f3e55b100ad933217adf2ce54287e6349a90bfe
 EBUILD kdirstat-3.4.2.ebuild 937 BLAKE2B e93454e1fea59a5dd78967274a971c1faff4659106af0cdc1a5e57aa78c87b302c72438b06b3421939f876ff737fada6fb0f117c1839550cc062028aaa3640df SHA512 b967f007aeec7be7124de1d2332a7c207806f9e11dabb7a3405c21481078ee41bddcb34912ef9db5f12d24768ac1028d8e8a51514e45db95e1640b8d5ef4001a
-EBUILD kdirstat-3.4.3.ebuild 939 BLAKE2B a33310dcfe1b91dd5ebb1dbe8aa7e48aa855184d802e82bd646102fe22ad946d42f9bedc31cfb0cd9fe598165c567cf4e0d148d7f5e710df88b6b25157e94441 SHA512 59405b9f71dce0112decdaea730581e9e01a3e3513de8ac8d19e5301e9a7500aeaaaa8726a487b25bea7e6c5de759eeb4c33742fd4e9024bdd46495ae3364f88
+EBUILD kdirstat-3.4.3.ebuild 937 BLAKE2B 2afcf1e8a71a7fc46ec91f9a41100f1d5d4c0ccfcf6609109df5498696a08630aa5b7ed17c8fb135b46e547027146ec1e1bc540111830477eb55774e25e7c6aa SHA512 566bceb97f99666ada8f25df9a9ffcbeab5585c834dd244b5975877eb33e6a27dfda5fc377b2a1cedf01b91c3db9a6be563446c831a61bea47154065b711b7a8
 MISC metadata.xml 337 BLAKE2B 38d85ce7db71e7a64dbf1cd522be85c8046e39e5d8d9f8ce69d36f6eba5ca3c8bd575aa05be63f576089b11e3ab2f7a272ce0d66b81c490efc1632fec3e4bfed SHA512 71d8aad0051f0b3dd735faab0badc3aa607423dbfd970958eadd75d48ce6c72f9a8d7d1d0706f826cdf99679da84a6c27a8ecf0a61b0fee95c44962361eb3381
diff --git a/kde-misc/kdirstat/kdirstat-3.4.3.ebuild b/kde-misc/kdirstat/kdirstat-3.4.3.ebuild
index 7a66f2adc467..2973ece3462b 100644
--- a/kde-misc/kdirstat/kdirstat-3.4.3.ebuild
+++ b/kde-misc/kdirstat/kdirstat-3.4.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 9cfed2c4b0a1..fc54ef88a8e2 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 b13bbeb5f6d8..63b2924938ac 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -7,10 +7,11 @@ AUX plasma-workspace-6.1.4-fix-mediacontroller-1.patch 1373 BLAKE2B eaf2d564cfc8
 AUX plasma-workspace-6.1.4-fix-mediacontroller-2.patch 1987 BLAKE2B 8870c3a21575b64d47ca62f2488e1f6c9b0724105e0089c9b8e7d95653797bdad29ffa7422dad7395efdf03b2e6e6854ecc4b23c0c61c93d17ee626879b85fd6 SHA512 b44c7f3b0f216c6279627db5b4a59ff8167fc4583bca85978252d38f5878c976ca995b52ac4581cf0d07aafef9e21c2c440baed9dee912beba2d38fb63d1b484
 AUX plasma-workspace-6.1.4-fix-svg-images.patch 1275 BLAKE2B d47e2a77c33cd03429b7a9704f0e3102ea22d0feee339a48653038e3ab6bbcf7ae00faed9608e275d4697bd3eecab1748883ed0ef648fee4a28964b8c6174925 SHA512 c34c138037fc76306aa51d26a48c20796ad524cae973e7d403194a84e4f2a987b6b7bf8c788fa9c7da6250e3d2517f8c72a5c9c62556c0c496e74bd703f3f973
 AUX plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch 1068 BLAKE2B 2f593499840a799e7683e599c2150f8c7e8f485b1ccb03c853915a4ec6cef1a9953f2d7b95bfac5a8b701d32c637b24201562d82aaaa3dc84450b1eb22f5aa10 SHA512 7d70cdbb370dbefe3721eb57ac66943db29f574401c5a47ec8c6ed897d928bb5e2d8f9e3bb608574c9e73f367d3f6db7dc85bf7f07dcd88be3b04b5336eb3981
+AUX plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch 1348 BLAKE2B 50a20d279325cd82ec7aa5b9dbdaa96003612e32ee7fcc421e9e1ac5017f31eb5386107f6231469faa18573cc9870fe7c02006e557278669446c6aab1791236b SHA512 6004732cae3cadc4cd1b56bc27807784a4bbd57985c550e66ab95e9c81101b9230ef408d02b2d472da7df81d942e300d90e5ae7ad2f04ccb6cabc00680bbe140
 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006
 DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05
 DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238
 EBUILD plasma-workspace-5.27.11.1-r1.ebuild 7049 BLAKE2B 9aa8f728e227338b85a7f351e47f73fa83844c4228644883d801d5da3965b430b8cfd57cfa4ad17acabf9535bb57e8c33da58ca9fca6b098ef414ebb96c879a7 SHA512 a81b272671b6f5eed5173dd3378e34534522dfec5aac040b4d2a1ff45bf0db2200fcbaccf7b6319be026a566af7aac92daa6fd2ee43aba57949e579b7233cda8
 EBUILD plasma-workspace-6.1.4-r1.ebuild 7168 BLAKE2B e8b42d176996edcf9fde59d7f0ba3900bc60c12b96d0e25678954383ee98b9bf400f34c850290902bd23fb3122f8f91f749c266c5bbf104f133d6541d31c845b SHA512 475e735aeff60c49b2f36a77056ef234da46d4ceee3810d7cdfbfb120a76f67c2927f6b609302ab09f98b15ae38165a6b35aea5e4d6faf08d690d5ae116fbc5d
-EBUILD plasma-workspace-6.1.5.ebuild 6917 BLAKE2B 50af8eaf1f961c13c5a31e2d773f7a8db0893d4c353c16e2d5d55270cc0cf1e3e1c68b4e17bd76af9661ba7a56e80205a2c86f94ce7bffcca7bcb4655b0c3ba4 SHA512 b73c922420f0a3ebedba09937a9323c16afe5b88f838639460bb600ebd4699d56a27964121541ca9f09b2e91235ca636b7168b71063b548cd98c5a98f74c251d
+EBUILD plasma-workspace-6.1.5-r1.ebuild 6995 BLAKE2B f8b843736e7fc46fcec6fe8afaa2152e5f2a278c1a601b6cfcffa657fe1eb819c29d5c16332f1339b0ccc35375b64e1cac11429a1dbf264c89c359bd23fcdf04 SHA512 04c3c1193138ab71d997a9cd6a32c7914ae8003246728f709b308a771c44e5c82c24b40a8211f2bd107fdd74413b1fa965278bdb2758f0b4f2605f3a1a039640
 MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch
new file mode 100644
index 000000000000..925be20afcc9
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch
@@ -0,0 +1,32 @@
+From 4dff1973116597210cf9fb1c102e5c9433d13b1d Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Sep 2024 13:22:05 +0000
+Subject: [PATCH] startkde: Fix wayland session restore saving
+
+When we added manual saving support to plasma-shutdown a guard was
+changed in the normal shutdown path. This guard was wrong, we want to
+check we're in the restorePreviousLogout path here.
+
+This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2
+
+BUG: 436318
+---
+ startkde/plasma-shutdown/shutdown.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp
+index 11c002bcd80..ab93cca6ef7 100644
+--- a/startkde/plasma-shutdown/shutdown.cpp
++++ b/startkde/plasma-shutdown/shutdown.cpp
+@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete()
+ {
+     const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General"));
+ 
+-    if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) {
++    if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) {
+         // Now record windows that are not session managed
+         int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN));
+         if (ret) {
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild
index 9a0e73749591..2042824ee0f6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild
@@ -161,6 +161,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	"${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
 )
 
 src_prepare() {
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 58a84ccfad67..2da3a96f7b43 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 4089309a177d..518a5d3a49b5 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -11,6 +11,8 @@ AUX freecad-0.21.2-vtk9.3-fix.patch 1065 BLAKE2B d0fccb7c19dc9a5efedb5691a74c6ba
 AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
 DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
+DIST freecad-1.0_rc1.tar.gz 88552055 BLAKE2B 3e2607d87da86edd35c05abba0d7085bed7fc42f9831c7e2451e028b3ce267c7a1e44b82c9a51bdfc736b5c98198030aafb81a7ae5df158ae17bc5afe2df44e0 SHA512 1d0a0d131c35ee03b435a0b901cb56c8e98ce2dd62ff5102856b3777dfc6d3bfba6ff4ea87e8c8949640bd14fdb775db3e9eb9a8b6530dd1f86a903037c95dba
 EBUILD freecad-0.21.2-r3.ebuild 12437 BLAKE2B c9c9a77f7b7b0aadee67b3fb2aa6ac13da06bcc790e4291e6413826b246a92052f535962c974654646c79a481378b99582d2499b134d57b76cbcad4056fc2fc7 SHA512 c68c9f9a7d106ac48ddf280f716cd73398693e058e8c475d912e61d43466e80041d60847efa2cd5d022d1ac59d1057c14c61943c2eb3ce68032d232b29469c08
+EBUILD freecad-1.0_rc1.ebuild 12064 BLAKE2B 0d0684265e5c52b1ca10f932339bf12b13675bb2aa1802f78659a1e816fec77fc270242bff46c09c60e2ab9704d949dd9c6daba9cb7c04bdf6f884528fae4d7a SHA512 dd8ae632f75a56073a6c1c219b842260b7538099a188526bb08b8debff45a5769922b5edfb4eb5bd1c801ad749485f1c302b4bc9410434224bad74130a031473
 EBUILD freecad-9999.ebuild 11973 BLAKE2B 9befb852d6d7b8f5310c0692c5175ddb87a45260eddbe31a3376362218136a2e27b5cc5fbeff8269558c02b4448bdc553a68772ad9b565d19d3e2aa34dbb6fd8 SHA512 bf284186d32f598ab85fab40c7cdd67f185d8147e5951681ad86c030c523453049365c6cfc2a503268f82cf3ce0a5387e61541f765ca1fbffeee18cb5b875d1e
 MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042
diff --git a/media-gfx/freecad/freecad-1.0_rc1.ebuild b/media-gfx/freecad/freecad-1.0_rc1.ebuild
new file mode 100644
index 000000000000..cfc5732f206f
--- /dev/null
+++ b/media-gfx/freecad/freecad-1.0_rc1.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
+
+MY_PN=FreeCAD
+MY_PV="${PV/_/}"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${MY_PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug designer +gui qt6 test"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
+FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
+	openscad part-design path points raytracing robot show surface
+	techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} ${module}"
+done
+unset module
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/yaml-cpp
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/boost:=
+	dev-libs/libfmt:=
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c[icu]
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[concurrent,network,xml]
+	)
+	media-libs/freetype
+	media-libs/qhull:=
+	sci-libs/hdf5:=[fortran,zlib]
+	>=sci-libs/med-4.0.0-r1
+	sci-libs/opencascade:=[json,vtk]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/libusb:1
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? (
+		!qt6? ( sci-libs/vtk:=[qt5,rendering] )
+		qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
+	)
+	gui? (
+		>=media-libs/coin-4.0.0
+		virtual/glu
+		virtual/opengl
+		!qt6? (
+			dev-qt/designer:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtsvg:5
+			dev-qt/qtwebengine:5[widgets]
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			pcl? ( sci-libs/pcl[qt5] )
+			$(python_gen_cond_dep '
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+				dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken2:=[${PYTHON_USEDEP}]
+			' python3_{10..11} )
+		)
+		qt6? (
+			designer? ( dev-qt/qttools:6[designer] )
+			dev-qt/qt5compat:6
+			dev-qt/qttools:6[widgets]
+			dev-qt/qtbase:6[gui,opengl,widgets]
+			dev-qt/qtsvg:6
+			dev-qt/qtwebengine:6[widgets]
+			pcl? ( sci-libs/pcl[-qt5,qt6(-)] )
+			$(python_gen_cond_dep '
+				dev-python/matplotlib[${PYTHON_USEDEP}]
+				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+				dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
+				dev-python/shiboken6:=[${PYTHON_USEDEP}]
+			' )
+		)
+	)
+	netgen? ( media-gfx/netgen[opencascade] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+	')
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+	test? (
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		!qt6? ( dev-qt/qttest:5 )
+	)
+"
+BDEPEND="
+	app-text/dos2unix
+	dev-lang/swig
+	test? (
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		!qt6? ( dev-qt/qttest:5 )
+	)
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	designer? ( gui )
+	inspection? ( points )
+	path? ( robot )
+	python_single_target_python3_12? ( gui? ( qt6 ) )
+"
+# There is no py3.12 support planned for pyside2
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
+	"${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
+}
+
+src_prepare() {
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die
+
+	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875221
+	# https://github.com/FreeCAD/FreeCAD/issues/13173
+	filter-lto
+
+	# Fix building tests
+	append-ldflags -Wl,--copy-dt-needed-entries
+
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF					# deprecated
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON
+		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for current git master
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=$(usex netgen)
+		-DBUILD_FLAT_MESH=ON
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex gui)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=ON
+		-DBUILD_MESH_PART=ON
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=ON
+		-DBUILD_SPREADSHEET=ON
+		-DBUILD_START=ON
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TEST=ON							# always build test workbench for run-time testing
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		# BUILD_SANDBOX currently broken, see
+		# https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	if use qt6; then
+		mycmakeargs+=(
+			-DFREECAD_QT_MAJOR_VERSION=6
+			-DFREECAD_QT_VERSION=6
+			-DQT_DEFAULT_MAJOR_VERSION=6
+			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
+			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
+			-DBUILD_QT5=OFF
+			# Drawing module unmaintained and not ported to qt6
+			-DBUILD_DRAWING=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DFREECAD_QT_MAJOR_VERSION=5
+			-DFREECAD_QT_VERSION=5
+			-DQT_DEFAULT_MAJOR_VERSION=5
+			-DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
+			-DBUILD_QT5=ON
+			# Drawing module unmaintained and not ported to qt6
+			-DBUILD_DRAWING=ON
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# We use the FreeCADCmd binary instead of the FreeCAD binary here
+# for two reasons:
+# 1. It works out of the box with USE=-gui as well, not needing a guard
+# 2. We don't need virtualx.eclass and it's dependencies
+# The exported environment variables are needed, so freecad does know
+# where to save it's temporary files, and where to look and write it's
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	export FREECAD_USER_HOME="${HOME}"
+	export FREECAD_USER_DATA="${T}"
+	export FREECAD_USER_TEMP="${T}"
+	nonfatal ./bin/FreeCADCmd --run-test 0
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if use gui; then
+		newbin - freecad <<- _EOF_
+		#!/bin/sh
+		# https://github.com/coin3d/coin/issues/451
+		: \${QT_QPA_PLATFORM:=xcb}
+		export QT_QPA_PLATFORM
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@}
+		_EOF_
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
+	use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die)
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	# ToDo: check opencv, pysolar (::science), elmerfem (::science)
+	#		ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl)
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature_header "Computational utilities"
+	optfeature "BLAS library" sci-libs/openblas
+	optfeature "Statistical computation with Python" dev-python/pandas
+	optfeature "Use scientific computation with Python" dev-python/scipy
+	optfeature "Use symbolic math with Python" dev-python/sympy
+	optfeature_header "Imaging, Plotting and Rendering utilities"
+	optfeature "Dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature_header "Import / Export"
+	optfeature "Interact with git repositories" dev-python/GitPython
+	optfeature "Work with COLLADA documents" dev-python/pycollada
+	optfeature "YAML importer and emitter" dev-python/pyyaml
+	optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
+	optfeature "Working with projection data" sci-libs/proj
+	optfeature_header "Meshing and FEM"
+	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "Triangulating meshes" sci-libs/gts
+	optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fa85394de34a..3e71df89c4ef 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,5 +1,7 @@
 AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085
 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8
+DIST hugin-2024.0beta1.tar.bz2 10351004 BLAKE2B 53bd8d1622ee9cc407d25cc3edcb16063689d6f949f38d4e4bf0c9afd6fa7f065bdab030dd6a2f2a2c82bb6953e8f16655d5a1f305d0b494a4a4ab8ce6dddecd SHA512 3395e00d1e895db4ce063b6e2e936f2af8aed0740d10ea15763c94549e64953da4e9c214bd6058d879435527e945c4ddfaa75d7d8efb98e7220102872c4f8305
 EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf
+EBUILD hugin-2024.0_beta1.ebuild 2117 BLAKE2B 1bf1c8e04ad68397e95d87e5a8ae9d7a5432af2ec8139dba6fd198a29edfbcd97b4052ac5f38f45e22a0be1c2664dbb0ee640bfa2ab089e17986b2760cd9c811 SHA512 6f2da09f4f2700f9becd4c1e9da9f957ba197a5b7636faf1e1f7324d1e3a95fe75b02cf9b474dbe26fa69b586af65c9c28e90c2559b11295ac4711f0758f47d7
 EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2024.0_beta1.ebuild b/media-gfx/hugin/hugin-2024.0_beta1.ebuild
new file mode 100644
index 000000000000..ab8ecc11df67
--- /dev/null
+++ b/media-gfx/hugin/hugin-2024.0_beta1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-single-r1 wxwidgets cmake xdg
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/}.tar.bz2"
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	>=media-gfx/enblend-4.0
+	media-gfx/exiv2:=
+	media-libs/freeglut
+	media-libs/glew:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libpano13-2.9.19_beta1:=
+	media-libs/libpng:=
+	media-libs/openexr:=
+	media-libs/tiff:=
+	>=media-libs/vigra-1.11.1-r5[openexr]
+	sci-libs/fftw:3.0=
+	sci-libs/flann
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
+	lapack? ( virtual/blas virtual/lapack )
+	python? ( ${PYTHON_DEPS} )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HSI=$(usex python)
+		-DENABLE_LAPACK=$(usex lapack)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+
+	local lang
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca) dir=ca_ES;;
+			ca-valencia) dir=ca_ES@valencia;;
+			cs) dir=cs_CZ;;
+			*) dir=${lang/-/_};;
+		esac
+		if ! use l10n_${lang} ; then
+			rm -r "${ED}"/usr/share/locale/${dir} || die
+		fi
+	done
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 68ed617bf804..3ecb7ad31e78 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 6e4d2a76f75a..8773dff6d410 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,5 +1,5 @@
 AUX simage-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch 1175 BLAKE2B 6533dde5a029fef8bf3804855f11e703beb3e02c36f193343c3337590659e5562539fbe853914ad7287ca6cd840b432d0c71d2847da7c6884b714b5512af49c0 SHA512 1dc17b023ba8a9e07a9ae971d99d9200ce14374b106e648b4a6b62e06e0ebb34e01a635c9cacd6579b3606cf62448953e459c5b1ca45a21ede9e5c0c19b8812f
 DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03
 EBUILD simage-1.8.3.ebuild 2335 BLAKE2B d7c97ee33cf75a66034abbc477bd01e87a66d163250e3178a6946f1581104e400dbad04db35056df125b947012cecfbd9cc437cf468fafe2ecb905ebac41b5ff SHA512 1bf68cc9a4e303f08a43317c5ea3d3e00e2bf960dbdb19b52865f8cebf89cbf791553cfc2a46665f14cc6e96846feb5d79c078a858d434c0469f06c25ad12877
-EBUILD simage-9999.ebuild 2339 BLAKE2B d527ed5f2ad1585c36008f62489eeabb87fbee76e325615ae20313baa915aa3f3fd66addc8c2775f7d44854b6c1334f002c4ed284179de8b4d57d5459286e61d SHA512 749b1f724a0b8c0fbd8e5f99841a4c7289307c9a3eaf6e6dab0c0f1d331d0a73c8522faabcbb30a7d263ee227630e8506120363aa383eff3c01551e7903d9bbf
+EBUILD simage-9999.ebuild 2195 BLAKE2B 618de67f99e1dd788a0deb7e841855bab3668e4645b82aba660400f254e1ad98a339901fd527558fdfa64cf2d0825f519d0595fea368530a8c70296f9870b46c SHA512 9ee520ed02d22469ff31ec572a3343d8499fe92f90a8b20879b97721089c155bc8a9b46ddd194772ab1ca015c8e0ad471b684408e82fa200dc33b91312f3aab5
 MISC metadata.xml 298 BLAKE2B bbb65357f89a126895f808f22a14211302edac1ef368ceea547a0cb8b0a4d62e50e61572a47a2d9a123d22f33f384cd7fe6b0604d78ce83701608db0725a076d SHA512 70fe0d52216ae4902962671d07b6667c1aad035e9d6a737700a44d3f0ef08670e965cf692dcb3fe106a0dd62125b9fd433bd980cc46a3be4d34cfef7d79da06e
diff --git a/media-libs/simage/simage-9999.ebuild b/media-libs/simage/simage-9999.ebuild
index 484683446336..fce11a8bd619 100644
--- a/media-libs/simage/simage-9999.ebuild
+++ b/media-libs/simage/simage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,21 +19,14 @@ fi
 
 LICENSE="BSD-1"
 SLOT="0"
-IUSE="gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib"
-REQUIRED_USE="qt5? ( !qt6 )"
+IUSE="gif jpeg png qt6 sndfile test tiff vorbis zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gif? ( media-libs/giflib:= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[gui]
-	)
+	qt6? ( dev-qt/qtbase:6[gui] )
 	sndfile? (
 		media-libs/libsndfile
 		media-libs/flac:=
@@ -60,12 +53,6 @@ PATCHES=(
 DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
-	local use_qt
-	if use qt5 || use qt6 ; then
-		use_qt=ON
-	else
-		use_qt=OFF
-	fi
 	local mycmakeargs=(
 		-DSIMAGE_BUILD_SHARED_LIBS=ON
 		-DSIMAGE_BUILD_EXAMPLES=OFF
@@ -75,8 +62,9 @@ src_configure() {
 		-DSIMAGE_USE_GDIPLUS=OFF # Windows
 		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
 		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
-		-DSIMAGE_USE_QIMAGE=${use_qt}
-		-DSIMAGE_USE_QT5=$(usex qt5)
+		-DSIMAGE_USE_QIMAGE=$(usex qt6)
+		-DSIMAGE_USE_QT4=OFF
+		-DSIMAGE_USE_QT5=OFF
 		-DSIMAGE_USE_QT6=$(usex qt6)
 		-DSIMAGE_USE_CPACK=OFF
 		-DSIMAGE_USE_STATIC_LIBS=OFF
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 1d8818f1409b..c612aa4b6eab 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 0980cc94e8f5..55dd9b6387eb 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-modplug-3.0.0.tar.gz 85106 BLAKE2B 8417d84510462e13cd25fca068552cf3152ef74e6ef55e144a7c44740c6fb43ecd74c6ec9057c24d844f9fca22b71a14dc36e6b103a3c9c5023919a620b524c9 SHA512 0b84ddb0134dec2e5ea61ad40c34f65148038cda106b8454988d7b3a73f79d44316299f38a672c5556b05ed776d51ae643073bb7a8b7f9f702a8b67c02698cc3
-EBUILD kodi-audiodecoder-modplug-3.0.0.ebuild 762 BLAKE2B 6f0088e16da5deebd547b3d533e4b0005f861e709a350dd306f8e2f217ba6d0243e7ce412b8411fcb7df73fa583492f17d254231a1e066b1c09e2061cdcf60b6 SHA512 248826694068453d2d01b23fd65e193e142377c1481ac498023a8abd08ff64dfc08ead78e89b06ddc8e0dbad01b33458c391c8167a0ed257187ca7787a1b5b73
 EBUILD kodi-audiodecoder-modplug-9999.ebuild 762 BLAKE2B 6f0088e16da5deebd547b3d533e4b0005f861e709a350dd306f8e2f217ba6d0243e7ce412b8411fcb7df73fa583492f17d254231a1e066b1c09e2061cdcf60b6 SHA512 248826694068453d2d01b23fd65e193e142377c1481ac498023a8abd08ff64dfc08ead78e89b06ddc8e0dbad01b33458c391c8167a0ed257187ca7787a1b5b73
 MISC metadata.xml 373 BLAKE2B 127cb61e464d94b1e4df96985dc403ba5e17ac9761cf702d39d2cd618a634e210eeebfa695d5961cd9c9a21f7daa70837b932af56328f1516461f2102a85600d SHA512 b474d3093e70bdb5789cbdf850b97e63ecffaa8268d9fec4e61f4402595507f6f798a08733025e62f13e99ffa198da4df0d041cc39ca0065a44ffb7be630dfd2
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-3.0.0.ebuild
deleted file mode 100644
index 98b3f1a54305..000000000000
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-3.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.modplug"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.modplug.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libmodplug-0.8.9.0
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 2efaee727050..e35ffa741138 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-nosefart-3.0.0.tar.gz 99808 BLAKE2B 47dc58653893b5932c65ed01505d607f3bbbe3f5a7ed64292ed496431d3e1d2324662d16da6d02eb6b21962e624188e78fc3e684007d4902c77f2a395975f79a SHA512 8267a3f99a7816beea527a9b22a1dbdb48a2756de5f03f72b6126cba1f7d6579bd51ea42a8a36f97724562fca3122d512e8415f370c2621c7d38034e9af3a863
-EBUILD kodi-audiodecoder-nosefart-3.0.0.ebuild 676 BLAKE2B 71631f7bf0371eddd3643986374f5ae0c59578f4f4c7874c87f46da9c057f0ba6f778a3c7a6142f2390753ad8a2d876e886b8bd45d68fc13cb18ef20f2ae963c SHA512 a9940335a9147a36021cb060518b8edf0412bf4b98739ad950ac2f2dac11903adff2907b182668556ebe752e5f7adaa60494683097c9ae2fc1b23e821cc38ea5
 EBUILD kodi-audiodecoder-nosefart-9999.ebuild 675 BLAKE2B e897fcc755b6782671f6750fa15c4cdb8a0cb4dcad61ea40b610155ace1b9466a5bbe25e5e13d695ef4024ae1f0751b400fae058a57c453954ffb051f89cb656 SHA512 7626c55ea19497d8cc652bfd75782a262a02161325b7428e71657beb7fe9abd0a15028fae4c7b11b9af33f46d43813338e1f5d59f2bf69c47473cb38fa9fcafd
 MISC metadata.xml 374 BLAKE2B a9b532fa9c9612d52138304e42619e234290eeea5fc1a82b6e24d284e2407f05d17461a7b88637295fb98b247b2a8046317cb702c777e11addba34af09be85fb SHA512 0a88901cecf7feefcab50fd56b84e87cd9f792200b7ee26f981d05e972b4a799536d0821a73de6608c37a9dc4ef06d7e8b025bf32541a3d319cbb66e77b52153
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-3.0.0.ebuild
deleted file mode 100644
index 5f75dcfd39e0..000000000000
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Nosefart decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.nosefart"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.nosefart"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.nosefart/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.nosefart-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-sacd/Manifest b/media-plugins/kodi-audiodecoder-sacd/Manifest
index e4f60d04bfca..88d9704c98ca 100644
--- a/media-plugins/kodi-audiodecoder-sacd/Manifest
+++ b/media-plugins/kodi-audiodecoder-sacd/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-sacd-0.1.1.tar.gz 114596 BLAKE2B 0bd6c7e409d08c08dc62d0164d75c4536d1d844dc8652f5351e6df06c34647f4cf37b5b844e4c2d2a91c2872f0b263b7e87259a1cdbeb267a09a2fd14eca12d8 SHA512 91678aab7ae217f0e8536a0af7d1e62fcdfa9fce30e0ecaaa6bcf71bf54bf780424b0db9330276a5fcdde1bde46b9098a99cd5377ae23ddc44975f8d36ac6e99
-EBUILD kodi-audiodecoder-sacd-0.1.1.ebuild 754 BLAKE2B ffba5ed9b906ecd5f359dda8b0be8faa80ef86be5d59b1455bb606aaf07ba6db5170e7476e61a23e0e1709e59d7425f929259a78ecd6097b769ea3268e1e3861 SHA512 c834d8f409acf1aeec7b845d2f2eb3f41f3bd682a463b302a143ffc5754f2b082f9310723056173dc5edee364c44bb8e599061ac9e8d6badd3d5368afefe2165
 EBUILD kodi-audiodecoder-sacd-9999.ebuild 754 BLAKE2B ffba5ed9b906ecd5f359dda8b0be8faa80ef86be5d59b1455bb606aaf07ba6db5170e7476e61a23e0e1709e59d7425f929259a78ecd6097b769ea3268e1e3861 SHA512 c834d8f409acf1aeec7b845d2f2eb3f41f3bd682a463b302a143ffc5754f2b082f9310723056173dc5edee364c44bb8e599061ac9e8d6badd3d5368afefe2165
 MISC metadata.xml 366 BLAKE2B 33c7bc5215cdbc98e0cd484a38cf1653c726004a6bdd0f6dad9d805d42fe95c49dd5118c021cd0b7637d69bed1f355b8d9b9a2a92b9b6c8368b82e5082254906 SHA512 427beee76c6c5002f43ff74b33c22418504dab86facedf6d2b590a1a842a8096f4e0ea14dba35c274d2ddeb8371efc30ebc519d3bec5b54fe8fb11e3c7d6f262
diff --git a/media-plugins/kodi-audiodecoder-sacd/kodi-audiodecoder-sacd-0.1.1.ebuild b/media-plugins/kodi-audiodecoder-sacd/kodi-audiodecoder-sacd-0.1.1.ebuild
deleted file mode 100644
index 167ad90ebea5..000000000000
--- a/media-plugins/kodi-audiodecoder-sacd/kodi-audiodecoder-sacd-0.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Super Audio CD ISO-Image decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.sacd"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.sacd.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.sacd/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sacd-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	media-sound/wavpack
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index 934902d1284d..f96330481986 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-sidplay-3.0.0.tar.gz 33311 BLAKE2B d600ffbd69baccca33b47d6af57d4e0a78f4d08da9390c6a92620962ba91464600deff69b62cfdaec35f24a0db8da4d1332f8902293cc041e7c543f659098a2f SHA512 6e17a4f7a1095595081fcc76e58ac22994b50b3a1e1d4599524029a0d4058b8583a6f0fc0a32ecb6c4b9a159bf74cf28fbd7166eea587575bdd5dbe6d8aebe69
-EBUILD kodi-audiodecoder-sidplay-3.0.0.ebuild 778 BLAKE2B 2033bc3a8521eae8ba336661c1af9ce0864eb556062440e4665580e6afc7f07ccc4d8a090c64b687f7f8adfa0fa7bcd3255695551a7bfb8343f9da532044c640 SHA512 b2b7efcbe7e8b125963582ea3e8e9b9723aec30dc3e2d8f71873e1ceb9c987524550214d792fa4b861ec038669aeb9272f728876f1efe5e5dc94efd682f94eb4
 EBUILD kodi-audiodecoder-sidplay-9999.ebuild 779 BLAKE2B 879c0d2faed9de9e36751830fc1bc696ac5648df2b00311deac27346794faadffb98c33720b94619a669ceff3566a4a6d926643c97cdf9688ca1550cdc87945e SHA512 ee680a9b34eaaecad077c8e391e1ce0ce7afeb7963a8e9464bdfb49880fe9af5fec574dc24afe03b8cf572ff0756baf8a43ba71a71234ba9c471c2947f20a411
 MISC metadata.xml 373 BLAKE2B f176248a09a28119c83a9cefe4428f62c45b6a2baec66f874ded5f592d93addde100f82d5bfe257c41f3a6ab84bbe2993416ac97b66745dbb9035d95f55d528e SHA512 13f12cb6002a522ba5e20574f024db4a0225cef62cfdc3cdd3968b9e59a2996e3714da06e4d2af62d7c95eeafab84c6da1983c07d4f03cc1c20f8b2f72b11f78
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-3.0.0.ebuild
deleted file mode 100644
index cbdf4dc859bc..000000000000
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="SidPlay decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.sidplay"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.sidplay.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	media-libs/libsidplay:2"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index 312bcc801aec..55b04f2acce1 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-snesapu-3.0.0.tar.gz 78398 BLAKE2B 7bd97f6586b4aecc5948d967a6986db6292aa0387bbb75b59c3b2698f37afc9e511ad8be90b83a88bf69241dec51db22965d62d09e79dac0e820b70601947711 SHA512 cf3a23a6181459e0513ed644d79315665f11c3186a66e9a3d3f4a7d9ffa820ebfa0d050bb329ee36b93c2f2113b734cf7a6d8c4c17ca40a6bbe22056998ed0c0
-EBUILD kodi-audiodecoder-snesapu-3.0.0.ebuild 671 BLAKE2B 084a99c944524b573433fbbbb745a20a7be44154a14aceeff02686f5ee9fe6330a44c3c2e2b65e38587fd0404c128a0d93f2867e8c5c5ffb2111a83dff5912c6 SHA512 81c67f77647fefcf83efe88cdf753664050b973c2f742767bb1547838a36486a4ef726469ef385dc4d2b1f821fadc09e79d721b9a2b36848609e0b035dabe0bd
 EBUILD kodi-audiodecoder-snesapu-9999.ebuild 672 BLAKE2B eea9c85956e5246a2ba074a9901b6e2745da8bf45f4b655556eb7883a1a4470fc3686a6b970c06be15092723ca2913d6d17065fd6ae2480b261904297e58eabf SHA512 40c970149efa7c8b3da7f0401830489a0f370eb7c4f474b8db1389f27ea98ef92cf9d3d7618dd864fbc138d338017bef40b437271750b1eaf7bdf21e80a07acf
 MISC metadata.xml 373 BLAKE2B 5b9c844743e1b9424cd5e0e265128694ae9d8f57a8f4acb3ef9078b3e81d543b62a24083fea4f0ff18b4ddf81af6dd3d22e79ca82e7fb7c013c9e1d550d1ef90 SHA512 1e49aedfbd76c41590dccfa43bcad3d1ad55b8fca0f03f38d313ab943331f03ded16129ad2d50cb22a9cf8788f79aa7b683763a4e9a49cf1a2fa3c732da31de0
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-3.0.0.ebuild
deleted file mode 100644
index b3e2b19abd82..000000000000
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="SPC decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.snesapu"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.snesapu.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index 884ac1d03c2e..c4c39cdd2b87 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-stsound-3.0.0.tar.gz 97776 BLAKE2B 8896592b822c2bb59ef7404e12d47a9a8977c8277905f07797173cc7b66f61dfc947a8bb02a292365fbb7ad37cd6d39c1ecf74e5fe4156dee87a5b3d04ff0a9c SHA512 ac8c284912c1ccc8975ef9a35153ef0e9d6754a67c3f51ccbb69c2bc4b0533666cbb80e45803586e70dec4f23d9b714b593f957d2a2bfb522cc549c6e1f1e111
-EBUILD kodi-audiodecoder-stsound-3.0.0.ebuild 671 BLAKE2B f13d4a9d004cab97c7c330c5ecd7e184392f3c8757e700628af52900ae3fcf4e8f403eb2a10561ae39ec849be3e2e2a48b355f42a67be935341418fc04b91ec2 SHA512 1761596c64540e71e08a9d596da8b4c24fc7b0dc21889d4076d30a7ac1d50f7018d01f81af51ed20eaf6e08b1e917bdeac880815fa85a48525bdff3dbbd74576
 EBUILD kodi-audiodecoder-stsound-9999.ebuild 672 BLAKE2B a09990ad142a4ba49018563f729bb194d861077c3ceea84f31b68a9ff1a27d92dd9c1096e45c370fd92f401c61f75644f8594d7b8ce3978ab4a1e7b3e775ee76 SHA512 ab576cf5999194435860cbd9e224893f1832724b1a6c1f0f86e484294579e3a1ecaa1397f2c96c55811afa7e216ef97986a9789ccd33add5c9feb241afcfb35a
 MISC metadata.xml 373 BLAKE2B 1bfaa47f1827e0799192e1d6d874868c480f14a1f555f628d8b381bcdbb9ef65254637a0cd982d3c79e6a7e5a307802c6ebb9df72e77bd0880f7ebba1deee887 SHA512 b0f646d4f591746627087dd7300de8cf8d9e8b315b40217db1797e44819fec83065f39d0dc98ec09f4e16905903d6d8bc98eb76c3b3ac01ce8df2326c5e636d7
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-3.0.0.ebuild
deleted file mode 100644
index 6ebb9dad83ae..000000000000
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="SPC decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.stsound"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.stsound.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index 3a7170f292a3..91be3e17dbe6 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz 1836160 BLAKE2B 31211bdcbd136e869c889304360a2b7726674b8c7f0bfa5b4d6b1e534d8d9b7922b1435941354b6c21bc8004664078cd41f3374dd4d434ba3917fe7e25e07a22 SHA512 e98487ce3d08a3215be86b161ca79e04fa611c75c51a4dbbca9b80779b2ae4729faa98e3b6f810deda025a57fe7278420a3b5d532683b8778d15773fcae04ba4
-EBUILD kodi-audiodecoder-timidity-3.0.0.ebuild 692 BLAKE2B 273117efb0fd36a663f9cf5828149999b5b3986e721e2bc0c335f96b7507488a417411b2cbc8dd330965b2faf891c337d4dd37a46a65e7f4539fb389dbb236a1 SHA512 d4484a2611e3e8b2e0413a266c6f28a6438efea296e39a7e54632b34b7b0b1807cba365f42a4455cdce26283930760f882e037ba39cdb0c9f00d0a56181d0671
 EBUILD kodi-audiodecoder-timidity-9999.ebuild 693 BLAKE2B 2adf9ed2e7887ee7d247b37c87b85793be0d69784f937aca3f51b5914233b84d2b67134e628c30ee035e02e1042c88890d77f9e9d94a0eec6b4dd487d2c7000a SHA512 7863dc860914ff16c3fcfd772285d293b42c5c1c6c3e2b40c6b609527c2a976afaa86d6c3cf3948258110536e33fb59f9dd30757db1705f0b594db0a6fb0a0c9
 MISC metadata.xml 374 BLAKE2B 0d2ec93daa23221767054652f6c94e7a5c75aaa4c86be9eab02bff29d4d175b8d76d42678ca28bf4a5a20b127e781bb0967e858b75e86c3e6f38dee70ce53019 SHA512 9046baf69c8ba08ebf900f0bd0a045f39627224ae600bfb93cd9bf51d620ddddf634bec38bc1f41906455659562ed561e9cc2b8882150863b288a24374b2d9ac
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-3.0.0.ebuild
deleted file mode 100644
index 5de6569fbb21..000000000000
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Timidity decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.timidity"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.timidity.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index 651ac501f923..14393dc6c936 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audiodecoder-vgmstream-3.0.0.tar.gz 4857345 BLAKE2B 394e955a319d7ea0d4352a2ce801f74a64839949d533b6d753da0c3163131b70e63f873c4831eb5734d806e8db915c4dde5dcb93e4f1df458d0b3f3c346b6dd8 SHA512 896879c26896596fe4bca83f581e2b4f1d597ea25e9295680db9488508bfa6e09f3a624255a0ab556a1cc429c596cc05b7382c862222d66a28f942f916775b12
-EBUILD kodi-audiodecoder-vgmstream-3.0.0.ebuild 681 BLAKE2B af4f0dd8e973ad6b105f2c24b15bd5b9f3db2b3df0ae4e3962f2781ec9a8ec1bb4e92eaefc18786cc950df31b7c659021c126a6dd9f8c9e0d95a344355bf7ed2 SHA512 4ec5a4ad21e8f19de9eb074a88d879d9cc05acfda8da1742b4c9a4360011373755b88660a2ce78fd94569f9f17eacb88d7219fba4d3ae112a3333a814383588f
 EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 682 BLAKE2B 3f999989cd911bc1cd8159b5443295c839ead5e13412e1eda02372de7930af8c5d99ab761b724d6f944f4c324dd63c0209176938404a00a61f72d3c388a1bec3 SHA512 c18d0a7503474fb39c29cf759665de610ec7e2bb8ad81fb34a16e9dc9410ea8424e58284be784751e6060bca3c4f2e7b7345797203edf03e324f565855d914ff
 MISC metadata.xml 375 BLAKE2B 88c22c3320d30dad99b7352255d954c02e74d769ed407f7c3ce5a77839a6abb9eec8a0bd40cdd46d685704520e825d14eec756ca0a0309426cac092b8c80f5b9 SHA512 95afd97480c6747d613518eccb305859d904b97068db5a5f063a399de24a5dac7d60499de8fe9120af782319bf9a3578d14aeb6505403bfb6e120c0e56f12966
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-3.0.0.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-3.0.0.ebuild
deleted file mode 100644
index 55137a89153d..000000000000
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="vgmstream decoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audiodecoder.vgmstream"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audiodecoder.vgmstream"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.vgmstream-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index 48789f4fa3a2..889ba5e5b1a7 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audioencoder-flac-19.0.0.tar.gz 41951 BLAKE2B c2464faabe31035d7d04eaff3ab8f36bd4a47db76e17bf821261fbf28377c94ed94df314cc01bbc06bfa2d8b4f23a13d40c7e9dbfb47d5dfcccb141e34a2f17a SHA512 a870069b7283f2d870327675353e79942ddb7358fa042b51b21f940d0c128700619274afaae2d820b7a2bfbd2289e4cce2d2075d4a10cebc6b15d014f77fd1e8
-EBUILD kodi-audioencoder-flac-19.0.0-r1.ebuild 838 BLAKE2B 8876d70e84b2c27840ff58b807ced19ba346c5b65a1f96ee3c047ad0e74f20d54e8efaa0ad58357cf6681f0a75de79db95571d9063b56eb5f7ea7b1c71c66b14 SHA512 d5f7232049cb1a71671261e3118fa9186d5f47072423444694f706d3f1261d47cdaff05dc7528757926ab933128b040ee18c59dabf02b11bc942260f3869ccc5
 EBUILD kodi-audioencoder-flac-9999.ebuild 838 BLAKE2B 8876d70e84b2c27840ff58b807ced19ba346c5b65a1f96ee3c047ad0e74f20d54e8efaa0ad58357cf6681f0a75de79db95571d9063b56eb5f7ea7b1c71c66b14 SHA512 d5f7232049cb1a71671261e3118fa9186d5f47072423444694f706d3f1261d47cdaff05dc7528757926ab933128b040ee18c59dabf02b11bc942260f3869ccc5
 MISC metadata.xml 366 BLAKE2B 12e4012ee698e6cd0929b50634e680d084a639341561d724d9c7a47c9754a2941df9cc217c0c0732c2f0e712ba9734fa591f1e2f8b039b4e21ecf5f19b4d1a61 SHA512 e1ab1e85c61e4caabb92850fe0f01adcc5d2dd158459604971bbca4cc60abcb4b0779d86754902a00bb60a670998d812f6a65b5b36d623753ee1e7bdcbf537c7
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-19.0.0-r1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-19.0.0-r1.ebuild
deleted file mode 100644
index ab0890485aa7..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-19.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libogg-1.3.5
-	media-libs/flac:=
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index 01c3d5aa269f..43f177f44cb2 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audioencoder-lame-19.0.0.tar.gz 35760 BLAKE2B adac00f1d2b2cfec25e8c5f01517f5f96e1121225d7c9955508b53960f35a35d81bdd2d22b5616685439d4490ff33b5b6d8839b117278e46270d64cc10b27bae SHA512 33d7406d43801049f8e75ee0adf9cfef504dd324a2b62a9a37576a75d34ecab1e863b400c7df5484be5db64e6acda4f2572d9ea5532220d86dae9538d6d5fd5a
-EBUILD kodi-audioencoder-lame-19.0.0.ebuild 823 BLAKE2B e03af04460930813891b88988459df497d93776377961d684817e1d93e5eed15ffcd151d2f2aa2f9f1642b3aecdd9afb85755f8b0987ef156084b5352cd18d5d SHA512 820bd8ea405a22461f26d7f28c6317812b39ecf8f56cbd1cd94a4b19cb6ac7bf0014810c760a89910c921e8be8d7243b936af6e87532dcfeeec27a354633f9a1
 EBUILD kodi-audioencoder-lame-9999.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
 MISC metadata.xml 366 BLAKE2B 000325147dba519bc307f2c231a16f942965f16e2db7e08fc83f38efe6f419da6cd99c4423ab3718d597b66d139d8bf6b3bd2f92b9b7d112af7f7cdaa534636c SHA512 5f972288c26d0ce556a0d17faf9c6e7f631b111926323066f6ec500ab2a059aa3327d7c0a7deb8d0c25aa5f657effd8f29708c1f92949a2b4713b8efb4e18f4e
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-19.0.0.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-19.0.0.ebuild
deleted file mode 100644
index 5182bd5788c3..000000000000
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-19.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Lame MP3 encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-sound/lame-3.100
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index c4db77692ac4..2b11aada28db 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audioencoder-vorbis-19.0.0.tar.gz 32058 BLAKE2B faeabd15682b244e19bbf93dbf3a6d69642c803a640b6e2cb0ae5a73a40c47afd18179d3ae4db8e032bf5d59c6452d54176a8c4eed6ce30479d6cbb3c2b4aa13 SHA512 3f6cec4ec4f2ab6af674c3527b85f41025e7df512a521883de9bba719b85d41ff2897294d616f9294b8cd794b290ac7e4dda8dd252bcc3a47c723bfb2e7e526e
-EBUILD kodi-audioencoder-vorbis-19.0.0.ebuild 860 BLAKE2B 048888c59b60be0dbc4bf44503358f0eb8ae637606841feab58bbd6428a2206b1d952eabc7badb4f615a66488136e48921c07b7df2861002cc1db1995fcd7027 SHA512 d9022fd48097e4293b2256cf7a36967132afeabf360c0f3be9a8a0a7a9e5d7712ad47f269629d3768f9577595b8f5c605442626c68ddd5a331e66f19248f112a
 EBUILD kodi-audioencoder-vorbis-9999.ebuild 860 BLAKE2B 048888c59b60be0dbc4bf44503358f0eb8ae637606841feab58bbd6428a2206b1d952eabc7badb4f615a66488136e48921c07b7df2861002cc1db1995fcd7027 SHA512 d9022fd48097e4293b2256cf7a36967132afeabf360c0f3be9a8a0a7a9e5d7712ad47f269629d3768f9577595b8f5c605442626c68ddd5a331e66f19248f112a
 MISC metadata.xml 368 BLAKE2B d740ed42e7b7b10d28ebb69a4f4594160f50e4c21286857c3b627c5840a281b18df7e68b5e647d5066e8df33aeffee3fe7dafc7bd51f901ceb1577628a453856 SHA512 9077afec2e562b90581240985484fce98c1382bdf54dd8c5e753f8bbb654922d294f3dac874bc051bd86d4d1930bacaa21f5e7090926e7cbcedbf10af84925e1
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-19.0.0.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-19.0.0.ebuild
deleted file mode 100644
index c9f224ea7241..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-19.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libogg-1.3.5
-	>=media-libs/libvorbis-1.3.6
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index d84dd6f57a28..7f606ecd4d51 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-audioencoder-wav-19.0.0.tar.gz 18624 BLAKE2B 4548ce324e61f733a7e4eb6301cd1d13058c0257bf55ea0a1ed8f5c9be8dbd801e0b3337050d1b3dcf626db7f75f3bc91d3d68a5949efa6ab5bf581b073754fb SHA512 4bd41137a84f738e38f56ef79f8bc5d69c5d45e64fe6f724a23e6b8ee70cc44085032122709e9bb7b0a384e63caf5317de59a54ee05669e286b39ed1370fe787
-EBUILD kodi-audioencoder-wav-19.0.0.ebuild 655 BLAKE2B f64893238ebb7eef14c3376509183d3e699e611811dcfcdaf364a911ff24b13637a168a5489b27a38bdf4f3586a28b2cd1dfd4d02d858d35640b90563461e993 SHA512 1b6ed7805721d424cc0ebbe6e31b2f82a0626c2d22fe13fb1001f30a54f26571f5a5097701808cca6150992e49dc86a5928b713daf7441e6857f12a8ea39e70b
 EBUILD kodi-audioencoder-wav-9999.ebuild 656 BLAKE2B 29ade224eaa01c5904207874caca846523522d8632f411900dcaed926db7e1ebe0fe295bed9e79e654179fa4bb232a48083a4932b942d35c7886ca8e52ccde15 SHA512 677d1ee2a8e56bc6b235c857f9028a4798805b4cd86ac7cf854ba6284ba1c9b58138590fcfe8afc6be6c189638832dbd4ba50bb6aaef60d5dab22f627d19df96
 MISC metadata.xml 368 BLAKE2B d740ed42e7b7b10d28ebb69a4f4594160f50e4c21286857c3b627c5840a281b18df7e68b5e647d5066e8df33aeffee3fe7dafc7bd51f901ceb1577628a453856 SHA512 9077afec2e562b90581240985484fce98c1382bdf54dd8c5e753f8bbb654922d294f3dac874bc051bd86d4d1930bacaa21f5e7090926e7cbcedbf10af84925e1
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-19.0.0.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-19.0.0.ebuild
deleted file mode 100644
index 692a58b3154c..000000000000
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-19.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="WAV encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-game-libretro-bnes/Manifest b/media-plugins/kodi-game-libretro-bnes/Manifest
index d7c8004fe61c..fe11647fc7b0 100644
--- a/media-plugins/kodi-game-libretro-bnes/Manifest
+++ b/media-plugins/kodi-game-libretro-bnes/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-game-libretro-bnes-0.83.0.8.tar.gz 810732 BLAKE2B 15ef6e91273855dcf16dad4ea8636e824d4440f4741079ab78c7ff67cb603b4fa5947763d23c545ae968ded5de0017014c0f0c02f48bfd1cca038cfac0f986d4 SHA512 8fea33e9c5ddb0135dc54112efa33ab59cccec6f5d1a83c4dd3adbd0d6627fcb78cb1f4015f968cfcb694f862ae3e15e324fb8f35228e682afe8d4076629e677
-EBUILD kodi-game-libretro-bnes-0.83.0.8.ebuild 964 BLAKE2B c6e7894a5ac9d3b7bab614c3ab0d88b6d3f81e92ebc6e0702189a7a1135f5e5934aa1ef04e9d1e49e155e0d14ffc52549905f88bdcf6326df2e198abed3f3ee0 SHA512 37b7f8618336f7570a9bc6076c4aef6506e8a581ce94cc1e02806ce68a9b18ec77b57eb98e212774340b2779dc5135dc2d5f4f3d8fc39b36a8d838ebdfebad0b
 EBUILD kodi-game-libretro-bnes-9999.ebuild 964 BLAKE2B c6e7894a5ac9d3b7bab614c3ab0d88b6d3f81e92ebc6e0702189a7a1135f5e5934aa1ef04e9d1e49e155e0d14ffc52549905f88bdcf6326df2e198abed3f3ee0 SHA512 37b7f8618336f7570a9bc6076c4aef6506e8a581ce94cc1e02806ce68a9b18ec77b57eb98e212774340b2779dc5135dc2d5f4f3d8fc39b36a8d838ebdfebad0b
 MISC metadata.xml 372 BLAKE2B 452e8a206007996c8dc634475f0b26fc32dbd26e4f71ae80c9fada535b16f9a54d024d7c0eaf4b36535b30b28ab3f05568f69d0281bd1b9c5f0c275b9abcd37d SHA512 54e90a55b570b5bb7c0aa2ab197a132b2f9085236b1436351c6bc447f0584f8fb58639b6f0cf812f483df05b7826c1c9032cfc56b14e10232c6e3975c63bd149
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.8.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.8.ebuild
deleted file mode 100644
index f84dfbe0219d..000000000000
--- a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="bNES GameClient for Kodi"
-HOMEPAGE="https://github.com/kodi-game/game.libretro.bnes"
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.bnes.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-else
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro.bnes/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.bnes-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	games-emulation/libretro-bnes
-	"
-RDEPEND="
-	media-plugins/kodi-game-libretro
-	${DEPEND}
-	"
-src_prepare() {
-	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-game-libretro-dosbox/Manifest b/media-plugins/kodi-game-libretro-dosbox/Manifest
index 8582a8d72f2b..2fd4da122cf5 100644
--- a/media-plugins/kodi-game-libretro-dosbox/Manifest
+++ b/media-plugins/kodi-game-libretro-dosbox/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-game-libretro-dosbox-0.74.0.9.tar.gz 59986 BLAKE2B 2ca87303f38885bc73dd8d4784cc6d31b3d8d80e84a241932e70516c10c446f461f7d746634368827a813b0e641d219e172a4cf57730d1637574130d60377ccf SHA512 1915f3156acfdf525d974b290af5204902e18a2d9505b1391b4fc95dd59d5e2c729610ff5024c6bf56af79d822ad0aba0b9680da8ba932d7357dbcd847414a07
-EBUILD kodi-game-libretro-dosbox-0.74.0.9.ebuild 1022 BLAKE2B 993cf563f862ff2559b02bd74dd055dc0724405eb97d150251ece4150e1cfe7dbadffcf7a2658634fb8361fd5909a6e654069c2d2178a774bab744e9ba91e59d SHA512 17a80ceb319386324fadc317aec56bb29141e9eb9ce4545e6f4c2054e3ca59a4d6d40a752f0d192ff7aaae00ce642fba3638f4bda8e48caefd8d85e4dd570a2e
 EBUILD kodi-game-libretro-dosbox-9999.ebuild 1022 BLAKE2B a157537f5caadcff8b8002a7c10d8fc09fac822b00b8bb9dd194ff13eade9605f2735d105f690e8f384a567179e6e3b9da17d4972f093e7954486056ff6e6af7 SHA512 4a28f4d3916fe1a66bc132cdbc581544a0ddec3dd5c18d91291b90c26671bc3e03806d80aa9b148524b85d75a91e0d1c3311c2c87bf66553c2154823695e622b
 MISC metadata.xml 374 BLAKE2B 4c09cf19e44ffd7c5fe02fb61da85dfbfb1dedb3f24ba142a805171f227b476ef2bd31cca5ba73966fd4ea0d8e6a617df9f2ae57343d6611e6a8971cb4fd3b9b SHA512 2241980014fea12e01ba9db1725e9f9bfc5641ddacbe345c081a84a5f1c9704ad172a42e4ef2cff4c418d07ac0c27a801dbc760cda5141dcf5427c9fcdbef116
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.9.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.9.ebuild
deleted file mode 100644
index e90ea636ac8f..000000000000
--- a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="DOSBox GameClient for Kodi"
-HOMEPAGE="https://github.com/kodi-game/game.libretro.dosbox"
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.dosbox.git"
-	inherit git-r3
-	DEPEND="
-		${DEPEND}
-		~media-tv/kodi-9999"
-else
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro.dosbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.dosbox-${PV}-${CODENAME}"
-	DEPEND="
-		${DEPEND}
-		=media-tv/kodi-19*"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${DEPEND}
-	games-emulation/libretro-dosbox
-	"
-RDEPEND="
-	media-plugins/kodi-game-libretro
-	${DEPEND}
-	"
-src_prepare() {
-	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-game-libretro-nestopia/Manifest b/media-plugins/kodi-game-libretro-nestopia/Manifest
index afeb6c0a7cb9..694d9f2760e9 100644
--- a/media-plugins/kodi-game-libretro-nestopia/Manifest
+++ b/media-plugins/kodi-game-libretro-nestopia/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-game-libretro-nestopia-1.51.0.16.tar.gz 800577 BLAKE2B 6edc1c74d9028c5b1fd703d4dc758269dfbd4eb029166fa5e9275ada2d37c4f3fbb0cd795ea70b9ce60d3285f0305115bf2b53103a0127cb490fb0cf1e67776c SHA512 04ba221323699f4a2a0efdf4f9daae48ab703e641cc3a65254fb654e3227f07b380c43a8d541c1371690cdced9040db5d2471eab26c3871cc3544290baf203db
-EBUILD kodi-game-libretro-nestopia-1.51.0.16.ebuild 1040 BLAKE2B 40cfc14b73e85b9d704eeedf64bd5d54f4a801d8c508a5a8886bb28b63acac46805cc7c59ee6c772e929621f4ecddc81870cbcd7ddb4c49feb07f3198f722aa7 SHA512 e775f9bbb8836339d3900e09e5fd041c818b039381b37278bfca763bee1b4a03bde75f5b9a4235b6deceb45fe6fb5229f7b189e32df42daea783df9183c15296
 EBUILD kodi-game-libretro-nestopia-9999.ebuild 1040 BLAKE2B 40cfc14b73e85b9d704eeedf64bd5d54f4a801d8c508a5a8886bb28b63acac46805cc7c59ee6c772e929621f4ecddc81870cbcd7ddb4c49feb07f3198f722aa7 SHA512 e775f9bbb8836339d3900e09e5fd041c818b039381b37278bfca763bee1b4a03bde75f5b9a4235b6deceb45fe6fb5229f7b189e32df42daea783df9183c15296
 MISC metadata.xml 376 BLAKE2B 446a53c57dd1b93c1d87155902cfb2abd9631a8d9b74f8024981f34d3710ceab6107600fb873ebdbb64f98d540dc7c48c231603d34976dc2665d74defef34c16 SHA512 d0d2b0e8a98c026ec6648cfa3b1acb66d7806f2457a1153c48cef155c8ff6221bfaac50745961b55774a35a55b7eb1db9323e6f8ed108a8d80df1011d44f2b8e
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.51.0.16.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.51.0.16.ebuild
deleted file mode 100644
index 8b618564c444..000000000000
--- a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.51.0.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Nestopia GameClient for Kodi"
-HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.nestopia.git"
-	inherit git-r3
-	DEPEND="
-		${DEPEND}
-		~media-tv/kodi-9999"
-else
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
-	DEPEND="
-		${DEPEND}
-		=media-tv/kodi-19*"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${DEPEND}
-	games-emulation/libretro-nestopia
-	"
-RDEPEND="
-	media-plugins/kodi-game-libretro
-	${DEPEND}
-	"
-src_prepare() {
-	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-game-libretro-snes9x/Manifest b/media-plugins/kodi-game-libretro-snes9x/Manifest
index 5c4bc1f05790..09ce10ac502c 100644
--- a/media-plugins/kodi-game-libretro-snes9x/Manifest
+++ b/media-plugins/kodi-game-libretro-snes9x/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-game-libretro-snes9x-1.60.0.20.tar.gz 1381225 BLAKE2B 36e591a4bc365319d58fa31a5e96855b773fb90a916df56b141b6d956f82c51c072d3337d1f1e93056ea599586ca162b7a7bfbd1d112ae17120e76cc0dda2c62 SHA512 8306989b775e26772b83362d3f9c9a3d581e661422280b57aa718035ce0222da35e1ad7c15ddcf8016cd0851e85c8d48c7487dcc7e04b1d760aed87817894513
-EBUILD kodi-game-libretro-snes9x-1.60.0.20.ebuild 1016 BLAKE2B 70a4985c6b2b4cf67eefe5dbd6e1231da6c8707452ff7aca1c7e9b5fa06a88f000cf70680a772458feb3259cddf387c814348ad4a6fa8229e2b0c4ea04437921 SHA512 685d9eb589bfaf7c8218bfdc95254be7a7d68d4e3fb27d6ac511aa44b1ffcf0cc62cf9cbd60a67c5e796c80b8124575d11632c0d497953b73f9d478c17bc777e
 EBUILD kodi-game-libretro-snes9x-9999.ebuild 1016 BLAKE2B 70a4985c6b2b4cf67eefe5dbd6e1231da6c8707452ff7aca1c7e9b5fa06a88f000cf70680a772458feb3259cddf387c814348ad4a6fa8229e2b0c4ea04437921 SHA512 685d9eb589bfaf7c8218bfdc95254be7a7d68d4e3fb27d6ac511aa44b1ffcf0cc62cf9cbd60a67c5e796c80b8124575d11632c0d497953b73f9d478c17bc777e
 MISC metadata.xml 374 BLAKE2B 67f37afb1efbd97c53f192d359cb21068ef12900c2f110a05c132953b1c838837e0b75f650373105241ae2952618b5a7d0a56b28372f762f6c40df5200b52e63 SHA512 4e805d668a2309c53c024f7d4b83cff1ef26a6d22149e17dd8a79205a947905f0cfbdc5df9568e146fe04c8ac457d5b3b17ad3607bb4049221f0c73e3702344f
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.20.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.20.ebuild
deleted file mode 100644
index 11af75672b0a..000000000000
--- a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Snes9x GameClient for Kodi"
-HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.snes9x.git"
-	inherit git-r3
-	DEPEND="${DEPEND}
-		~media-tv/kodi-9999"
-else
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
-	DEPEND="${DEPEND}
-		=media-tv/kodi-19*"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${DEPEND}
-	games-emulation/libretro-snes9x
-	"
-RDEPEND="
-	media-plugins/kodi-game-libretro
-	${DEPEND}
-	"
-src_prepare() {
-	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
index 3023941c4eb5..1b7cd1ca85f8 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-game-libretro-twentyfortyeight-1.0.0.118.tar.gz 94697 BLAKE2B aa029039f0b74993cdb6fa5747d6d42edf177a40e75c0fc1a71cd721fd4e098c4d04b87f15d2a45ed9602a565b10eea3465f8c67a27043ad4e725d5ca458e745 SHA512 625c3213683f08d4dc67d360cbc027670708b48587e51ff85434c54eb703d874594a42bbbe965a531e2144188ce8c908bf371c8e2dd87342857e65919904f5ad
-EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.118.ebuild 926 BLAKE2B 1b87bfd0db5dd7a051e708e1da2e818b8de8af782c847d9cf5fab1e14ed591ebc4c86c73feff393efa61f74c9f2131aa74e3742c3fc4a23bee506e8b086fdb61 SHA512 4337fc71a69ae2f930a095757d9fa14bc36441ad50e308cc51ba0dac3a31c0fdede3ae00ad5e0226e17e39d5e1ebdae0a2344babf40b6a998d673943818016f8
 EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 927 BLAKE2B 4e305e130809f3b107a6d5ca442213fa4c6f0b3995b6c508890dfa0d835ee4320bde3d38d4ca4e9d8420fc40d56f74d19d3e55c97e73da1f1a74c7b8a61ab1b0 SHA512 7c39e51a0806f3dd2c05c3ca29c929cecdd404e3cce3b72e3127e4da3e4c7f3d001761b258729f3c1013a31403ad447cee00d8d51c2cd58fd0f87e8269596939
 MISC metadata.xml 372 BLAKE2B 6827be88b1f0e2c24ca0f52070dc59da3bf55d63b5f2d209d8caf916a3b34495d156aaa8d372292da11cc3c2ce8e814397fa460f79b13426fa0ecd95b12c12df SHA512 328d7de4107be97f0a6fe37d74df09051727d593dd61dcc99aa1cf78f0adaa9c9fc6676a7e92c357a1f22604591fc65a37a4aa750eefb97b11cddb09b4ac4195
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.118.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.118.ebuild
deleted file mode 100644
index ea64a0751a2b..000000000000
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.118.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="2048 for Kodi"
-HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
-SRC_URI=""
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.2048.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	games-emulation/libretro-twentyfortyeight
-	"
-RDEPEND="
-	media-plugins/kodi-game-libretro
-	${DEPEND}
-	"
-
-src_prepare() {
-	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 8f5aed66adda..4f01ef2d3ac3 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-game-libretro-19.0.0.tar.gz 114815 BLAKE2B c18236f2cd96b57b665a191a42932d17e086233de23de2d4227397f110075288d5b5de314edf4e62fa7567fab39a3c95cc1d437fdc1a95a9966ee6a636402e1a SHA512 a746b3b1e962e01af6b26a8f5c35c673f28e1248115a266528c1cd333ec132075948d0ca8d6ac0a5fcc07f80c4f881b0d819d59768b572f93f47daf43bbeff5b
-EBUILD kodi-game-libretro-19.0.0.ebuild 682 BLAKE2B 98598e7815fcf2a429185595581aeccec34e49cf1af9e5d275019efce68a06dea1e8b9288bea0df18ad7888bd0cf4caaf684e9f3cd330e85f62f1245b726e896 SHA512 169a998997c74a5ff17ab86d614e43dec151bbc15366be975b4b934435d2ff5f4100addf2393f8841013ec7808aa9f40c3d29d685667c4d893b54c56a272b7f2
 EBUILD kodi-game-libretro-9999.ebuild 683 BLAKE2B 57220c351b1dcced47b15b4d2a35b545ffe6a77b41e0d95104caf4b7fabde65d6bd97e146309e9aa4ea746836715bf438db31467f579f0f61531f6313b597399 SHA512 ec20589a4caf202b401460f231d75b19b3c4386b8752c83fca6b06310d133659be78b824fd6c787c4f3f3fcc3f86de28720e7cf9501bf5aa7a30d0bb62e1fd3e
 MISC metadata.xml 366 BLAKE2B 000325147dba519bc307f2c231a16f942965f16e2db7e08fc83f38efe6f419da6cd99c4423ab3718d597b66d139d8bf6b3bd2f92b9b7d112af7f7cdaa534636c SHA512 5f972288c26d0ce556a0d17faf9c6e7f631b111926323066f6ec500ab2a059aa3327d7c0a7deb8d0c25aa5f657effd8f29708c1f92949a2b4713b8efb4e18f4e
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-19.0.0.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-19.0.0.ebuild
deleted file mode 100644
index 9b80e26a1a16..000000000000
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-19.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/kodi-game/game.libretro"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
index c4cfef500ed8..10ee270787fb 100644
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-imagedecoder-heif-19.0.0.tar.gz 34506 BLAKE2B 054791cfc86327e02d21e22c706241603ac425ac73fce5c44513737060dbcd7abf15c34569fbeb14adbd95d4b5bd2bc1ec189b3e6206fa00b23049eeffd8584e SHA512 73e2dc0cdbc4ab99d3c1e96ac465e3a3f834ff8fc9dc900f42f2e04405bac01149fcc6da74bb2f4b6fd6c69945a6700a2ff878e64b3f17c1fcefb1d2f7f640d7
-EBUILD kodi-imagedecoder-heif-19.0.0.ebuild 885 BLAKE2B 7df430ab0299dcd16b0314c0127d1a9b44fe531d1cf42fd1ac7efc73c6786efb509c33958546d798dabb7d26d83de7385e087bc5917682c35a9316d7909b5704 SHA512 6e3752b8e7f6d24c148c177a46b37f64c1c6dba6bb9f2fec321a4bd59a52c532353d579e60fd30b128e8d03e5a0efdc0d389c4da4a3369ea8feb6c0ad709920a
 EBUILD kodi-imagedecoder-heif-9999.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
 MISC metadata.xml 510 BLAKE2B f2923fbfd2c19f8af0d1b7f6d62f8522c187bbf57b296306bf192609787d8c2db94b707f0a02444a921879cbcf9c70256bce69b178493cbc162c491936aedfe9 SHA512 077200d2fffc22666397e97190d1560b3bde8337da361b3b8d0595c3a6b5ccf393b8536b569c7053a86ca678af802ff21b0c19c36abc536bad6c14acac4ec035
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-19.0.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-19.0.0.ebuild
deleted file mode 100644
index 48eb3666477b..000000000000
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-KODI_PLUGIN_NAME="imagedecoder.heif"
-DESCRIPTION="HEIF image decoder for Kodi"
-HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="=media-tv/kodi-9999*"
-
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libde265-1.0.8
-	>=media-libs/libheif-1.12.0
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-imagedecoder-raw/Manifest b/media-plugins/kodi-imagedecoder-raw/Manifest
index 3dc19cecf11f..c6fea6d31c54 100644
--- a/media-plugins/kodi-imagedecoder-raw/Manifest
+++ b/media-plugins/kodi-imagedecoder-raw/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-imagedecoder-raw-19.0.0.tar.gz 54689 BLAKE2B a55e5f9ccd9c4304bba0705eab60b20d3b0b701377c0f770c41b4bde4ada310d618d64e862787279abaeb3f52c0b065effc2666a62b7e960fb156316b59f1370 SHA512 4d0e96db52c43234f27fce0ca9628c57457fbdb002464f1d8b168988264cd4666966f285298b7c0c1f69239d3bb774a7eda827b66107f7851ad265a07d236de9
-EBUILD kodi-imagedecoder-raw-19.0.0.ebuild 919 BLAKE2B 8b6e258977724e80c94ce126b5480230f762aa5aa26a64e48dd332f6295a3f08d4f71211801a599537d397bc1c2fc5a2ad1518fd84885d58ee110f7c3e96bad2 SHA512 6606130180bd5964087944159d0715aea3ec9a958c2a303a494da7698747df79bb9b0f992cd430be1c9f4ac3bc0f06413a1244bf367391c05e74195cb088ac87
 EBUILD kodi-imagedecoder-raw-9999.ebuild 919 BLAKE2B 8b6e258977724e80c94ce126b5480230f762aa5aa26a64e48dd332f6295a3f08d4f71211801a599537d397bc1c2fc5a2ad1518fd84885d58ee110f7c3e96bad2 SHA512 6606130180bd5964087944159d0715aea3ec9a958c2a303a494da7698747df79bb9b0f992cd430be1c9f4ac3bc0f06413a1244bf367391c05e74195cb088ac87
 MISC metadata.xml 509 BLAKE2B 1404654b19882d44af2ea59d4cb22c1ad83e60d149f034ec615f3f54735ef5985432048cd75d2310d59d541226c3b532690b97a58fca0e6ff676b248fe1ffdef SHA512 d25d1ea5bbc03d1bbf2628e5c0416d8ef15a75ea8bd031dca215c5fddd972194c3ed2fa2ba879e6d804bff2180321a47b0c20ce626b05454c44b78df0177271a
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-19.0.0.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-19.0.0.ebuild
deleted file mode 100644
index 9a8d65704eb5..000000000000
--- a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-KODI_PLUGIN_NAME="imagedecoder.raw"
-DESCRIPTION="RAW image decoder for Kodi"
-HOMEPAGE="https://github.com/xbmc/imagedecoder.raw"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libjpeg-turbo-2.1.1
-	>=media-libs/libraw-0.20.2[jpeg,lcms]
-	>=media-libs/lcms-2.12
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 63c7531e453b..50cedf9ca3b5 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,5 +1,2 @@
-AUX kodi-inputstream-adaptive-19.0.0-gcc-13-fix.patch 924 BLAKE2B ebb2c0c0bfa217352e44da433e361a079781e2606417ccb31a17217dc172bb9e427588cc278a37b58b5cd2c4da844097956961a4d37995fff8a66675af1f658c SHA512 f28addbbf66814b2eebeca04d68585df4dd58ac165eceacddd3b98590bb4db84f7824fea0c61143e44bc0cd0a27f95a19ad4db92e05d3a0a3dda468d6e1e3358
-DIST kodi-inputstream-adaptive-19.0.0.tar.gz 768987 BLAKE2B eaf5141e8d5cde73f2d6109f09fe7bf266413ab09ae3f286c72f9fabe76bb897a1c1ede9137b05d8db86c0e91a400f3d86cee8b9b355f0ef8cc7d2f22229b23c SHA512 dca318f434e87242857af672db4b6edc27e37bc202cce0ea3ff549af0894d27ab73adc084703d04dc2d8dde6219d00ae83209fd61f62916deaf65486feb8e74f
-EBUILD kodi-inputstream-adaptive-19.0.0.ebuild 1065 BLAKE2B cac687abecea325c3c23b87950bf6639f3df60f0af4a2253a42b425c9dbb061437204606b2c5b99ea3b80c08e0f79aab1d64f71a7bf12e9e5d27523be66fe8d4 SHA512 262ef58a3a091e49b071a58a472867ffa2d06e0d7930d3d635eed9401218e352c03860f98e545f3a2d9aa8e5fe7ced51379cda05fdaa9d27bcd7acdf0bd63a1a
 EBUILD kodi-inputstream-adaptive-9999.ebuild 1002 BLAKE2B 1d3abb0c33d1b61d5b24cbb73b772fc83aed7c0821b3ac382b80b4a790a13bbc6f7f608d8026b00a7cf0410cf493f00faa51ddc376d5773c09d5a2555a87d0fe SHA512 8603bfc240ed2237a7a10778666a393559ce84736d278f0c0ae11be7a4c8b564b7dec14772e36a73284b62e10154214237933f46fc32c34824721dcc7d2bc26b
 MISC metadata.xml 371 BLAKE2B be8ef5bf7667803d988141b6ebb0eaeb38729ffff7baa0e5d4863468d02d95ab5dd1676857ab7546849a2e2f93c569e6452d6f26a5ea1cfa851254e3c8e262f0 SHA512 b107f6b52e79d72fe30b8f057123a751843cc4e24cd4431ae49686ae85f5e31719aecf785455e8229bff552555ab8f6a806080a9e5d81586eea2457438273fcd
diff --git a/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-19.0.0-gcc-13-fix.patch b/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-19.0.0-gcc-13-fix.patch
deleted file mode 100644
index a9168fe42331..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/files/kodi-inputstream-adaptive-19.0.0-gcc-13-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix build with GCC 13
-
-Gentoo bug https://bugs.gentoo.org/899754
-
-diff -ur inputstream.adaptive-19.0.0-Matrix/src/helpers.h inputstream.adaptive-19.0.0-Matrix-fixed/src/helpers.h
---- inputstream.adaptive-19.0.0-Matrix/src/helpers.h	2021-09-14 17:28:17.000000000 +0300
-+++ inputstream.adaptive-19.0.0-Matrix-fixed/src/helpers.h	2023-10-18 10:03:57.510248775 +0300
-@@ -19,7 +19,7 @@
- #pragma once
- 
- #include <string>
--#include <stdint.h>
-+#include <cstdint>
- #include <vector>
- #include <map>
- 
-diff -ur inputstream.adaptive-19.0.0-Matrix/src/Iaes_decrypter.h inputstream.adaptive-19.0.0-Matrix-fixed/src/Iaes_decrypter.h
---- inputstream.adaptive-19.0.0-Matrix/src/Iaes_decrypter.h	2021-09-14 17:28:17.000000000 +0300
-+++ inputstream.adaptive-19.0.0-Matrix-fixed/src/Iaes_decrypter.h	2023-10-18 10:03:12.136782831 +0300
-@@ -2,6 +2,7 @@
- 
- #include "Ap4Types.h"
- 
-+#include <cstdint>
- #include <string>
- 
- class IAESDecrypter
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-19.0.0.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-19.0.0.ebuild
deleted file mode 100644
index 03d6ea558f43..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-19.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="!test? ( test )"
-IUSE="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13-fix.patch # Bug 899754
-)
-
-COMMON_DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-19*
-	"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-	"
-RDEPEND="
-	${COMMON_DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index 4cf28a030208..461a7212fe30 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -1,5 +1,2 @@
-AUX kodi-inputstream-ffmpegdirect-19.0.0-gcc-13-fix.patch 983 BLAKE2B aa6876bafa7beb0caeb10af5be77e1d780828364be6b9be6fced49e9f9c02890d9f7e1bd575aa5d7b935a3b5a4b0b2fdccd001230479776b7e65ac70ad9dba59 SHA512 08adc52eb78afdc8fc072549dc98bf68740a6c2f61e2200f3287957b477778fee2eef3f5db942ad8bbde1daaddbe0b1c402759512d99c2e74d0697bdbeb05c67
-DIST kodi-inputstream-ffmpegdirect-19.0.0.tar.gz 283259 BLAKE2B b5db2c0b98dd8640a560d95fe2164cf76bbbd0c3b4c47e53d5e39011e3b6225afe5c4c47c3d9eaf357bb93d5813c40864cd54cfebf5aa52910c9967ab5a53725 SHA512 61a9ba311be0b6eae90565da2711ddbe35b0549b223febb9a43c36662f1fd541a3a25787ff5513f8ca515254d18864c6b2b37caa7a2a3cd35cffa9b10bfd2c5e
-EBUILD kodi-inputstream-ffmpegdirect-19.0.0.ebuild 1029 BLAKE2B cef3a16e0a974fa4897db959e852e67c01a33e778f7d4eabea6080e11b729187da8fc44692c964f56cd65d038c515028ccfd47d965f5f5e6d22f3d22b10458c0 SHA512 cc5983010e6e90249ac900196690730cbf4eb9984442ef25bc2ba1a26842c0408431482436c4f1b6c980671dab57248b1d2fe9413b920aaae7f85a7beb6c43b4
 EBUILD kodi-inputstream-ffmpegdirect-9999.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
 MISC metadata.xml 505 BLAKE2B ee4773daea9d6c00f7492a63e4b02d6e9dd403f756a1b2e2b47e0422b4924d51ed82fd6cfe170204f950d0e2d2ecc7342f4d9fce4248347ac47a81b77962bcb0 SHA512 fbbe21c49ee6bf2afdabc3e81ce273e6a008515034787e48e8eea43ed0d6f0ce3a4d6d6c54fabd562479f57eb1f119a80ca69e14023332243a3d94027baedcc1
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-19.0.0-gcc-13-fix.patch b/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-19.0.0-gcc-13-fix.patch
deleted file mode 100644
index 3d8ce9ac715b..000000000000
--- a/media-plugins/kodi-inputstream-ffmpegdirect/files/kodi-inputstream-ffmpegdirect-19.0.0-gcc-13-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix build with GCC 13
-
-Gentoo bug https://bugs.gentoo.org/915943
-
-Author: Karlson2k (Evgeny Grin)
-
-diff -ur inputstream.ffmpegdirect-19.0.0-Matrix-orig/src/utils/DiskUtils.h inputstream.ffmpegdirect-19.0.0-Matrix/src/utils/DiskUtils.h
---- inputstream.ffmpegdirect-19.0.0-Matrix-orig/src/utils/DiskUtils.h	2021-09-14 17:23:56.000000000 +0300
-+++ inputstream.ffmpegdirect-19.0.0-Matrix/src/utils/DiskUtils.h	2023-10-18 10:40:27.386513580 +0300
-@@ -7,6 +7,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- 
- namespace ffmpegdirect
-diff -ur inputstream.ffmpegdirect-19.0.0-Matrix-orig/src/utils/HttpProxy.h inputstream.ffmpegdirect-19.0.0-Matrix/src/utils/HttpProxy.h
---- inputstream.ffmpegdirect-19.0.0-Matrix-orig/src/utils/HttpProxy.h	2021-09-14 17:23:56.000000000 +0300
-+++ inputstream.ffmpegdirect-19.0.0-Matrix/src/utils/HttpProxy.h	2023-10-18 10:39:14.777829910 +0300
-@@ -7,6 +7,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- 
- namespace ffmpegdirect
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild
deleted file mode 100644
index a94dd62064e4..000000000000
--- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's FFMpeg Direct Inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.ffmpegdirect"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/inputstream.ffmpegdirect.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13-fix.patch # Bug 915943
-)
-
-BDEPEND="
-	virtual/pkgconfig
-	"
-
-COMMON_DEPEND="
-	media-video/ffmpeg[encode,libxml2,zlib]
-	virtual/libiconv
-	app-arch/bzip2
-	=media-tv/kodi-19*
-	"
-
-DEPEND="
-	${COMMON_DEPEND}
-	"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 467c56bacb3a..b4db2678bb82 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-inputstream-rtmp-19.0.0.tar.gz 82420 BLAKE2B 9f4d0871e98e94117a7bc335c203ddd85ad7b300729353669b732f710ff175c6a6f5a18c2e100d181eea6c2e369067b5586aa2651b2e928aeaebc5a72d815493 SHA512 8ea7a9fed8ad0d29365a8d0f67c0b0203c16da19607ccc9788e9e244f034b079667d2d1ba2a916fa0ce5af4008563573bbaabce7bface9879c3e1bc1c4c3aed7
-EBUILD kodi-inputstream-rtmp-19.0.0.ebuild 894 BLAKE2B ff5fc3975c57bb40b7f5e17c469d066f5abfa054950e8f86aa1158b813c389747e2bf5713e0b1fc56cc88a89a053cf5d6e5ec06875415e756bbe89d90334e1f7 SHA512 b79b20915136c0cab1f3ead5e6c056345f70951097019bd3f80ee20a0c4b53236829df23968038cb944ac2746cc8b9ffcbe36028ac2a60e290f1c7697deb6ffe
 EBUILD kodi-inputstream-rtmp-9999.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
 MISC metadata.xml 365 BLAKE2B 8e50717ddd57ee8895f0f79e21119ca4278b192a8f63bc12a5edd00ab9bb57deafc48bee605b2df3be4a2131a52e88dd1ade4ab54e8307d0ce54b43c61c4b2c8 SHA512 0778bbc55db311a4f017991e7aca80019ad872f058d4f450bad310cf7579fd09f7ba741861c65100d861d3debdc28d4ca7359711a2c1d16cba44c60ecb74f220
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-19.0.0.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-19.0.0.ebuild
deleted file mode 100644
index fd032d679f69..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-KODI_PLUGIN_NAME="inputstream.rtmp"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	media-video/rtmpdump[ssl]
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 40f895cdf1ce..0eb0b87953ea 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-peripheral-joystick-19.0.0.tar.gz 125088 BLAKE2B 3dea375a1939f8520e6f537ba607fb1db68a9283d7954a78cbfb95cfd53b29a4d8c3c7e97469af3753e268a5481d044a9b9b5898c11f9de14d5bece17d815f96 SHA512 edb2582d56a6fee5965e99bf6ceeaf89d7278e767dd3991eba0bbe2be7431c3d53c856727f343db7a7f76aafa36eb5cd947a9136afa0248805f87cd66d751bb4
-EBUILD kodi-peripheral-joystick-19.0.0.ebuild 749 BLAKE2B 2084abfbf10b6f396d51c0c3c68ed7cfb36f93af436f5b4f55e0403a79e82fbac622cb117a1661c9c1638555c0946c4c12b2024d142b07a78c19dc06f3a126cb SHA512 9158682bec1296614b9f51fc5e26fe335e83c6647412f5d10697f07166ca28303ad0663f23719636fc856d1052034eb76d3b48f4f7b59910a8cd0511d52c8fd5
 EBUILD kodi-peripheral-joystick-9999.ebuild 750 BLAKE2B 45fd88bbb36d359752f0f92e9cc8dbd7138affc0ae6d14375962b81c61f797d287f9734f2258c5226d2eaaeade4de41bb5c16085ca49cd78edef9fd3b50afa01 SHA512 eaf1f44c31bdb530a716c575acb0ca89f121d5c019dbc7e7283d540b3a1a6e30f4c6bf3933b2d65108c97322fb2aad49486faeef72da0a731c4ce98eaa16d9a2
 MISC metadata.xml 368 BLAKE2B 46a40d27f49eafd117a05fb5d7d359c2624a64d588ebb13a61f3b7fcbd92fdc127e0635ae8520cdb61058e874e75768dce17e82a8e8cf29b5bb49dcbbef1411e SHA512 a5fe6ced278ad471198c567268e38af596fa04a40dfce36ac833d6d6747bb938101f358e86ef0bb36cf9e85f28c4b903feb8074b9d654ba7267fbe02c063cbe5
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-19.0.0.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-19.0.0.ebuild
deleted file mode 100644
index 0afe32da893f..000000000000
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-19.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_BRANCH="Matrix"
-	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/libpcre
-	dev-libs/tinyxml
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index d3a24235363e..6e9be0bb5176 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-argustv-7.1.2.tar.gz 158003 BLAKE2B bf16201bf0f272796aa4e2518ed07113f268b32bf9af857f600b09dc7e86eb00de2a542047fd8742bfb6c523942018816d6130f715dfe2e21d3939debae5f8d5 SHA512 980786c37e1c28e3d8cbe53ef1a9bcdd0dee585bdfe2654154a571d5b9f48b8139f3acc9e3cab06302900ec933f2525875b99ca8ad562ff137a94db875bef59b
-EBUILD kodi-pvr-argustv-7.1.2.ebuild 668 BLAKE2B 027f075f47ef9dc83f9e53861ab037380ab052b66a310c2b08383dce5f116782d375d9607ac352ab0f39d34c9eb9c6f2a7d1a41de9a21f7e6791394404502944 SHA512 8695541454068f484d0766d3873e115111f5e25f03abd59f7362d4e942080d96baa1bc67f5f2d05ebcf5eb686872dd56959d34a01f6842edc7a049d538ebe94a
 EBUILD kodi-pvr-argustv-9999.ebuild 669 BLAKE2B 802dd70801dad6deae7a7e0c840b7fa047195f4c32d28ee21c26d213e01002387deb860d3704af690110f93ef204970af2db8a271d7005d43c194846b58eb9e4 SHA512 ce01f62b84b15a9ca39260ec23a25a18b0cb3a8ae165dfa1845e2e24baf1f14df10d98cbd88ed29f31090afb4bddeda27f48374abc1d77851695a4b76afe1534
 MISC metadata.xml 364 BLAKE2B 087576d695fac94f56e4e1b56869671ba91d1912e1d82824b0ff3a8b360f21e090bf18e9688c344e67dcb7381d10fea25a7e493635196117fa0c3d31d8da8f9c SHA512 d9601dd2feb335850e7e01463739cb99d8674da5b16ec4f4acd70100fb4e72781018233f191fd47b8de0dc4232cc59d44c96e0244715de58055b25240e945a95
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild
deleted file mode 100644
index 897f6aa64638..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index f099d84f7c56..fabd573f0d1b 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-demo-7.1.4.tar.gz 47972 BLAKE2B 3950951573c03da2c6a9f599e2c5122fc208004fd4ad4acf88af2760a5502a087aeba2351c938d60aa54981805dafdd3802c7bd58b8eba8028ff205069b93a31 SHA512 7f1468727024cbe627c2e0608e02815877593f23b9592d6caaadf2147dbc48b09f0405db5b67de9277cef362715de68d2099152f5fc9fc137b67bbc34f3a1e87
-EBUILD kodi-pvr-demo-7.1.4.ebuild 645 BLAKE2B bb4ee9b5989c1950672511adb5483312a274d72772d26b6556fed2f2a968d805e2ac0d7ae02a726cb3e807559f2ab2205c4b10100290a75fd241c8f19fc70bda SHA512 b229363ccf6423298714e9de62288ac990a0f86c3356784e427815ea47210179123d1d9b7d20355d628140440985e18c016de09044d974dbd35d75a34444cd26
 EBUILD kodi-pvr-demo-9999.ebuild 646 BLAKE2B cd1cdad1b6fbd450f79c2e16927f76db90734062b66a185070e42ff06590c404e1736ee42fd42ab10229710c9307b2da5824b7b513434d2e2589cb2102a4cb56 SHA512 98b19d4b466f173b0b14dd3a56c118a6b3d6822a977e8bb922bbdb1314310d55478288082feea641f8280d1758cb3a3d2a680a004e7654f1f383c8fe684afec3
 MISC metadata.xml 367 BLAKE2B a690651c393995a5da7d5a0a94c40b130ef57895b2330c184f0936161a012dbc8b24785e00b696c7b7f21168945251b7c7c243cb56ee5a900590a2066b0e4224 SHA512 11beaf944a52a7dbcb734dd243d679d3f6e9ccbacb8b667149310370017f3996c0a494f7c102ce3059c0488049ca4583629f635d9659533be79b426bac902f36
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.4.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.4.ebuild
deleted file mode 100644
index cb6e25589b8d..000000000000
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Demo PVR for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index f09ee0abd3a4..b6765d8f97e1 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-dvblink-9.1.2.tar.gz 202329 BLAKE2B 4148f776b8ec7a2a0bf2f4952dc9380dcd0531041e1d32354fc600fd6394fdcdd03e2bca983319a53db79d0209f4ae3e10506059bdc429b8fc006f4a6ac30e59 SHA512 c9e5dc24475d3ec358852c213d2f2794fb926cd4fb2edec90c0c90cfba2a0d07f42526bfeb88c12c8c95446fbe7add76b2021f4a7f847a63776044097fc90aba
-EBUILD kodi-pvr-dvblink-9.1.2.ebuild 668 BLAKE2B 636ffd63989284268e543771379920312b6957904e83c9b490bc392f67151a052b1ec4df36d5beac680b5fe1804b631a7fd026ebd41edf555e81b7565524b83b SHA512 b714d75871acefe567f33530db7d5f39753212c6a61701a961d8562605e93a5af326900a56d2df92723f59ba9fb38532e43aab88a0ded0d2ecb11e2e2be83004
 EBUILD kodi-pvr-dvblink-9999.ebuild 669 BLAKE2B 72fc7719a7e1b4b5cb89c2fb95ac4c4c05aa70b8c4d3728911487b828034a48c3c570d385cf0e4515b6b13d57e6e5b8a8351a5296030a6824afdded1441ab0ea SHA512 808aedb3b858c2b302d1b9a3c9ed11379f8e9c8911d808ebdebd305e9a9ed1103d00e47f2e9da41480da672989e20aeea10956079395333cad94161c5272dbbd
 MISC metadata.xml 364 BLAKE2B f8405c888578141b7a0c534bac8483ad1c81cee7ece410af1da69098c370358bf7fbebc0406c59612ed546f8a9785f0aa9c7a4af73deb683e4f69885b225ade1 SHA512 8b0b310ae6a0a8738b5c884ec32dfdc116c64c682d9de9ed845a225f04c76dcd04f1a23baec506986428e28e7c6f9236bd4df659804decaaa5a5b1945f7a1d1c
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.1.2.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.1.2.ebuild
deleted file mode 100644
index a690fbc66043..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index aae65e441df9..d316ee3d9a0d 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz 144323 BLAKE2B a1e2f537b659f4530cf6693195ad56d4ee74a11e5d598461b9c6d4d1542ddbdb090b00f5d9b80a88a988779e57cea89483bdbcae024d979d7ab08d1039483a0e SHA512 ec87de4800790ca6d67541335eac32472b3c4417d6e906d4f2fa6864389b2f7dcb114ffc5c1281e1047b8f7a819d4072725fc24f72a63b29181e9851b782b547
-EBUILD kodi-pvr-dvbviewer-7.3.3.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
 EBUILD kodi-pvr-dvbviewer-9999.ebuild 690 BLAKE2B 7b2c27e9088e2e5bb13ba17ce11cdafbd0ee43258b5edbd1f0fea33ec60d162ee40d4cf1cbc8b064ee989455cae2c7da2dd42749e6cdcf2bfb23c045bf14e066 SHA512 66b42c5dbc7fa9f1b94eb4a8d57af8b86c3e77f1339384e2e02ef2d83507b9b521c6c226a33ca3b11e0306ef073f226098442abb57e7ce701fd320ce2d76d85a
 MISC metadata.xml 366 BLAKE2B 5d37865a727c6cd9ba676ecf51677d4839f40ea48f46ad0825c7f4cc760a4d4739cd6c52cecfa7785f95e9a1522e722b3be34f5eedff489067a85460b0877359 SHA512 624c6f5808f2661fdda46c78907ff599ee60f319de3f08ab2ab42a7f147a98120ae8b0162a2093f44f02bcdd383cf6ba539f3f378e67e17ebc178a6b8e592dca
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.3.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.3.ebuild
deleted file mode 100644
index e9950f3e4f38..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 11ed2f11beaa..9ad2df17a8dc 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-filmon-6.1.2.tar.gz 111152 BLAKE2B 43a8dc37b45cff82b9bd753d95595a61901df03a9e7ddc8c028dee3192693609a1d6c6803969bc5186817779c55819f90b002aaea2c4e99026cbe216341cdce2 SHA512 96f767e55c0d2f9784886c2f3a2e8500e007060898cbf6d448b676c89723759da5172b185e9a5e34c21975379cc103cc3d6a95ba6b51b39af0c2a6333406a0b6
-EBUILD kodi-pvr-filmon-6.1.2.ebuild 662 BLAKE2B cc7cbf9fafc1c4981edf531aaae78e759006e91d27a5439278d8732152232f457e86215a5ac7346189c98abce22cb85dfbb3013777199bbcb5b6eec6f783dc68 SHA512 3b1f3ee7291cf288955af5490a4b2a5d907e4557cb697eb0f09314147e88ab2596a442dfb28c82bc34d6c93f5fd25b483f3635199bf1db3e7e4d1205ffe996c1
 EBUILD kodi-pvr-filmon-9999.ebuild 663 BLAKE2B 4b2f64e7ad0b13994ae98e611346d88b3b24255e8d4ffe3dd9eda35b553b9de85c78538855df31ad6d7bea05660251a1f53eb603d87a5e3039a0a3b24230cd5b SHA512 8aa1ccd46a6af7fcb08e54e833652f5e6747a0c223f450fd8a6ecad4918a84082d7d32fe4686a2d1829ff1ea75757928898fc61e653b3d434a18f47cf663462a
 MISC metadata.xml 363 BLAKE2B 8d769c5f1dae59bd987c10736545c53712f01bf6c5da2a208b9e77587cd4bc77db9434e677b5f89c3dec55da29003fbd88841e6aeb9f138847939757aee758b9 SHA512 43e93b8d61a6fc8ee81c48ef8529044033637e789e9696f7455eae008d76f18ffb6d963c4dfaa95bfc35d66c04636f2344a65c970f5bd2b693d22073a769eb72
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.2.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.2.ebuild
deleted file mode 100644
index cbcac25ff490..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 68445be8e1f6..f17bad1172ba 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-hts-8.4.0.tar.gz 214128 BLAKE2B b69589c2bb92cf5f77b6c5a35afa37b8995388179ab316c3c84baa20a79dc86cef89b99bf2afbc5e8f89f7f85e261c83eeca2b92e94b62a5f8de41da4bd64ea6 SHA512 929d32e0702b7199cf2e80a7bd7b0ec6654194fbd17f15defa11da7aa41e068bf999cad25ebb7dcb594e5895354824483b4a4e896cc97a7b06b9183d21c0fbff
-EBUILD kodi-pvr-hts-8.4.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-9999.ebuild 661 BLAKE2B 2e17ace5bb95016788db8c07b1d0aef10f72c5bf82f7c0321d27525550a382a565df112d4a5125233ae029dc294962da333d1f384a46bedd643d81e1c1a65fa0 SHA512 f6122a34e52426853d476eedfa33209d9435e02c79ae75520e6c64ae36a5cb663ee9140c96d53f2e7437c20135776ab8071c1a2de6cf73841c0cf3adc8bd10da
 MISC metadata.xml 330 BLAKE2B 79ec9fc8bed07155f067c5553b6a0bcdf8ecfa5c58239feb5e6afe1df00b617f95d30774d3329f9ecd329e37aa7fe420dc8eb7612da4215f81e841f4a130dca5 SHA512 1c14259a0a64c879692ba430b32bd374e49d27eea23d73fdd084f08c5d1c8b848721e3cee4d54ff8b252c4e21913c7ecf8d1e8a9789c6db913c9fcef5e6ee27e
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.4.0.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.4.0.ebuild
deleted file mode 100644
index 2229139c850a..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index b98c6b207ce7..3c5796254984 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-iptvsimple-7.6.9.tar.gz 288485 BLAKE2B 35c752b0f7ed10d8f6b452d074c576554d3e49a67e56076af1c2cb31037a02f9ca7b7cc86815c30c3aff17b2ce8b33eca1f0848b353f3cf30b51b6e288458183 SHA512 72316d784410284b2c53dc259b22498e871ea8d82c0b91a744ad100a5c511cf0dffef9952a6bca33adfe129d7f88a4cbae74659a8b1fa4037083283d2916f699
-EBUILD kodi-pvr-iptvsimple-7.6.9.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 367 BLAKE2B a690651c393995a5da7d5a0a94c40b130ef57895b2330c184f0936161a012dbc8b24785e00b696c7b7f21168945251b7c7c243cb56ee5a900590a2066b0e4224 SHA512 11beaf944a52a7dbcb734dd243d679d3f6e9ccbacb8b667149310370017f3996c0a494f7c102ce3059c0488049ca4583629f635d9659533be79b426bac902f36
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.9.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.9.ebuild
deleted file mode 100644
index 36d5b715c65a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index 2c03c172a9d2..cd736c6f1063 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-mediaportal-tvserver-8.2.1.tar.gz 411048 BLAKE2B 803b47e42d7b7e777293f2d777a7bddbc2b0400b7bd43d5b441829276e6a7512cc3d30a2949a3d4703da7282804e536e2420a1f40cb05dc6143bdee931adaebe SHA512 d257992bf77a49bf9b130bf91764b2c174bae955c8fcc3e487bc65c5f963963e10e15855019e9dcf3c9e8ed2fa3e7db874e7282cd269d313cc15c664f88c9ad1
-EBUILD kodi-pvr-mediaportal-tvserver-8.2.1.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 MISC metadata.xml 377 BLAKE2B 2cf4aaac41e837a5f9a0c8e461875d5860bf5b31b7c0148220cc4ac7a13637d968ec15e2beb4a931e90f0d6e8ce93bae9cb31e535e79509c5e5157f583ac20e3 SHA512 d68bd31f0358994935fd2bf53c003f4e34e4654cea4c96f24423f1eae23faa94aaba1fcc3a069be20b4bfe42a6acc5fc2259fd9e80dae22d410b2af6605adbf2
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.1.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.1.ebuild
deleted file mode 100644
index 1de2f204415a..000000000000
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's MediaPortal TVServer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index 9d1593b11f1e..dafc3e66448b 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-mythtv-7.3.1.tar.gz 707026 BLAKE2B 54f70e0ab72a3be020c6e142fa29b962296944d564492862a8171bce710434190ed887e5391a776c6ca9fb62877e533e42ba325d4636580c6eee97be5c2fcccb SHA512 19635d83e464035a0bf5d7cd27006059ee932ceb5bb4eb8797a8342ad063e8081393541e0c7f52230d91fba83a870bc9c83ece352ff114c82c7640d8201665b1
-EBUILD kodi-pvr-mythtv-7.3.1.ebuild 645 BLAKE2B 8b3feb6ee845feed27b5d3bac19de662b05ec28e2fa6c2049052384fe90a686b8578b0dc9510ec9d8964f6272c312fd705d966b948486d738e605a09b689ab0e SHA512 94e644d643cdfc68886a36dc4cd26796639f092b9aa7dfc46e0a0a4065dea9daa98d9738107c2a526b6ba1a50d4bedd0a44933954d65c5e543a74517ea8a845b
 EBUILD kodi-pvr-mythtv-9999.ebuild 646 BLAKE2B 945ccbf5fb4ed33920e33a81266feccbfac05dccd0980c6a069ac2c10be0377b00012468452e13cf964cfe5524519984042b57dea2f7bc885cf86177177a6250 SHA512 7f2cfe7f187ba1796c96406cf2a9a8be18ed36915a23474c790955bca0279b1bcdbdf504f72c1672de9887341457ed21f7e9821b4eaa445e3b72d01efc2476c9
 MISC metadata.xml 361 BLAKE2B f0c68ad25975143d5db62776b27da1d8a199016ab86254a8260239655ed9f7708d5cc2511548a9f90659adfc80658ef0f40dbc2a300cddd796827945c514190a SHA512 31072531c74311eb5a25ac3edc8575ed0b784b3cc1f23daf9e6011a1b84fb35e0e5ec40fb57fbaa78f121aa6c7c1eecd1d68e2cc2eb4b6fe803c7956ceb029b1
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.3.1.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.3.1.ebuild
deleted file mode 100644
index ce4832290c29..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index eb831df42144..9e9bb3908bae 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-nextpvr-8.2.6.tar.gz 159496 BLAKE2B 1e09869b04e5f69279c33138bdf466db7f00e92945437d86d5a61f57a41cd3939ecba50404da844778ea92a8dca322c4cd520c045c6ccf10809cf64acc61eafd SHA512 dbd666b96982223d5f8ef546e3dbbb42390e13109aa0c4a93222e1668171001391136b952d986d30ce8742394b502f7b41d8fef3ca2967bd1cf4bff5daebb1f8
-EBUILD kodi-pvr-nextpvr-8.2.6.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 364 BLAKE2B 5791ed7a8c4739e912dd17b3f3c781db79eca3bd5c3fe83d834616fec1e05609b39d96219a4bf95c42d5a2622accdec5d0b97f0fac369c093703c1bbab175dbe SHA512 642e88a077105e6989c7b77ac73c692e4160177ebd4c067f674ddd368fb40fb778ecbc05815479801e48d766bb23ec11006cf5f74a2b0d6273e47e5038145386
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.6.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.6.ebuild
deleted file mode 100644
index f1d5484de0ab..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index 37defb031606..797a6b740b39 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-njoy-7.1.1.tar.gz 56749 BLAKE2B f1849e2b114dd873c78ae48b25223f28a45b5ca46ef7a244ddecab9ec0a33de31c22b1709ee698161052de9104c023b448e196259f02d2c98a02d44f25aaa0cd SHA512 fceeda6d4f967f250ffbb5dc2a4d0cd9248cf61447ccbeb6152f5812186fcca2d41222038ffd53f7d7361ca06fe92599d7eb44d0850e03e9605d33e89086a201
-EBUILD kodi-pvr-njoy-7.1.1.ebuild 655 BLAKE2B 783b4ad02382b83fb4999b60833efa4e1b31c051843c018c6fe35e6ef68d8b6443c3b1b188bf2647ecb17824ec02f90cc3c6faab832cd2cb8e43cff8267fb397 SHA512 7797ee020c1880278ba15ad8eb29605b43d1661780c197e2906d8708c40d0945e475c760b544ace9a1a225aff6c543db48e24e15fcb052832136b6ec5e4b6a7a
 EBUILD kodi-pvr-njoy-9999.ebuild 656 BLAKE2B d408f7bfb0a2b90b1a840ead5402b3da96157c6b6b6fb45d574e2b4b11f466fa378eaa8eeb6aeb1d9bd9aa0e98ecaed65d7de521ac39d3d38da1cd42e98da4e4 SHA512 d30ee6601c254b39b02c37fafb420ae2731227f51ab6a8cd0349f52c8906949b41ed57155e373901e4048c4e1adbeffde5500f557d4a891781cd87ee07d94b85
 MISC metadata.xml 361 BLAKE2B 1eb4547cdd9de4c7b79c7cc944f056d5209879f55e556a72e618877489fce0092538448e09beb8925f812f2a96116271d562e851c13400c73fe8ce6ae92ab295 SHA512 dd460018f5c02cb318e47c7e4a67e58c5cb85441f7a595e76088bad0785ee49e012c6d2b42a9aa02dd7323981c5609d33e4c2714fd7ef5c5dfae6a00df237286
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.1.1.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.1.1.ebuild
deleted file mode 100644
index 67f65adeb215..000000000000
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Njoy N7 client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index b313618f2e04..ed42d4322d04 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-pctv-6.1.1.tar.gz 67214 BLAKE2B 468382cf62dc9c54b01a7ccce25ec73afc5bb405285adc561fc44125f9b57ec3702d6d3dad4a9fafb50ec9ae58974d1b6ae95347913abb7b67e3ad72d31ef1b7 SHA512 12fa2d9299ed84ec89cf4f159946cb007a9a7d404d68a72eb5b63711b4ade6af054107d4880f81d8b3b6683f02aa2495b9c3fbf5d1f5e3d0aa7b8a3316b028ed
-EBUILD kodi-pvr-pctv-6.1.1.ebuild 652 BLAKE2B 74cf66388639099ea69e7928d4efd06297db22be583fa35d0feca9fab0c74ac77a05789072cf1d1656e433ea9b0788684c3b5002857a407b04ca760bdac3eb92 SHA512 61460a66854fcf58594610edb5e20d6ffdf2268583ed217106f58320c2762e86f5fcb3490d1d4b819281c05efc19b99944481331aa9488a49bd32d6d9674c233
 EBUILD kodi-pvr-pctv-9999.ebuild 653 BLAKE2B 94014b007543d55e5e419af01d1b1a28792a5fb01728cdb02cdf5256e7ca9b565104817eca6fefc86488b441da97763212f310f5684bee052b8d79c5bfa9dece SHA512 94f34ce270a89ec35993f5949bfccaf200a8b4f7ad3599ac6dd359ab5d4458eae81c371d42fd6005c1273355341490733a3c10c44e93b0bf0944511adffbcbcc
 MISC metadata.xml 361 BLAKE2B 339f321cde77e597a54ee20238e2d5cb8d8b33a1f37642a4b9f77a9e60612c6da07a7685460ef283b17cc865033cef306699d68832352362b935dfc32260b0d6 SHA512 5bbed3d4aa7581c474b9ab804f82c2a580529c32fc4755ed328ae04ce8f9031a96ee45bb2e9bd33cea8ab43fa3c6e3a0d0d6fda84dee8cc2d120e934f1a8389b
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.1.1.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.1.1.ebuild
deleted file mode 100644
index f8e3bd50adfe..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's PCTV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 4c3ac4a6869a..885a3db85489 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-stalker-7.1.1.tar.gz 118225 BLAKE2B 258c45c85ad71109e44c2fd52bbe9b04aed996cee12b7e2651ddc3170a5c0c6409d0beaf1fffef28cb71a78d0ce621c69297762be32e15f660c3f0fada2c610d SHA512 9f47dcc44f1f5448b36b456778e8592768e28253083aae26a7d65e1f793c841b0c5fb2f83cd398e0895cdd7e31a608c340c518e4d7e63d0075d93fef5f738739
-EBUILD kodi-pvr-stalker-7.1.1.ebuild 764 BLAKE2B f6808a5ddbd994ec10c4898b9def7433032b435466315d3ceeee19b7ebff03b8b11c3c9df60bc787f7626c8cf8b80a01af0f083d05b2cc5bda01e1206b4ef32c SHA512 f20f86f433535538ac7865421c9ecb775c153322dc04e41e9dbf13f9308df52b2460cebec3dba4d706f8bc22272032a286463497007abb8decbdd957f63cab41
 EBUILD kodi-pvr-stalker-9999.ebuild 765 BLAKE2B 318d9c6605fbed8919332cab9fd6d12e3dc0af107c89666818d26e1325f46e0c4f86d5ba8275daccdf83df6958983fb22abac7f26d4a87e0059694ed15e29a15 SHA512 053da8b2b6eb218e1f33e1fcccb6c12ef7662530acb4cf19b20fef47005db281064167a1d68c6d2d9848f3ffbca13c63a82e4259c31ce732c91737be12acdfa8
 MISC metadata.xml 364 BLAKE2B ca139995e33c15e3d8c3de244e88e4a7730ac37c5c67dce38ed4b4f56218c6a44fbb4aff4cc1cd0b5f6ab561ead0bb51f0bf52b08d467ff32ca24ab232533e6c SHA512 2d0560972546e526ce491df6d7c84c9f7d4a80a9629a2ab33b2130aab8e23c370423759ce8d05324b7f659f514b7143cf65cf2f7c4276e1d4280e1f8869ddb9b
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.1.1.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.1.1.ebuild
deleted file mode 100644
index ada67b2164b4..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index e11117e4764e..493ad1d51699 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-vbox-8.1.2.tar.gz 163016 BLAKE2B a140551485e4bcfa1b067d56b571a046afd7e10944c1b34221739b2a3c9ef6f17523b01a019ba7e049557970a1c9eaa9bf6733887357ab89d498774ca1e1aa20 SHA512 f0e3bed8305d9f7762ed41c3350029e5b374cacf3bf936e5b35503f651761e7addca1f961a7d44739dfd92e48bdd7756c53b616e2183c91c446afc2411598eed
-EBUILD kodi-pvr-vbox-8.1.2.ebuild 673 BLAKE2B 455c393a01fe938609f33b18b6204ae959f1af6f256997006964f57c7b40a631852c118cebb717a9d7c42e58143988246680b2d0b35bc267f3810b854cd8645d SHA512 586c6d2340585143ca6d45f50b76e8e5c19a6e1fafcfd69bff2f5a2d081bce25d677a6373d9bd02b192f84d483fa609631b002a22039766947cb64904ce2c7b3
 EBUILD kodi-pvr-vbox-9999.ebuild 674 BLAKE2B b592bbd6fe222c5d78f91cffef013fda2b46bcb9f973f0d28271d176551c00aa4aa17f93af173109243fd0848301fb013adb2243b622a55a58c5fe3c86ac16f3 SHA512 07a6264c0db07e3f8d6bf45c206de39f737ff185548c669d6c84e2b2c1193169027145a2cafdfb37ff72ffeb33ea5f714a8d45f86869bbe9cda53f95aaf4666d
 MISC metadata.xml 361 BLAKE2B 456756898a753c1e40a7dddf1c3dfbe7e8c640862402d254cc6f22c8fcdf788e315944f2b903fa053aee75ca3036bd575b077a177b7e035930c1f2a6bb6dfac3 SHA512 1a81be6e643839cb040a366d24a437f5b68e331de8e9cd58d593cffdb82b4a20ddfab71984886193619e2526cc3d9d4051d84bd464c52288924ef695caecfa65
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.2.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.2.ebuild
deleted file mode 100644
index 349e008af303..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index 7b7e0b8231fb..89b8a11ed941 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,4 +1,4 @@
-DIST kodi-pvr-vdr-vnsi-19.0.5.tar.gz 183902 BLAKE2B 1bc2980a63cb1f04a6b7f609286eef8c710175d73f5b7f7c52f9c816c74ef6d97e23453fb636c257f76924c2763e6e5845ddc1a54bb43564c04a1418d9be7683 SHA512 67a9169069fcfb6a1b64f67a4eb5e46ebc6da61063afe7db0cbcc8abd4c79d16e446a1d080c42f4153edd26c2fe262d1c1c595c4ee9880a33405887a2817de6d
-EBUILD kodi-pvr-vdr-vnsi-19.0.5.ebuild 661 BLAKE2B cebf81e18dbc468efa5259e3442217fa144ffabda8edb5782125b6276e42cac46895650eb9bce7832f639c1dc8541f9b6b8b36290d634535e84efabaa1057019 SHA512 e734ad50f2d766580e9d0921e56304e4fb345872ea39c298eed95c784424ebe4504788adf29040f26dff22b2e70d518d02c528e02cff9976a382c7d9176df574
+DIST kodi-pvr-vdr-vnsi-21.1.0.tar.gz 184204 BLAKE2B 0e68b4c3d17c3a31223530d1698d74fbb602e67f04658b93eefed9d1e5734913e7f77067cde47371390252be82a006c25df37491b3535549b127d7e2e492b232 SHA512 41b17f890122a1b19c2883595f9300f2779327f68048e3015ea53395c40acbe74dc19b5bc705f3c9f701488d9aa84fe62e2c83f531a7d01166ad7037abed673b
+EBUILD kodi-pvr-vdr-vnsi-21.1.0.ebuild 621 BLAKE2B f4b8ccc653894cc31127e49300b23140e28d937e2d297230f1acfad9b8fbd082f71c6ad75abb399eeb168dba552ed8750f55927900b6948921ff0db705ebb8cc SHA512 b0018a192e83135fef18d6af10c748fb9500b9bc9b95645470004633f8dfc03e4d9d2c9e68e57432147706a74cb118dbeaa17f00e934c123a9f9b4eb2d74b31f
 EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 662 BLAKE2B 384eeccddd28b9d8d779d82a84b5682f0e20360532c8ab2cb4afd727e3ea557c95d264640834d792d82a975665dfd769e82513f0bf5d689891930a373274e441 SHA512 bb86dda212c0ec83c1b8aae29698bcfd0109b426a718ef5e4c801fc598e050c3272fc0569c0603f21eadd146ca0d6687f16fa5d73752aba1dc2f9270eae6826c
 MISC metadata.xml 365 BLAKE2B 743bffd676479c2658150d9eba84c19a1a05155ba93676a680f66741b01d753f6b1487711765576a7f8cef3ee25730548b9c3b6d2839f4239ef0a424da1553d4 SHA512 188781df94dcbe012c319dfd312ca0ee3c7924f306409046aa8e2ae75cba79846cec69c1be04b9da999550f25cf700af8374604a6d0ae6c4e0875f44f249a4ec
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.5.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-21.1.0.ebuild
index fc0fe6a6a3c9..7860b9f41f6c 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.5.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-21.1.0.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake kodi-addon
+inherit kodi-addon
 
 DESCRIPTION="Kodi PVR addon VNSI"
 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
 
 case ${PV} in
 9999)
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
 	inherit git-r3
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
+	CODENAME="Omega"
 	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
 	;;
@@ -25,13 +23,12 @@ esac
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 DEPEND="
-	=media-tv/kodi-19*
+	=media-tv/kodi-21*
 	virtual/opengl
-	"
+"
 
 RDEPEND="
 	${DEPEND}
-	"
+"
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 455aae9148b8..91988e8d6bcb 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-vuplus-7.4.9.tar.gz 947759 BLAKE2B 58ad0cf68b8c70bee7c39a2e5a1eec874073de03cfa34b66c8f65b4fa84de88dd0c9a2d3fdeec55236265cd6ae748dde74942e1dd68b71ab64940b327c017426 SHA512 beaa89a348ef0fba0d51d982590731102d548f2c95c095ceed132306e7b76b4e5d9613be135c9c05d86a38b8b7203ec750e80dbb8bc5692d5f653fab9137c1c4
-EBUILD kodi-pvr-vuplus-7.4.9.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 363 BLAKE2B 2867e5ce9493e83de108c3d3f3d004d26690eba3eb89dfaccff216411725028a368716c97c636c60c9405c8771345a27359cc76821b79db759372ac67c742c26 SHA512 c9ae122d8b8c3817013945c96dcfb89ac091f07769e1e42c72500ec07871ff758060a821a6804c457169add9794b7a03ad5fc7330a2eb9db6ce7e05296c0d38e
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.9.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.9.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 7720f097ce89..69073ed824ff 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-wmc-6.1.2.tar.gz 190018 BLAKE2B 311406bfdaf2aa36eb8f11257de65d555581acdcff19d6cb0bceb2d1cebe3a33fcd49cfd2344095e5ae482431f00964c6d95843e0c6702c2e2f3d2e7092d3096 SHA512 b0e53c8494a5c811182358afbc7834b7cc51104839c7b4bf59047ef00e4b9bbf013368d94f095fa384dd4aa590a1f64c0235328b652962cd39430273c8e41c0b
-EBUILD kodi-pvr-wmc-6.1.2.ebuild 671 BLAKE2B e17ba5285a0582c02a90770f51011686dc5ce76b161c61f39948755a2400482a04e51a7f23a2cfc5dcdd1d1f13bd081699f6dd7b9778850e8738f0946261aa94 SHA512 8b8d41dcf46f06a76593e36d8c098c3835d488b5b08d18eae6221a6f11e0f2d46532d46ae17ff60740820a2f13c19f70cebcb05412632ad71c6e51db93535bf8
 EBUILD kodi-pvr-wmc-9999.ebuild 672 BLAKE2B d33f39250a6b1faad7a0a70451a31c08af9fa51f90fc691aea2227585c8b6abd6a07c66bf088c54230df701c242984d89b14d21c01d44a12e522df14a4492f73 SHA512 a4c10a79ad84582c2a7384c84da599446c42cf75e8b878510743a23b7b95c375c440944231f396ce239371c791fb5e7c8a60f21e89a6822df7b66885fc0d1fec
 MISC metadata.xml 360 BLAKE2B 10d20b2446d7733836eb29b033dd6d4e6bd18204358c0b999a63405e57c54c94e2fe18be19ea8ba02e5ee53e8f293c0fa303fab66f4d85ab3e2be760a614ba0b SHA512 c6a6d7cac48620a863cf45d68d4fcdc47589d70faea27efaa124f61180d9b563d91369f2a5c6ac4ee89ef46fb383545141e14c7d7cdc1e181a60fce01476c032
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.2.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.2.ebuild
deleted file mode 100644
index 66f8557b7b1b..000000000000
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Windows Media Center client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-zattoo/Manifest b/media-plugins/kodi-pvr-zattoo/Manifest
index b7d7b41ff606..560c66db5c02 100644
--- a/media-plugins/kodi-pvr-zattoo/Manifest
+++ b/media-plugins/kodi-pvr-zattoo/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-pvr-zattoo-19.7.9.tar.gz 4150172 BLAKE2B c521ed2925af231a3fa5e6eda5587926e21b2bc1093856bd648265bac4f17aabe7ade8fd234ceabd590ca681f78077b356281bc135efa899b53f1787d67bf560 SHA512 4be3343f155e30db817670007ba094fee87444f3468f88e275485f138594824bb659e0646e6aea8c189cf59323a8e3452165ab8038f8b31e2a89fcd3610d9dc1
-EBUILD kodi-pvr-zattoo-19.7.9.ebuild 734 BLAKE2B c91e8a051a3b094f6c1c96015bc45551aa703a74081f9d3e502ba7041955c8cd20a177682381d10547c4215bf4cf93dbd3f65e78ce2f8ad3b1c6c1c0dde09b9d SHA512 f81dc2fe019ab696abdbe06f19463e6aea68f49664110e6aeec90f3702d375aa0f9a436f2dfca1797035b0e702ae2ceb2c3b7ac630e7474e66adf4664a838bec
 EBUILD kodi-pvr-zattoo-9999.ebuild 734 BLAKE2B c91e8a051a3b094f6c1c96015bc45551aa703a74081f9d3e502ba7041955c8cd20a177682381d10547c4215bf4cf93dbd3f65e78ce2f8ad3b1c6c1c0dde09b9d SHA512 f81dc2fe019ab696abdbe06f19463e6aea68f49664110e6aeec90f3702d375aa0f9a436f2dfca1797035b0e702ae2ceb2c3b7ac630e7474e66adf4664a838bec
 MISC metadata.xml 363 BLAKE2B 9e0d4447129e7b47fba92f8f4373120f2efe5a5d89b325ec1a5e6ddf576a241ea2628a250d44025b8d96a14dc9a08c6b063c817681971450ebf1196db3d3dc87 SHA512 9f794f5234e67be339afdf5f81c364c1dbca8b7c5d4a38df40a23fe3040e78eddd26c4b955a37bd0d34e887c28059016e48149af73d012b24b50977f238a79d5
diff --git a/media-plugins/kodi-pvr-zattoo/kodi-pvr-zattoo-19.7.9.ebuild b/media-plugins/kodi-pvr-zattoo/kodi-pvr-zattoo-19.7.9.ebuild
deleted file mode 100644
index 7bc8e453445c..000000000000
--- a/media-plugins/kodi-pvr-zattoo/kodi-pvr-zattoo-19.7.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Zattoo PVR addon for Kodi"
-HOMEPAGE="https://github.com/rbuehlma/pvr.zattoo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/rbuehlma/pvr.zattoo.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/rbuehlma/pvr.zattoo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.zattoo-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	dev-libs/rapidjson
-	dev-libs/tinyxml2
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 3cde175f2f75..5b42b9421d73 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-asteroids-2.4.2.tar.gz 120463 BLAKE2B 3ec2c8142f8d763e85095f6c89c59583fb0ca309c18a57407fe456113dd8964f6bd896c23fc6d86b9a4d1aacb25e097202e52844faf9272e08d507e50f523ca5 SHA512 795c7ef2eaab9e1801d48430b9544a7f721d45ad5aed79ca2e361b16186043dd2ac9dc2b47ddf459744717f4704c9212d23c18df9da6c1bd158e6e6e9ef76fc5
-EBUILD kodi-screensaver-asteroids-2.4.2-r1.ebuild 885 BLAKE2B 89cded4503c14f2be2b981d150605b4d2f84ee32e3cdfe0c671f14f91e65e4d1da8f7aedd90391a1c3e503f69046fece82b0668f324bebd84bf9972803af9fdd SHA512 099d2b02baedcee62f4bbaa19054b50c3fc93752bb08aebcbe64322eb2ea552093506a1e68ca001cf6d879906dc9c09062b3112e31d73d400954fb46f2f82fbe
 EBUILD kodi-screensaver-asteroids-9999.ebuild 885 BLAKE2B 89cded4503c14f2be2b981d150605b4d2f84ee32e3cdfe0c671f14f91e65e4d1da8f7aedd90391a1c3e503f69046fece82b0668f324bebd84bf9972803af9fdd SHA512 099d2b02baedcee62f4bbaa19054b50c3fc93752bb08aebcbe64322eb2ea552093506a1e68ca001cf6d879906dc9c09062b3112e31d73d400954fb46f2f82fbe
 MISC metadata.xml 370 BLAKE2B a53f6e942a23489b87ef65695045e6d28043089ba2b914ba5a525633a8b4344c350c5202e4b754a88d2719fa9c88c6980f96a88cb03799f0cfd48b91932f1f24 SHA512 50342e5ea699daf9d3c71c2b3cdf33f5d5500d28d3a7a4882146aecdea19b6c01f1e415f132323e68bf68f9cc83f003aaa183f02dcbac495c5833ac9963115fb
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild
deleted file mode 100644
index a423eb767979..000000000000
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Asteroids screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
-KODI_PLUGIN_NAME="screensaver.asteroids"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-asterwave/Manifest b/media-plugins/kodi-screensaver-asterwave/Manifest
index c8ca0a353a83..f8d3e65c5134 100644
--- a/media-plugins/kodi-screensaver-asterwave/Manifest
+++ b/media-plugins/kodi-screensaver-asterwave/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-asterwave-3.3.0.tar.gz 1056656 BLAKE2B a7282d11bab2f8d0f003ce6434e10941f6f23c7daaf14fc57f528e486d8779a0106c9f37e4a55cddb60c025c389b5db2b68378023a59bbea02303006b81fb51a SHA512 ba74d08f152ec45d255842144f427e7fc4772c99c668f801a0e4054362532be4e7a360cefcd5c3ccc2cc3529a191fc2fea9be5d6c13c5d1032e58bd7d9342210
-EBUILD kodi-screensaver-asterwave-3.3.0.ebuild 885 BLAKE2B 7353e846066e0518116b1da24b0946f48ff04d81c2d8ac62f7b544c5985586c686a8e98e45b35b49eea63c2f9c1553819383a0debe31dd59dc96153640fe0250 SHA512 b9dc7975e8723f1975d58ee0313fad20a62144febd8c76f056a7918405ac65f67a945366f40cecda8a9b442075dfbe51a699e4a379455022240895a45db228f0
 EBUILD kodi-screensaver-asterwave-9999.ebuild 885 BLAKE2B 7353e846066e0518116b1da24b0946f48ff04d81c2d8ac62f7b544c5985586c686a8e98e45b35b49eea63c2f9c1553819383a0debe31dd59dc96153640fe0250 SHA512 b9dc7975e8723f1975d58ee0313fad20a62144febd8c76f056a7918405ac65f67a945366f40cecda8a9b442075dfbe51a699e4a379455022240895a45db228f0
 MISC metadata.xml 514 BLAKE2B 01f5977bbbef4c5fd7efadbb509abbd8faf2567238ab012837d675abc9739f05bf337692219b83490ba612e9df502f2d4d1de142f5e2b7f096199f2f525b2cd0 SHA512 9b046306a0dfce9cf0034b6d88a08bf8c298cdff572178c245794ef854563fbcdec62d111c2e30cbba6f69485486b15f1eb5e0fd3db900683482834085d026d3
diff --git a/media-plugins/kodi-screensaver-asterwave/kodi-screensaver-asterwave-3.3.0.ebuild b/media-plugins/kodi-screensaver-asterwave/kodi-screensaver-asterwave-3.3.0.ebuild
deleted file mode 100644
index 4f4093082b93..000000000000
--- a/media-plugins/kodi-screensaver-asterwave/kodi-screensaver-asterwave-3.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="AsterWave screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.asterwave"
-KODI_PLUGIN_NAME="screensaver.asterwave"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-biogenesis/Manifest b/media-plugins/kodi-screensaver-biogenesis/Manifest
index 08733597c43e..fee9585ab71b 100644
--- a/media-plugins/kodi-screensaver-biogenesis/Manifest
+++ b/media-plugins/kodi-screensaver-biogenesis/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-biogenesis-2.3.2.tar.gz 143025 BLAKE2B e454d8fdca397b163d4e1d4856257e3db819423706b153e833b39a3f789b493073a0047456eff75f912b26723fc63f7b6956eeaf88d410a786a8b71266c76b77 SHA512 c4761f486aebe08df8811ff54bc32ae0f44e416bf2bf22f639478ffe27f26d2e4239704f6e8f93871a9d9c7903351e04ed05295d60345e8eb829c82874c6cfc1
-EBUILD kodi-screensaver-biogenesis-2.3.2-r1.ebuild 693 BLAKE2B 96f78c24d88bbdee8bc10ee07f8a7badf72a0444455af49584506db88f3647489ee98d6abf6c723c1d59710a3ace2e78ec060addc96d5824a67d35c27e4cf5f7 SHA512 5451041185df4e4c64c31ebde0d39158ad592eaefb118d1a00f9f4932dd869637ac4a3427554fa83affabcf74bffe763f4cd53913ff89a3e27adf62f236fb7b0
 EBUILD kodi-screensaver-biogenesis-9999.ebuild 693 BLAKE2B 96f78c24d88bbdee8bc10ee07f8a7badf72a0444455af49584506db88f3647489ee98d6abf6c723c1d59710a3ace2e78ec060addc96d5824a67d35c27e4cf5f7 SHA512 5451041185df4e4c64c31ebde0d39158ad592eaefb118d1a00f9f4932dd869637ac4a3427554fa83affabcf74bffe763f4cd53913ff89a3e27adf62f236fb7b0
 MISC metadata.xml 371 BLAKE2B c5effb5da93be7e97a8f1e2b69dbaa9fb48461513ac7aa8bd33f88afa9e73fbb5b348f9dd7c18b32ed952d0541b28805f8341831ea9ca2cd3c9b4eb5f8e6de82 SHA512 0efee8e93004cbae04c02d0a499202b57223e30e8131ec3ef7129afd475c7dc37bfbbee3c557dc395175efc27dd01773499374678efe786fe541594aff8d9e43
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2-r1.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2-r1.ebuild
deleted file mode 100644
index 1c4c5134eec9..000000000000
--- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Biogenesis screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/screensaver.biogenesis.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/screensaver.biogenesis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.biogenesis-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-screensaver-cpblobs/Manifest b/media-plugins/kodi-screensaver-cpblobs/Manifest
index cca9b28376a9..e91ef9e97857 100644
--- a/media-plugins/kodi-screensaver-cpblobs/Manifest
+++ b/media-plugins/kodi-screensaver-cpblobs/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-cpblobs-3.4.0.tar.gz 1679862 BLAKE2B e43603f6b78b57b71dada5261d679bc61f42446acd50b24ee4102103dc5d1c3b6efaa9c9b59617ded86784a67b5b7d6a7f0c736166145c8f8f52504bf6926360 SHA512 27c47c4b8d5f1427efa3044deb390e63bfc1940d496883c069b72d44fe726699c8f1141bb4b9eaa9f02903bc4867a75b9fbfe268ce34d3e6f18c657bb5b7e146
-EBUILD kodi-screensaver-cpblobs-3.4.0.ebuild 879 BLAKE2B 3dbe3c367e2208f874ee344d9e4cb85e5b481114d2a68621e5f61c499da1ad54fa4fe5afc285947d4182f4ec5e10d7837c054f98bc807deda4fdfc7dd7ba36b2 SHA512 268e94dab9c66d0362d189368af9abc227e09b5d7aa972716d694d3e397dc63e17a2130bb14b2fc30ffe98e411ee6c4c7866a260a958142d4b1d64372cd1ea3f
 EBUILD kodi-screensaver-cpblobs-9999.ebuild 879 BLAKE2B 3dbe3c367e2208f874ee344d9e4cb85e5b481114d2a68621e5f61c499da1ad54fa4fe5afc285947d4182f4ec5e10d7837c054f98bc807deda4fdfc7dd7ba36b2 SHA512 268e94dab9c66d0362d189368af9abc227e09b5d7aa972716d694d3e397dc63e17a2130bb14b2fc30ffe98e411ee6c4c7866a260a958142d4b1d64372cd1ea3f
 MISC metadata.xml 512 BLAKE2B f8df51ca7250022e0ecf1d9ef7e194c63e4a3ba85034c66cc5f7b724738a0f4b6e9c78adaee3d2a784d82a7599a4f23c5b4d7caff7d4dac60ba8d7b76c003f6e SHA512 facbfaad2b62ca1eb684aabb9d3869ac873928f15b869d1ed0208d9f4031591ed7cd69058bee71f34dd0afc010c059a9265eca9cdccb47406dea8bce583bc0f5
diff --git a/media-plugins/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs-3.4.0.ebuild b/media-plugins/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs-3.4.0.ebuild
deleted file mode 100644
index bbc4afdf7b00..000000000000
--- a/media-plugins/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs-3.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="CpBlobs screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.cpblobs"
-KODI_PLUGIN_NAME="screensaver.cpblobs"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index 8d82468a8ff1..f4302a218912 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-greynetic-2.3.1.tar.gz 336191 BLAKE2B 54cc3f93bb18c315e75faca68dd7683e7afb50ebadcad01c33e60457958702205d51321b665ac72c95f4d758ddf896b9bb120e4a9a9315be33d24f9c1707989b SHA512 e4e6e513c4b2c7476ee0f29a436abf102a196e5c307c17e9b197572cc7eb7a12890033250a8115ea4bc43baec0f5cb87f1103413a7d6b852235f0710b4086279
-EBUILD kodi-screensaver-greynetic-2.3.1-r1.ebuild 901 BLAKE2B 403fbe945809faf151fa3d631a4a3f6d0e8854c35de2b58c58edec964a050091c18bf1b8afdfade3f22a9552b0e6f7b3fc5b1d129bdeb7690e8c2c9477e44bc2 SHA512 9d22e1764246769f1eb31ddd17d391c4e216565125979c11b267a65ceeca9f4152c980208df1effa83b68b9e9aceb78e2d101ab74a829558f5f07befb96b9a1f
 EBUILD kodi-screensaver-greynetic-9999.ebuild 901 BLAKE2B 403fbe945809faf151fa3d631a4a3f6d0e8854c35de2b58c58edec964a050091c18bf1b8afdfade3f22a9552b0e6f7b3fc5b1d129bdeb7690e8c2c9477e44bc2 SHA512 9d22e1764246769f1eb31ddd17d391c4e216565125979c11b267a65ceeca9f4152c980208df1effa83b68b9e9aceb78e2d101ab74a829558f5f07befb96b9a1f
 MISC metadata.xml 370 BLAKE2B be00468e5cfe27cfc736f1e87d07669bb84fd88ce5393eea028f57e42bad66ecaebbd0d2dbfb5fd1227f331738dbb2f9a3e55c20058c7244a4614869485cad6c SHA512 bb96036ca03f542d0269c0e79eef6aaf9c94d1ae1db2017050570509481d7670a70115a0ed1cfe7c11b130d7afd3277605a0a8eb31396d998da70575aa688e57
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1-r1.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1-r1.ebuild
deleted file mode 100644
index ef726bd9c51c..000000000000
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Greynetic screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
-KODI_PLUGIN_NAME="screensaver.greynetic"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-matrixtrails/Manifest b/media-plugins/kodi-screensaver-matrixtrails/Manifest
index 9dd8dbd10dfa..0ce243ee8394 100644
--- a/media-plugins/kodi-screensaver-matrixtrails/Manifest
+++ b/media-plugins/kodi-screensaver-matrixtrails/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-matrixtrails-2.6.0.tar.gz 855189 BLAKE2B 6a8525da2661a6d34deb28d068c791d7a7fe9339426d258cf4d96facaff3baa6d6e115e3f1333fd8649704d7f836d09dc8570548f490f0986d33d70abe2532bb SHA512 8770021c999539431a5a6acce1e892639133c0856d30d74c7775038c87a922aaed216806cbcfb71f680593f9227cc3ed45b10631b70f489b7dfda2e4221381f1
-EBUILD kodi-screensaver-matrixtrails-2.6.0.ebuild 863 BLAKE2B baf973adee3f68e959a08ab8d6e0a99f790b775678d96350fc641e378dc4bd547a4e1a91a0c20c36c3feb7d984b2680fdd46fcafee8778fcaf2f38b9b1416e7d SHA512 01046722810078473f56b20b9834f505dc02b11f6c2921f05399c846907f040151089b731f9c860b87e3a41babb1435bf059c5009167fbcecdc9587158fe40b1
 EBUILD kodi-screensaver-matrixtrails-9999.ebuild 863 BLAKE2B baf973adee3f68e959a08ab8d6e0a99f790b775678d96350fc641e378dc4bd547a4e1a91a0c20c36c3feb7d984b2680fdd46fcafee8778fcaf2f38b9b1416e7d SHA512 01046722810078473f56b20b9834f505dc02b11f6c2921f05399c846907f040151089b731f9c860b87e3a41babb1435bf059c5009167fbcecdc9587158fe40b1
 MISC metadata.xml 517 BLAKE2B ca46b144957f9a70c33a7aee3a3a4f0973b050af3dd6a73168b8bbb424279fd8840040dd45eab5835ed27050c8c0802eac39976c4e9812e5ae929d85478d04fa SHA512 4c75e25752982326a4ccc430bd78d493e6d8f368ad65da4c1d147119c46c0b1d9087f5c662b838fb0ee80918b65ea735ed6feec86199cf334924f17f77fac954
diff --git a/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.6.0.ebuild b/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.6.0.ebuild
deleted file mode 100644
index 497606cc108f..000000000000
--- a/media-plugins/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails-2.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-KODI_PLUGIN_NAME="screensaver.matrixtrails"
-DESCRIPTION="Matrix Trails screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.matrixtrails"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index ac8891cfc73b..7e59545248c3 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-pingpong-2.2.2.tar.gz 25546 BLAKE2B b396f1e7e167c46b1acc49587b25bbb95b7310b5f10ec4a35daeaa752cd65fc3919811453c5be0b93ac807b6775db27f4f4be9be1183766eabe287e4b1b16a16 SHA512 bf7df6298a182479c676434ec23a20c120e2483a921ed7bc059f0712d7b0e1a8e97e2c140205a243321eef755cfb6e346aba9122924b59dea29ff386a94173ee
-EBUILD kodi-screensaver-pingpong-2.2.2-r1.ebuild 899 BLAKE2B 6d03c5cf9ce6468b0296e442bd78f494a4883d5c6f6380d32c5d4926b01a59fda86bfb0e6e0bca12cbba98fbdd389e89e3202332470f6f4447d0d384188858d1 SHA512 401770baeddf756162c455b3bb0ea56b6c643b4f7cd0174274ebc5a5267f12233a555bf7a8f53c702560c5f3545a633b736e90c1c9ad888171923508c6821172
 EBUILD kodi-screensaver-pingpong-9999.ebuild 899 BLAKE2B 6d03c5cf9ce6468b0296e442bd78f494a4883d5c6f6380d32c5d4926b01a59fda86bfb0e6e0bca12cbba98fbdd389e89e3202332470f6f4447d0d384188858d1 SHA512 401770baeddf756162c455b3bb0ea56b6c643b4f7cd0174274ebc5a5267f12233a555bf7a8f53c702560c5f3545a633b736e90c1c9ad888171923508c6821172
 MISC metadata.xml 370 BLAKE2B a53f6e942a23489b87ef65695045e6d28043089ba2b914ba5a525633a8b4344c350c5202e4b754a88d2719fa9c88c6980f96a88cb03799f0cfd48b91932f1f24 SHA512 50342e5ea699daf9d3c71c2b3cdf33f5d5500d28d3a7a4882146aecdea19b6c01f1e415f132323e68bf68f9cc83f003aaa183f02dcbac495c5833ac9963115fb
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2-r1.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2-r1.ebuild
deleted file mode 100644
index 5046bcdc53fc..000000000000
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Ping-pong screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
-KODI_PLUGIN_NAME="screensaver.pingpong"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index c6f129a7630d..6dc07e12f991 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-pyro-3.3.0.tar.gz 84587 BLAKE2B c4f18f1016fc98d7dfd631fe6b8d50731bbc4756b5b92f74a437219e2c2fff726474be6f63a7def7352f73303867f9e5882d5e28778adb4f21082cca367451d2 SHA512 e12ad6ba0d49f1e479da7d448646ff1d0bf5521d59c86b0652e03ee932e7de160d67d96d8d55a79830a9c04271f5d9a2f4f45cac98a1146265eb204e0b2d8826
-EBUILD kodi-screensaver-pyro-3.3.0.ebuild 652 BLAKE2B 6bb121138731a59d4a22fa3d60cc6d5929375b1104973a64621ed1f4a13aaaa9b9c3565140b000c3ab8df0c8e3bc61dd4dd48e00c5180c343688ea7c56d12e0b SHA512 aaad27e132e0e6dc003b7119ee393c58136c0174ede889548067d9541f843b3f6b3c9d45219842c380b637d76674d94534f8f63c5eec7aab70a9e49fe2840298
 EBUILD kodi-screensaver-pyro-9999.ebuild 653 BLAKE2B 73ebe9d0404b3dcd80c0e3c44e83063ac1e63ec5251f8018e96ce223c544517008491a2d8fd540fb9c5fa014f35705072c3879b8a4b7a3ee515cf19b7866d4af SHA512 e5132bc7e16e8a2dc7a0e5c4576df494350dc7247913d998f315ac1d9ad58e9d8f3a472766556f84f556120093b042c7e2ac6cc539318731333dc618006be572
 MISC metadata.xml 365 BLAKE2B 21ebed438027a25230abdaa9187ce4dbb476c78963feda8d8c0eaea66096e398a519769a8575b3759e4e1f8d40560b5555ec9c8730ede79a495972460e396f9f SHA512 92621208b886df3cd0f0eb5ae25cb7626e0bd9a9d2aab485be622b5120360d62aa721f5514a5303ebc7c177b27073920f19ef06a321c7d31d7b6dd62c2e895e0
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.3.0.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.3.0.ebuild
deleted file mode 100644
index 6b20cc260690..000000000000
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Pyro screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_BRANCH="Matrix"
-	EGIT_REPO_URI="https://github.com/xbmc/screensaver.pyro.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/screensaver.pyro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pyro-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
diff --git a/media-plugins/kodi-screensaver-shadertoy/Manifest b/media-plugins/kodi-screensaver-shadertoy/Manifest
index 2c63b498b6e6..f3ba300b1ef8 100644
--- a/media-plugins/kodi-screensaver-shadertoy/Manifest
+++ b/media-plugins/kodi-screensaver-shadertoy/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-shadertoy-3.2.0.tar.gz 12838928 BLAKE2B ec91e778e323c4bf6fcd9653a8027cf1cfde43bfe54c3c207e0e37024708b34b00a68f28d2240739aaed1ca91f19586bd0b25a46979ba0516cd2612427146f7c SHA512 1ac48462bc946c9fe3a55bc94526b0a3e270dd65d42e8557ee8b9e7c692b8d8c0e4eb66401bfb404c7b9d79ade8b2bec9a4a142f22ad5ec11824f738971a76eb
-EBUILD kodi-screensaver-shadertoy-3.2.0.ebuild 885 BLAKE2B 4d450429df9f825cdf1a3766d31e6636c1d1a6c3b03a15ae1d2081af03332d22fd80063ab7462915242b216bdac3b513134cfc04c5cf60d34cf1bbd239981fa8 SHA512 d3c9cb93cdb99ce9c5591e9912edbc0a10ecb4987fa353685072b8ad50a2b8c4e4a3bff7472390f66e0c1314fb759afbccb12fc384b7bf203d9d04c8afeff81e
 EBUILD kodi-screensaver-shadertoy-9999.ebuild 885 BLAKE2B 4d450429df9f825cdf1a3766d31e6636c1d1a6c3b03a15ae1d2081af03332d22fd80063ab7462915242b216bdac3b513134cfc04c5cf60d34cf1bbd239981fa8 SHA512 d3c9cb93cdb99ce9c5591e9912edbc0a10ecb4987fa353685072b8ad50a2b8c4e4a3bff7472390f66e0c1314fb759afbccb12fc384b7bf203d9d04c8afeff81e
 MISC metadata.xml 514 BLAKE2B 56d8a2344b2e8d1f924ad06215719b715c642c3cb17ac4bcabd457f0af6992003ccc4614e4c5fe3ccbafdffc15d8fd6b7db5591ff825ecb7311e552cfe136d5e SHA512 21f61d92b8369f94cd4cc72725627d54b7919ed6301db043fd8a11b79eb947c8a88445cf85689716e19a98051119fd94d120b2b4b8394d62dc98e1d47f396c65
diff --git a/media-plugins/kodi-screensaver-shadertoy/kodi-screensaver-shadertoy-3.2.0.ebuild b/media-plugins/kodi-screensaver-shadertoy/kodi-screensaver-shadertoy-3.2.0.ebuild
deleted file mode 100644
index 435a31a32834..000000000000
--- a/media-plugins/kodi-screensaver-shadertoy/kodi-screensaver-shadertoy-3.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Shadertoy screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.shadertoy"
-KODI_PLUGIN_NAME="screensaver.shadertoy"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-screensaver-stars/Manifest b/media-plugins/kodi-screensaver-stars/Manifest
index 7212354183a7..56174efbcf28 100644
--- a/media-plugins/kodi-screensaver-stars/Manifest
+++ b/media-plugins/kodi-screensaver-stars/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-stars-2.4.0.tar.gz 281246 BLAKE2B 7371c880feefe567c1d85a19fb03bdddf7534cf51bc16de64199d14e9456d26ada4c8a478f8e8badcfe19948319fc220403933952ae86f0d6dc70c88ac8dbe0b SHA512 faf30c7df759a5c0dd0212369e83835f5949b37f476bf67f03f310d405aa0fd1daa62d0bbb899be11e4ee0ac1f1bb5321be647b0e7792d7c3a730d3ffcd256ad
-EBUILD kodi-screensaver-stars-2.4.0.ebuild 711 BLAKE2B b33c5d5cd7494d15a75a8500a4b4e039507cfc649df602aec60af1a1c435f155071b99e0a2274555258dc9ec83fccad6418525ecbaaaaed80c8d17f9e2bb9b6f SHA512 641f109fc64920eec978fa9861e86344ba3cee6a7a4d93aa4d111e8cdb85dd4fcb30ee210cde57046c1a7fae77cdfd68b3cbbf331bb47d21ed870406e2373310
 EBUILD kodi-screensaver-stars-9999.ebuild 711 BLAKE2B b33c5d5cd7494d15a75a8500a4b4e039507cfc649df602aec60af1a1c435f155071b99e0a2274555258dc9ec83fccad6418525ecbaaaaed80c8d17f9e2bb9b6f SHA512 641f109fc64920eec978fa9861e86344ba3cee6a7a4d93aa4d111e8cdb85dd4fcb30ee210cde57046c1a7fae77cdfd68b3cbbf331bb47d21ed870406e2373310
 MISC metadata.xml 510 BLAKE2B 505d075a446a81e30b4fac633922a0ffd81f59436c8a5c63c2f37b3c59f18e9c492dde20be21cebce5f55c0bf42e92a9be3130225dbe083022fa7413651d10ef SHA512 d79de8e8a040194ce45ea8772e38ed7219b25950c445eb70f6b2daee4155f42cf5ee2f7f2de5c0ed8e14a3a1f1ca6c15821feba5f4a8addc6545e0f6273fd611
diff --git a/media-plugins/kodi-screensaver-stars/kodi-screensaver-stars-2.4.0.ebuild b/media-plugins/kodi-screensaver-stars/kodi-screensaver-stars-2.4.0.ebuild
deleted file mode 100644
index 45acfbb6c5b1..000000000000
--- a/media-plugins/kodi-screensaver-stars/kodi-screensaver-stars-2.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Stars screensaver for Kodi"
-HOMEPAGE="https://github.com/xbmc/screensaver.stars"
-KODI_PLUGIN_NAME="screensaver.stars"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index 5415aa777e8d..716d3821339f 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-vfs-libarchive-2.0.1.tar.gz 56520 BLAKE2B 32d2fe05da176cbbbd601e62434595aa6b597074fd9c22495ccbf8db97abb479cc8df22a3b45cb7a79734245d29fe15e429410fa638cd98f5fac26198c89a8f4 SHA512 8a72a1ef01beedf6cbbc4349b4f1cec135dc99158cdd1d5fcda0bfbde74ed3cced9f2f8c01dafdb3891109c5b257b16a2448124de2396cb6db50b0316f67efb7
-EBUILD kodi-vfs-libarchive-2.0.1-r1.ebuild 816 BLAKE2B b9287415c8ce34b6a104281167bb3c5652949606dd8678e805a669c694c33aea1fcd372a2e0fabd74b8278ffcf562a70c021921c031b5978c26cf3039278e028 SHA512 7c93350476d248c14db29766252408420e5a210da8cdf885e804f98ae84fc510e8b94d3b86322b7553f9ebc589b9dbf7e6b324217679dc257a73737fb88c79bb
 EBUILD kodi-vfs-libarchive-9999.ebuild 817 BLAKE2B 9e188ba5d08abe4495a6c25826ac409e3132fcdaad9428716d80db9a187fd66cdd6aac20d8e9d13f09c73476d82313b8d99885ad0adfbc09a0391e285c523e48 SHA512 2a5daab2ed08303af40e4d050092cd5a3c764e71e8e4de0e7d5c607ad506bb8d2ed22b5831fe2ddfe654a2034f7847010b2db7953b91e63e42062cb05b13abad
 MISC metadata.xml 363 BLAKE2B 9f3b12716040c5be9fee766fc3f1afaf22136e8dc622848ce7d5b44030fd22c78d80301cddc94bcd198d7c051e782e5b8ce9b28398b3de3eaae63133fd8c55b2 SHA512 0856e8173bcdcce2bb4d430a009e14a0d375fed6947bf22fae3b837448e5938d0222c5c968271ba1d2eebbc40a95dc809a4e7ea51863db42956aedc5013933b6
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.1-r1.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.1-r1.ebuild
deleted file mode 100644
index 15409a0d124d..000000000000
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Libarchive VFS add-on for Kodi"
-HOMEPAGE="https://github.com/xbmc/vfs.libarchive"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/vfs.libarchive.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/vfs.libarchive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/vfs.libarchive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
-	app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)]
-	app-arch/lzma
-	app-arch/bzip2
-	sys-libs/zlib
-	app-arch/lz4
-	dev-libs/lzo:2
-	>=dev-libs/openssl-1.0.2l:0=
-	=media-tv/kodi-19*
-	"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index 0fac3262edd9..723a16fe71f4 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-vfs-rar-4.0.0.tar.gz 464866 BLAKE2B a221f6e9604e3f8d76a5e4eebfc518d17f6129489d6bff9efd89475bf3661d50da69d77cf9f84518137e9a74b33bb758bca5acd474bb968249c5bca555c6a1f7 SHA512 6287c277419f964b950220a858f098eb9aa9bbab4aaff1277850a84f8dfd90a6d5f4fd6c9ea04e84a3c1744ee69cfc4dd7010e2e29f6578640960220f3f716cc
-EBUILD kodi-vfs-rar-4.0.0.ebuild 695 BLAKE2B 3b3f0a79e8f9dfbd4c3fd6dbe15ec76a08be85985bbbef64abc1c210629e1c1c261cee99356f25fac1205b3ae3b436fab7c133c8cc22a723c627b2a96b9654c3 SHA512 668146b609c2a462e30634423d8611104a2eb533130ad7b6b6ea642ac351f3870466f280cb471fd0f70ffe18c3a60e1d804e28fabfec6df3a46cf2ce7c433eca
 EBUILD kodi-vfs-rar-9999.ebuild 695 BLAKE2B 3b3f0a79e8f9dfbd4c3fd6dbe15ec76a08be85985bbbef64abc1c210629e1c1c261cee99356f25fac1205b3ae3b436fab7c133c8cc22a723c627b2a96b9654c3 SHA512 668146b609c2a462e30634423d8611104a2eb533130ad7b6b6ea642ac351f3870466f280cb471fd0f70ffe18c3a60e1d804e28fabfec6df3a46cf2ce7c433eca
 MISC metadata.xml 356 BLAKE2B 361d7833f6b8b1335775b4d01e00a915eb74297753dbbf5587baf95fefcd83a72eb11e8930d062809eea13cd7820c8268614df1371064b79f817dd0930ebd6f3 SHA512 b7f6f3f55a5f70be104ef123700add1fdeec0539765a7e0f34560efb940ee9113198e73c153e03ca1dc74e89cdbafa0402b205576085094d8515719665eea5a5
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-4.0.0.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-4.0.0.ebuild
deleted file mode 100644
index e66bc07a7f4e..000000000000
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-4.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="RAR VFS addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/vfs.rar"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/vfs.rar.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/vfs.rar/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/vfs.rar-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	dev-libs/tinyxml
-	"
-
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest
index 3c587dd40ef1..82c428f55d71 100644
--- a/media-plugins/kodi-vfs-sftp/Manifest
+++ b/media-plugins/kodi-vfs-sftp/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-vfs-sftp-2.0.0.tar.gz 36146 BLAKE2B 50aadf1087b64791c6e284673c4072829592dd10e8772b739e34091257c3a410862225dae98c322b6616663e3dd0d6ebe8ae7e1518fe89cc9e8b2233dec95cf0 SHA512 223dc0f7ef53318963e77f4b4c5ddb9bc3afa9f3ea5d8ba202269d71a68f24600b99c6927ee856441fe216fbec9e821af8328c3911ef306dff61bb107a7cf0df
-EBUILD kodi-vfs-sftp-2.0.0.ebuild 740 BLAKE2B 1748ce2cf58a0da874b86ec7e6fd4bae0877075b1a7aae24f57fa609590a33e8d54f9e68d3cf6ddefe65885b61a3969a1d530740ed29e1658acfba5045afccad SHA512 a38f1987be50c977b5e8f11e21d79b425444816c36a0c16c24ff5113138e372e6611ccc81cf44423e5d1b981d74e54c24b9bb2a667f0c5d1590dd73e5d7b9074
 EBUILD kodi-vfs-sftp-9999.ebuild 741 BLAKE2B ac394c62a47d066d65eaeea1e080c0384fda8e96d9032dfca52f5846624e96f0c17292b674ccc590f095da23a548b35b46dbe92934092325c80fe03b787f66c9 SHA512 e68456f35086fc39a8c437be71d7b834db68d97d00b164c50a2af956606a98f77d432d4c9546711c20ba50baeedb52e1c55264b202b9416713fb54b7713cdbbe
 MISC metadata.xml 357 BLAKE2B d9e8bf289148bbaf27147e942eed13144869689180a71db04259f861fd1a9cc62dbbcede1981c2be2017c59063678fae528e50196022f92e92939ba6b3672442 SHA512 6f1dacee96a4418c654f2f487b52cafda9324eb43810a9a49dd3532d0d7fb72e8d0e373579f1433abb5e9cc4c01ca706077be69f6fde41aec8a5f3bdde67e0c6
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-2.0.0.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-2.0.0.ebuild
deleted file mode 100644
index 4f57d2b4aa6c..000000000000
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-2.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="SFTP VFS addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/vfs.sftp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/vfs.sftp.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/vfs.sftp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/vfs.sftp-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	net-libs/libssh[sftp]
-	=media-tv/kodi-19*
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index cdc5305e2888..70bd0e0673bd 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-fishbmc-19.0.0.tar.gz 377037 BLAKE2B 7c60ea6ae87a2d9caeeee34e6b48117b2d41fc339bdccd88f2971ce5c3ca6f757e2884722ad793bb2a96c04a3d05aaef8fe329e102cdfaaad77d4fdfe80d3215 SHA512 f982c9365039d6b02099ebab9c8ff85ed27357780fe1426b9d77985f34d0053cc5a51183ec7ec73ef84b2131325f4f9786171d609306bf06be3c2e02bb0e40cb
-EBUILD kodi-visualization-fishbmc-19.0.0.ebuild 904 BLAKE2B 84e4cc55891194504eb73856dccabd8b8ffe6ebd27ae3d70840e1134b9168af9852f5f7d463b5c48ec7bbf5e3e160126569e2840b9999947cc6a0bade6fe06eb SHA512 265065c78991cfca3f0ec37a2ca71c985bec00b4fd2d3b5c65b61939f87dd0104a3a89f44930a123b9857f78c21d649a6d9aedcb980d203444ad1c7817d5419c
 EBUILD kodi-visualization-fishbmc-9999.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
 MISC metadata.xml 374 BLAKE2B eca8f543ad7ab231d6e57cb710ed477784951cb9db3119c7e968ed66c9deae7592a940d52e0d59cdad247b775c43d86cfa3b5e109271660dcbd9f033ca719ce8 SHA512 d8fff762d7953375ce13fb285e1a7f6ca86611564a72bd8e3887f8c595cdc77fb3d53ef99ebc1d5bb2f6eb5df1af4effe976e6b50676bbf1f0c16a26e98280ae
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-19.0.0.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-19.0.0.ebuild
deleted file mode 100644
index 62124d599686..000000000000
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
-KODI_PLUGIN_NAME="visualization.fishbmc"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 660b14d7bcde..7e54189835dd 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-goom-19.0.0.tar.gz 1217302 BLAKE2B 7e7092d47a176cb25930616eed696023541e2e056efdb9b0cb0396763f761ec34d3c38f5c95540408dddb14d26ca9f95817b6bba12931485046f3081bbb17cd8 SHA512 199fb3dfb03f2874b5cf6df33fd29de3727026c98a7115333db2f19fa880a723930a1b8336ab125f769928af1e823b01fbdaeb66ee02f673c77d68cc61b84f13
-EBUILD kodi-visualization-goom-19.0.0.ebuild 896 BLAKE2B d442cdfaa125714d7f89578bb8eff1b43334a9568bb115878cc394852944e1c465840a9fe9f3dfefac72e738046372b7670cfd485361ee8b1b6b1096a25a3c55 SHA512 23bc0d961fb8e29bc1f3bb415a56507e2bdc6afde7b81b4a8eacab16d6d6fb28a33a83d7a5f803a6c5b259d91855c9588a41bdfe11f4907b34bbcfca9d17deb3
 EBUILD kodi-visualization-goom-9999.ebuild 889 BLAKE2B 81ca413eb39a0e0c82a394f92ee1660dbd26e560b6bb36ba48fc2ae2f029b5ac3cbd12492ec9f31924fb0dcc1b30ce78839078ce0c81b1c0a61021ff12be5e1f SHA512 a6e1c6a9e3f5fcd943e36a2748005e90c2a4924fbaf8580c0cd1fb8247d46e44f6b3001605f4c3b8a13f3324850d0ef19549317bf976c33da189f1083c90f7b4
 MISC metadata.xml 371 BLAKE2B 749c20b4975041f9c0da8e05bb9b4bbb1445aa8d7349f343a9551df494a206482d4d5b6de52c512b39fb1cf8392d19d17c60dc4514cc8b8b7e638904b88a050f SHA512 0b4e73209ab4132aa0478c5b1d95d9832c7c375484d0dd4f322d37582ad5eb5445d7c0cc8d02ae0522e714f569522639606fbd78b54fd569730b83ea47fabc46
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-19.0.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-19.0.0.ebuild
deleted file mode 100644
index 6a1753f77e44..000000000000
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Goom visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.goom"
-KODI_PLUGIN_NAME="visualization.goom"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index 6ff5bb06da04..52c6f7d0cbbd 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-projectm-19.0.1.tar.gz 2512570 BLAKE2B a402b4b0a0e1cd8489f9bfb600ac4d69741044af104c8e649061eb5f00d53891966fb44820b439b29d17725404e940da7a548baa2b610fd52bb217a90fb028d2 SHA512 be7a898e2646e0042efb93334ec61a668ffecaa64c51ce041f4a044461dd46b6964eea5a8ef9de5e97c6fa8bb841be4d6e153ca985e727eae1f399b15b5fa973
-EBUILD kodi-visualization-projectm-19.0.1.ebuild 913 BLAKE2B 273502c5117ea2674952781203174ff8529aabdbc950c2f850b3cfe30a0a513ee470192028cd721395cdb86daea4c85fb0e5cb433c0f795151a73ebea4f46b34 SHA512 262d80798712e8cccfd6049d1cb4f3bef9e8923aeb7c2bfd411353fb13a3e9343f688b13c600d9ca0760eedd7ebad9df7687a071ea6c3644c9162ff0c4203db0
 EBUILD kodi-visualization-projectm-9999.ebuild 907 BLAKE2B 797d2d018f43fa668cedc41180b549fe5657a6251b46fc20714d5e5ea9504b3122c2f8df9476442e4a25b8c6c4624a036809507915e1bd3f7833a30315aec718 SHA512 cedd92cac001364d4f4c18214a959b3feac46fe938c56e39ce33aa6380f78a6f204dab6be6b6e20632161aa4b36ed931715614070af30a2961d743f899bf0f5b
 MISC metadata.xml 371 BLAKE2B a325e7aefc03877668c082aded651df58cff959168ca4184db4e50c1d21688c10d1e1a3548f432de0d23ac248945524a85b9f2e8e0d5bc32b50c641d5e179d0f SHA512 0cf1a8c39c77aea359d0680c537280835a8d64c2a177d697d395d0d7a0c533b8a9e6e48ca8554f6b012e3a75a7a57315e1a3ba6d27029d6fd23dd27386fc5dcc
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.1.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.1.ebuild
deleted file mode 100644
index 5262e65622e0..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.projectm"
-KODI_PLUGIN_NAME="visualization.projectm"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	virtual/opengl
-	>=media-libs/libprojectm-3.1.2:=
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index 2b69bf333e18..ccb4a6ef2585 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-shadertoy-19.1.1.tar.gz 12516068 BLAKE2B 4266a40103d3d1a1d89ff0742e8067e544f145e974d3f2d8ddd3b6fdaebb506d401f2769bae259c7ee3317f41a834fbb2fb9e3498c4961a6e729a440dea8fab3 SHA512 796394ee62c17c7b25a7bc39c52b17b24ba220d2f4dde3a990d6de5fe1ef0ff87820ff66140ed48ec261cda28cdadcc8f920f4af369f9f2adac486d0ae6599f1
-EBUILD kodi-visualization-shadertoy-19.1.1.ebuild 818 BLAKE2B e59b2de838689f87d5d68687a83e9ada1821477ed52c812ec526f22e5d5e27080de69a30b06829614b12b6b0e56c9fc136ea7fdd7ad0a31ad821f238d73613ef SHA512 8ad0afdfdbf9d9431c16f2a62358e0245932723510aa167d70cec336abfefd9a046b6fc689a193100a67940509341a809586f322ccf257bbf3ee2ba56e821cf0
 EBUILD kodi-visualization-shadertoy-9999.ebuild 822 BLAKE2B eb354b7a28e9512cca2babb7a85d2842a13186b4656c7e043a27adeaecea9d554cd8f665dac8052d4df76f7feb5e7f9865e2bd87c854d72e75a42d5afa870089 SHA512 0a809e0ec9c2c68cba8adc0adcc7e4baec3b69f2c57831e055348e74043d76bf70ea2af8a22a97aa2270746f998a9b23e0141c6d07cc94d5f1aaaa719a9a16d4
 MISC metadata.xml 372 BLAKE2B b8886e552f1482d23a3fe5efd5d5f23056a01c33d418e3971855d183faae9be1c52fc275385a6a468c732ab41497b889ed372b21db2d821cd2f4661bcfbd4bf0 SHA512 8d1a0210f1343a85ef6a5fcbf63d31237b9b50161586e5cb3ad165dd8634ee62f11309aaf50dfb5a1e2fc4a27fcd58fb96871344aa5fa79465241bd975ff7f54
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-19.1.1.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-19.1.1.ebuild
deleted file mode 100644
index da8409f7b723..000000000000
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-19.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Shadertoy visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/visualization.shadertoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/visualization.shadertoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.shadertoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index 923b1351773d..ac3bd18b4610 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-spectrum-19.0.0.tar.gz 327030 BLAKE2B 5265d568cfef5faa8f2acfdf6a590d1b6fc306169bdafad1dccaf6c93befaedf18ef555345081047602ece0e084e235d14880c29abe9c4302be71ca9f0cfca52 SHA512 9a55a5c6718fe12e1eba71c4c0797ed151180f0b220ea76aa88ba5792e31443b3e8a2add725dc4074993e2789b67ade6d84f8a23d87ffe9ec91c23395872ad53
-EBUILD kodi-visualization-spectrum-19.0.0.ebuild 908 BLAKE2B e903c9b2fc237e50308760b3230264e5a461d01d82fee45630ccebc714806ee43585a7625850e4e847713cd71c52f24349102404a78a1ae256ddc93aa4e4fc75 SHA512 16ff6c1aae4f656aad5d7baafc5cbe05a71275b190149ce0726cd6267271a3bf60115b468b0b04b64f2694f3a8d83676f6eaae941b121b8ab19e04618f92d8f8
 EBUILD kodi-visualization-spectrum-9999.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
 MISC metadata.xml 371 BLAKE2B b677a2d822ae451a429b5d6201d8e805fd4bb0979d7f365b84614f95921d92ea0b378882f9cbe1f3edb77b89a585349da9bb56897958d789a7dcbc9fd500ef5b SHA512 aea93b2c79f11f19d50af71a4247823befd6ea01c4c0c7155eb0757aa49cadc591200cb9005fc2474402e8c2d9298fae36029c9bb9c187a769e39d7e47e2f272
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-19.0.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-19.0.0.ebuild
deleted file mode 100644
index 065a8e618dd4..000000000000
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Spectrum visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
-KODI_PLUGIN_NAME="visualization.spectrum"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index 5b9420895938..24fa7509a087 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-starburst-19.0.0.tar.gz 139450 BLAKE2B 610d62f35f2bd33385a37605072291a6df29f21830b37983563000b03bfdc572aeb58446423bf397cdbcc28e493c394ab368162bcde8ca7ce5e925bd24d76b61 SHA512 de531db6f095171c29c16b5d0f9c2a0c438b21b2b069074f62ff2b9c94912bf7a513cb2ef342c715162417ba61d1932f0f067c4eac7e7418658548b363178c71
-EBUILD kodi-visualization-starburst-19.0.0.ebuild 911 BLAKE2B a9a2ac6cc611964cc3ef62cf710a8a7e747febadff736dff1a0d7016f0516367c67888eff1c9c6f2275d8cb1109009f81c70de8799b76bb0d623ba927279c96d SHA512 34b182639c326ef9c0b9616172b387a1f7d1895cfb32fba72f94150ffffb98c8d5d07a14542c4e4396120beff5da974c10622449d7c9f790e3c59b965da9b44c
 EBUILD kodi-visualization-starburst-9999.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
 MISC metadata.xml 376 BLAKE2B e1ab647f13adfe9267db29ba3dbecb254c1e8b000abbe9055cfa8d489e51a22f23c04005d79b6474fd2e710ade536393931fba75c2d501d036974fff874880ec SHA512 e0595bfb2c1bfef45d54fa406ba124c5ac837e973f6c48df8cfb5dcbd6085435000c5bedc74d18a34a052ff3e19f816bdcb24845646ac222c9317bb99e763471
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-19.0.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-19.0.0.ebuild
deleted file mode 100644
index e18becef84aa..000000000000
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="StarBurst visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.starburst"
-KODI_PLUGIN_NAME="visualization.starburst"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index c8ee69fd07ba..8a13900613f0 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-waveform-19.0.1.tar.gz 553122 BLAKE2B 64880cc04e38ac853ff1278a9c235cb696d30587cba830a0c77aef8076843cc6c8adccb4efb8ce1312aacd6e947a592464c45b70d1ce055d88785e3255492517 SHA512 562ee37dc051271c5e080d2dae391a9437bcddc25b397caa2eb7e2cc8fed73d2644fccba740fe0084d2876c1b6873babfb114bce873a2723e994be757c8a6a0e
-EBUILD kodi-visualization-waveform-19.0.1.ebuild 908 BLAKE2B 29d8e5c140f74bc858d4ed0285319e7a232bfc2d0b656cd623987658f48ba78d81e7232b7656b82cded940ecd0cc7ee7d439d3d3b40ee9d00296570788c82f82 SHA512 3927ce5fe63b853e47061b7f77f0f8d1ae0a72068ce17cebf844d04361dd5e9a350f35497d7d0baeda681026a1d53af5dc4b658446767d47bc7705be6f2e47ba
 EBUILD kodi-visualization-waveform-9999.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
 MISC metadata.xml 371 BLAKE2B 894c191482486b50a429430d2078eb1fb1c5b48d2b5c517385a2fe67f900f841f427f23d69d0b464db4bc54b6b1915953112be2ed6e884bb1d7ab9b18116d75a SHA512 d6723f71fcc2a8b2d4712ed6ffc7d0b5eb65577c3619d5f16d2a1cfed4147c8a8a512c0bfdf9917a0d495a0099f3cae43909aa81c36bf677659f21f7bd33a935
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.1.ebuild
deleted file mode 100644
index 1b2f09524584..000000000000
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Waveform visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.waveform"
-KODI_PLUGIN_NAME="visualization.waveform"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 783d56f2116c..f0f720848f63 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index f4de2f89e4ad..e2e9535dfa7f 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -2,7 +2,7 @@ DIST picard-2.12.1.tar.gz 5863157 BLAKE2B 0015b0c378088f2cd2d7f2449a41c544b9f4cb
 DIST picard-2.12.2.tar.gz 5863787 BLAKE2B f9f8fc5ffe424ce2a9aa154994e7ec1adf61a61a94769fb36d715de9ec84f1dac2d49f27d13900354adad7dcb936d62a2eba429e4ccb20dc5d6849d7f4b22adc SHA512 d06583c82737e6b5f26a639f24ecec115f29a9df7498e2632e084bcfc31f13c72965bd862c19c496fe0539c8987812d53ed9298522e37989c733af2f7ecface1
 DIST picard-2.12.3.tar.gz 5878683 BLAKE2B cdbe37842d5e2602941513835a3f28ff1ab2cad6ec37f41e6c1d8d4df2a8c957a36422414f2e4ce06d217c19b4a737fc4385022edb3052bba9cac138fa73c50b SHA512 0c4ec97f7d786982685cc095c838e46435b7305f10c33cd7d82eba006150acee934a92a182c3891e48555a7b958068782e9458ee4368cc4e3e39ad80cda858be
 DIST picard-2.12.tar.gz 5857635 BLAKE2B 4eaec28830d85a0a45d220012fbb1acbfd40accc1536e47aa616b7d0014ef6f36111a6e9d6992862f9ff5419f7cb0c7b2b7b0a737ceca20bc804ce040f52ab22 SHA512 28f8d6b7b59a9a145404ab497a4ef0d71f2fefe86b9ec28b7f6879ec10f5ab1fd3582363bb15dd92c92c624843e87c11fce959fee75d0b312e72f6575d93b1a6
-EBUILD picard-2.12.1.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
+EBUILD picard-2.12.1.ebuild 1458 BLAKE2B 4ea9ce9a342e40e0ec10fc604f8042188b9611f280afc5048466a44551a5f1cb7172e54c089e60b0e56d1b77054a2c6d8790d6b02ce8507f3947931047844ae5 SHA512 daea247c3f1a37cc46150515480365e0a53565c4af3edbedc76cb61e7b2d6828e856eb1fb8a4b1825104f7ea80c4c441e114c09028d5cb2c60f4e375d0ff17fb
 EBUILD picard-2.12.2.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
 EBUILD picard-2.12.3.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
 EBUILD picard-2.12.ebuild 1458 BLAKE2B 4ea9ce9a342e40e0ec10fc604f8042188b9611f280afc5048466a44551a5f1cb7172e54c089e60b0e56d1b77054a2c6d8790d6b02ce8507f3947931047844ae5 SHA512 daea247c3f1a37cc46150515480365e0a53565c4af3edbedc76cb61e7b2d6828e856eb1fb8a4b1825104f7ea80c4c441e114c09028d5cb2c60f4e375d0ff17fb
diff --git a/media-sound/picard/picard-2.12.1.ebuild b/media-sound/picard/picard-2.12.1.ebuild
index 6a6e26e28fc9..6bba3ba85121 100644
--- a/media-sound/picard/picard-2.12.1.ebuild
+++ b/media-sound/picard/picard-2.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cross-platform music tagger"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 5aee02cd4413..f353733e8b59 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 531c4ffac990..190653ad010b 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,35 +1,20 @@
-AUX kodi-19.4-atomic.patch 3225 BLAKE2B 83559b2886625c3d8b3a4958733c62508e3ca2d538141f061c5d8f8bc681710540c1ce5cffe3184e293d9f8d5e99c1c83cf29d8d4cada9920f3b2f0f756b6c44 SHA512 8d011c9d0caa037f44557a7fd6f745735207fd510b76f53064ee2dbc03e660dfe475586fa4a08fb5308ed0d5133261aae6853c2c7b63d8da4600903f6b232f9a
-AUX kodi-19.4-dav1d-1.0.0.patch 4781 BLAKE2B 1f51f4f89b481b80c384b0567715b7e512c28d26cdfc4572c2e1cf71cba5047bc010d7747b909704804e647cb100144bed0168f4209c602d96146d34fe72c123 SHA512 b16e8f9eefbd1d758f5d38485a0dd29e34478be8e69092ca2a80e182b7a45d3024c58fe80b0fc375eb503bedbf18035a50e695047095311aad2812bde9113ec5
-AUX kodi-19.4-fix-mesa-22.3.0-build.patch 301 BLAKE2B 7a351aa891015524f8377763dd1b9fbe1162c1431131995a75d9acdafa6c500f80ae01b0d2ac82e2be5ac286430cc15c8c2de6901da56c1d22d82d0566160a60 SHA512 e76e9244b97d6c791a18a35dc891b795b062aa4417ff2467930ccf0d4f0be3ef16791bd7c111213527c1cd87a983008ea055d2bb00334e237fb94d58c8057b05
-AUX kodi-19.5-flatbuffers.patch 1172 BLAKE2B 35434d6d71296bc4377ccb762d1dc1d73d100f446bf8b1f5ea96c2b5a80240a63f3f75c3bcb79bcfec038cba611e0c223769b518ba5f537f38770497dd7a461d SHA512 3687a77a35e8588873d1291ad2b9cfc7ff659fcf88ffad389e2016659800ad96ab645bd6843ee46f83856eddccc3f4e6965ba62c4aec18c4a1d6ff438a4cc812
-AUX kodi-19.5-gcc-13.patch 1849 BLAKE2B 1d3183305557b260bad52dbe0bb5828118013c08274861b902c6fa23e86422cc2d49936f125a00d57c29ba0ec7a9001cac53ac499e2ef4345d3a81f143d48c80 SHA512 e2f66f6a0ff4fa1a49a15a185cfbc9a76af8ff4630241a8c01e3de4d1e09f12d2724dc1fa7bb71c1c15e563810babcbb4217635a4e5460b33bbb0a4f81f2e5db
-AUX kodi-20.2-binutils-2.41.patch 3399 BLAKE2B 5608adfb32777371a71091de237e6173c72c272a5911e999c3e4bde6f0c0f788db644ccf1098ddabbbba7e6d2a0d65fbfa7570f6acf83cd351a6e779dd8b7f5f SHA512 aec2995737c78cf4ae3e9a4e9212f0481664fd91eb83e07d0bd354cede014015929628833e8b5a87fb19dda20d30abc5585d676a69bff3ee0111fb1f21bb87e7
-AUX kodi-20.3-gcc-14.patch 2048 BLAKE2B 8b34f1717c8c79c37ec6ccd51fbdbdc3495bb50166a22e1f3494a2d97c104055b187fe1fd84a4d35c125ba3975f4537372deae09666135117419ff02b10f0d42 SHA512 cd9210a573fe59cd822fb564c0aa32e6b3faad87bc79c02ae53740dba87e85f1a2a6429032f3393006e16ac6fb7a81ae18155c87ddd62bdd54680e09a90fa322
 AUX kodi-21-fix-dvd-playing.patch 1706 BLAKE2B d74af009e12eeb00d9402e58620c41c4da842830713fd0f9319d1e884e089a27432eccfc08d583a5d1eaa8fa9bcf4b00ea495e76f93b159a790ef1af3016d7e3 SHA512 b2badfe1fb5ffee0b2119670d205e0ba49005791be879f8d946c018e8f6af58174c1ffc0e85b89914c7858373b03ee5a3703f47af9d5aca11015aa701d149c16
 AUX kodi-21-fix-gcc14.patch 1374 BLAKE2B 5438405a2862328e1207787fad0d153bbfd7f94c5287e825bf0ef7e6a20cbc51185b626f8aba61b0747fb672418fdf5f44e715295a983107ca2ef018e1ad19e3 SHA512 60df712f47b0abc3b7a7247425b4ce4f273bfbadf8b4147883aa3e2432c02724d03c644785748bc3ac6bdf7fb19744ffea40c551420a02865dd83bfdac19f585
 AUX kodi-21-optional-ffmpeg-libx11.patch 549 BLAKE2B d828232075cf76a0655ec9f04106d98d503c9028138b7ab65db7ccd0cfbd4c50ee0629d3ab9a5d3c39f5209e0843a905178fdc28d2b6a2e5a56ec10760ab618b SHA512 c867311fa8bc13161d614e60c8510ec3a382438c92e98b5c755d6f4491472ad2aaf37adc6538f5494c90d8a20178901c5976028507e9c3a13644bdd783c2137a
+AUX kodi-21.1-fix-gcc15.patch 2463 BLAKE2B 769d4830d13ad0fa0eb5d7ebfe03d44d5e5c8642f5ef484534551ad970a980aaf7f8413b2b98ebcfd4fa2fb3a08b0d3099a16f044908791ae057ec3e639294e1 SHA512 88fa94678bd81c7182c6890fd314916fbd52ca8374994b41ac2b5b512556d0b9df38eb390ed238b396a496582c0b47c1efc5fbd6e9e26508c7e9c5a9f13c3689
 AUX kodi-21.1-silence-libdvdread-git.patch 1107 BLAKE2B 395d4677a5856fcfe22fd7e86828b989abccbf869ca2dc5d844efea895b3a4c0ea9633cc0f049d78ac215967aa52b871b79fc0fd3e2a78a0595e9b4156e3d845 SHA512 5b7679e5057fb56ab1af7a774251ec8ae3baa8622c809e77cb3495f5a421396c900a544d35df3d203e43426dd1b217a5a134505fc081423853d4b1764b788a0a
 DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba1070da1e68644531f85f71cf7695443b13b81393cc89d4103eb869d1523f0a22a6e1c3428dcabf4f79c8a2c6eb2a6dea74e84e8f SHA512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0
 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc
 DIST commons-text-1.11.0-bin.tar.gz 3018564 BLAKE2B c32e41c6b8c90dea876caf4c2cedc9358d5e49506bfee7aee42ac6b92dbe8505d5e5d81c860a739bb06214b832cc29e91ddb95f3cfc24515c970302a519a5e43 SHA512 2e94877000dd270b69e2e8cbf49f258a90b4c628b6b6b0814e300a2f0e9c391f0816dceb0707e596ae3b7c9532f93e7a4917df47c77f44b3a810e14042ce5f3f
 DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae61589413189e9c4ba7aa51c307179287506b9072626e9745861fe83753c0015b50d179f9b4f298fe9abf74bee13936639af SHA512 945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc
-DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
-DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
-DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
-DIST kodi-20.5-Nexus.tar.gz 54568445 BLAKE2B 15eb409918fa3768528d9abd24c52fd8b94c82699ef2ce10a529278fe25544dc335b66d137ae8ae304511cd92c1c0be34881937ec705ba936f5a4b0d737903f7 SHA512 a47a54ca11e1d3daeddea8c1ae716cd4461e3441de43a026a920c709b2ff5c7e0acc2a5fd4ac8c15f0da1940bd7f21a65eff32203ad8e167603c1576b21d4dcc
 DIST kodi-21.0-Omega.tar.gz 40987733 BLAKE2B 33adaf588b3362dc9d184bfb66c36ad5fa2e442255da47db4813f926e73f5a607dd7de809ecf8a4982f985bc8dac53cba17fb9db6a009bb0cdb6284db3b1edb4 SHA512 9c2ca6b6e72197d2b1c26a47cf4ddc209318fcaa5a30ea20475ecc5518c7d1395c2e9cf3e3a75a13334b0505e7b417acdb0d76a20567a0c86841b3e69232625b
 DIST kodi-21.1-Omega.tar.gz 41091890 BLAKE2B e711ef9b958ff3f8e006913ea6c42092164eeaae7011c2307f6d9846509e58db101a19dd51f4e95000de2f30ca2e77fd196187223d0ced7adad233d3ab57e286 SHA512 8458447c2a6d7ce0fdcfc7ec9b4ff1f8be0abf18a16804d245c3cef99408fcfb4b13aa18fca16c87e560316c97d281e214cf37fd7e17e243c1206c5575195dc8
-DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda
-DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c SHA512 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d
-DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
-EBUILD kodi-19.5-r2.ebuild 11404 BLAKE2B 0a49eaeeda4e3bacc05b85df0d97a7bca3d29263f5a73493024d3b50d96d164a318acc8d1810a8ad970504cc1efb54caa721caf7825cfea7ff78b5fe4a2518aa SHA512 8af7746280eeefdbe6fa6eabbfa39a653cc3a859d4e1eab20b21fd1a01b2a0f1d6b193c21a24e0e49ab9fa8eb8e00807d2d7ce874327d7fccf4724fca43114b7
-EBUILD kodi-20.5-r1.ebuild 12413 BLAKE2B 0e18e2c0bb31332cae6d24f96d4cf97c7e94e822304538d9a377b757ad3a976b57d0c7a373bc96a1dbbb58f3d988b2f2a8c42dabde7f27b1d51eea8f822a506b SHA512 52a30929d8cc833cc378abca2a4b370b22e074277e8e8aa7f5803ca80e3398eac166f42f85346a312630045a0bd434f43bec69496c7dea287edfd2ca9cac3758
 EBUILD kodi-21.0-r1.ebuild 13663 BLAKE2B ad00b5aa92c669d534aca6fef5008fbdd60875d1698d751d236f05237565ced7a37b717ea7979f67398476e76033d3817f20ce16bf3be9ed223abc014a791a30 SHA512 0810e05a7808e5d0f369c94662e3894a340ab1528f2d93475f1bf19080c7c410b58ab6a03ef3f857a540db674d6feb9f3f98f10c331c0a825bc8701a937687ba
 EBUILD kodi-21.0-r2.ebuild 13710 BLAKE2B e8864f27a607504257fab3fdc55757ebf39bae55830a633263e60a67d8835be5479b77da09cb1d60f36212db4e2a524dac2af196c76045d52127517627b56c0a SHA512 a89ef2de81b4e19b0e6bdf5738bc9952f38b70e05ae1161add82ecb001643e27fea1134c92a4e4b724f8c0870f8e8475c65523a57d2a6c8071e9e38115a4882a
-EBUILD kodi-21.1.ebuild 14274 BLAKE2B 768d0ace9147b0ea97f78167c5df6bb421c58fa5687f4a5dead94d62d7d8ea377aadaede6fc85e089ced50e657b34ed1e8f52eb09cd40809c37a9a23345b09a9 SHA512 9007b35ee7a76cbc69040c7c89ada6a6403bf33d1745219904757eb9d9f985ebc5ad760bba503ffbd74971cdac069732c85a6d83afe574f63d7db54f31553902
+EBUILD kodi-21.1.ebuild 14314 BLAKE2B 307c5c93948bdc067eff645865ffc8ecdde6c1991ddc998b4aaf764061d8393d6d06f2c718a4beb8f64a4e873aa5140aae6efe197aa6b73c59956aa2a1489e19 SHA512 fcd6b6c1ad076e71d45ad5cc5bbfa31a36c4dc9267bcffccca8dedf086d16320c097199f441f0623f6def1f2dfadebde2589b25d25800f6efa8794cdeb2bcede
 EBUILD kodi-21.9999.ebuild 14269 BLAKE2B 0b38b47b819e40f58996ee79bb4aad1da3177175dc0939c764d4b22de0f8c447ed436e491e34239a13f2e5197c32ab51c02b6dbe3fe76bf30eafe301de355277 SHA512 ac3fc2bdb912abe662760f55135875ac143e20471cb8a6b6ee69ed0983f085eeed47968a0c950155000caae299a67b35d404115ec70c6d98791bee1372b0278e
 EBUILD kodi-9999.ebuild 13796 BLAKE2B a34999f5ec80f1b4a04e9b7e6ba94464702b277ac21ac21460423b5c900a5f06521f28e2399217d6c43b817203a67ccb5d057e850282d425d93803b5d679e3be SHA512 e76a02c7eb84b8ca4f1fb6fd9d09be0073b49863cc3d7a64a5412bab022d8b3f8c0e0e180902d12b69104c601f7e0d5eb458232613720b514db7769f76f563dc
 MISC metadata.xml 2908 BLAKE2B 4b085bc5826f080224eadb489137f02741114afa1e424e5e61aa0cbe925a9f4fa9676ca45166d040f569ae99e94aa083533c5d3f0c9271c92286087cdb9f0dae SHA512 cf59967cf1631b3588fae307084ac7c48f03f1dffc5909ddafa9f6b126202391df0553d924a72a75e24302adc27e0f18d9c919084c7803d7dda15009d3731936
diff --git a/media-tv/kodi/files/kodi-19.4-atomic.patch b/media-tv/kodi/files/kodi-19.4-atomic.patch
deleted file mode 100644
index 3811fda8886d..000000000000
--- a/media-tv/kodi/files/kodi-19.4-atomic.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From ac3213e683e4c62c50dc02fef3b168d883245094 Mon Sep 17 00:00:00 2001
-From: Yixun Lan <dlan@gentoo.org>
-Date: Tue, 9 Aug 2022 16:45:09 +0800
-Subject: [PATCH] [cmake] link atomic library for certain CPU architectures
-
-For those CPU architectures:
-RISC-V lack 8-bit and 16-bit atomic instructions, and
-ARM/MIPS/PPC lack 64-bit atomic instruction.
-
-GCC is supposed  to convert these atomics via masking and shifting
-like LLVM, which means anything that wants to use these instructions
-needs the link option -latomic.
-
-In this patch, we will try to detect if 8-bit, 64-bit atomic instructions exist,
-otherwise the atomic library will append to the DEPLIBS list.
-
-Original issue:
-* https://gitlab.kitware.com/cmake/cmake/-/issues/23021#note_1098733
-
-For reference:
-* https://gcc.gnu.org/wiki/Atomic/GCCMM
-
-riscv64 specific:
-* https://lists.debian.org/debian-riscv/2022/01/msg00009.html
-
-Signed-off-by: Yixun Lan <dlan@gentoo.org>
----
- cmake/modules/FindAtomic.cmake      | 56 +++++++++++++++++++++++++++++
- cmake/scripts/linux/ArchSetup.cmake |  3 ++
- 2 files changed, 59 insertions(+)
- create mode 100644 cmake/modules/FindAtomic.cmake
-
-diff --git a/cmake/modules/FindAtomic.cmake b/cmake/modules/FindAtomic.cmake
-new file mode 100644
-index 0000000000..8ea3c815d7
---- /dev/null
-+++ b/cmake/modules/FindAtomic.cmake
-@@ -0,0 +1,56 @@
-+#.rst:
-+# FindAtomic
-+# -----
-+# Finds the ATOMIC library
-+#
-+# This will define the following variables::
-+#
-+# ATOMIC_FOUND - system has ATOMIC
-+# ATOMIC_LIBRARIES - the ATOMIC libraries
-+#
-+# and the following imported targets::
-+#
-+#   ATOMIC::ATOMIC    - The ATOMIC library
-+
-+
-+include(CheckCXXSourceCompiles)
-+
-+set(atomic_code
-+    "
-+     #include <atomic>
-+     #include <cstdint>
-+     std::atomic<uint8_t> n8 (0); // riscv64
-+     std::atomic<uint64_t> n64 (0); // armel, mipsel, powerpc
-+     int main() {
-+       ++n8;
-+       ++n64;
-+       return 0;
-+     }")
-+
-+check_cxx_source_compiles("${atomic_code}" ATOMIC_LOCK_FREE_INSTRUCTIONS)
-+
-+if(ATOMIC_LOCK_FREE_INSTRUCTIONS)
-+  set(ATOMIC_FOUND TRUE)
-+  set(ATOMIC_LIBRARIES)
-+else()
-+  set(CMAKE_REQUIRED_LIBRARIES "-latomic")
-+  check_cxx_source_compiles("${atomic_code}" ATOMIC_IN_LIBRARY)
-+  set(CMAKE_REQUIRED_LIBRARIES)
-+  if(ATOMIC_IN_LIBRARY)
-+    set(ATOMIC_LIBRARY atomic)
-+    include(FindPackageHandleStandardArgs)
-+    find_package_handle_standard_args(Atomic DEFAULT_MSG ATOMIC_LIBRARY)
-+    set(ATOMIC_LIBRARIES ${ATOMIC_LIBRARY})
-+    if(NOT TARGET ATOMIC::ATOMIC)
-+      add_library(ATOMIC::ATOMIC UNKNOWN IMPORTED)
-+      set_target_properties(ATOMIC::ATOMIC PROPERTIES
-+	      IMPORTED_LOCATION "${ATOMIC_LIBRARY}")
-+    endif()
-+    unset(ATOMIC_LIBRARY)
-+  else()
-+    if(Atomic_FIND_REQUIRED)
-+      message(FATAL_ERROR "Neither lock free instructions nor -latomic found.")
-+    endif()
-+  endif()
-+endif()
-+unset(atomic_code)
-diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake
-index 35ab1402f5..848723af1f 100644
---- a/cmake/scripts/linux/ArchSetup.cmake
-+++ b/cmake/scripts/linux/ArchSetup.cmake
-@@ -199,3 +199,6 @@ if(NOT USE_INTERNAL_LIBS)
-     set(USE_INTERNAL_LIBS OFF)
-   endif()
- endif()
-+
-+# Atomic library
-+list(APPEND PLATFORM_REQUIRED_DEPS Atomic)
--- 
-2.35.1
-
diff --git a/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch b/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch
deleted file mode 100644
index b37ace0f31ec..000000000000
--- a/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Nur a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
---- a/cmake/modules/FindFFMPEG.cmake	2022-03-02 18:38:51.000000000 +0000
-+++ b/cmake/modules/FindFFMPEG.cmake	2022-11-22 19:15:38.690434650 +0000
-@@ -275,6 +275,8 @@
-                       PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-                                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
-                                     <SOURCE_DIR> &&
-+				    # patch internal ffmpeg, fix build against dav1d 1.0.0
-+				    patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch &&
-                                     ${CMAKE_COMMAND} -E copy
-                                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake
-                                     <SOURCE_DIR>)
-diff -Nur a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch
---- a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch	1970-01-01 01:00:00.000000000 +0100
-+++ b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch	2022-11-22 19:12:09.566420470 +0000
-@@ -0,0 +1,78 @@
-+From 2546e1ed27f92a840a2cf319e3c1833799974cf1 Mon Sep 17 00:00:00 2001
-+From: BlackEagle <ike.devolder@gmail.com>
-+Date: Fri, 29 Apr 2022 14:33:12 +0200
-+Subject: [PATCH] add build fix for dav1d 1.0.0
-+
-+Taken from https://github.com/FFmpeg/FFmpeg/commit/e204846ec16c1ab34c7f3a681734cf5190433018
-+
-+add FF_DAV1D_VERSION_AT_LEAST
-+
-+Extracted from https://github.com/FFmpeg/FFmpeg/commit/7ee17ec7e46afef0e0af20af196292ec75f50b62
-+
-+Signed-off-by: BlackEagle <ike.devolder@gmail.com>
-+---
-+ libavcodec/libdav1d.c | 24 ++++++++++++++++++++++--
-+ 1 file changed, 22 insertions(+), 2 deletions(-)
-+
-+diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
-+index bbb3ec1e6c..08b4af8ac8 100644
-+--- a/libavcodec/libdav1d.c
-++++ b/libavcodec/libdav1d.c
-+@@ -30,6 +30,9 @@
-+ #include "decode.h"
-+ #include "internal.h"
-+ 
-++#define FF_DAV1D_VERSION_AT_LEAST(x,y) \
-++    (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
-++
-+ typedef struct Libdav1dContext {
-+     AVClass *class;
-+     Dav1dContext *c;
-+@@ -140,6 +143,15 @@ static av_cold int libdav1d_init(AVCodecContext *c)
-+     if (dav1d->operating_point >= 0)
-+         s.operating_point = dav1d->operating_point;
-+ 
-++#if FF_DAV1D_VERSION_AT_LEAST(6,0)
-++    if (dav1d->frame_threads || dav1d->tile_threads)
-++        s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads);
-++    else
-++        s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS);
-++    s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads;
-++    av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
-++           s.n_threads, s.max_frame_delay);
-++#else
-+     s.n_tile_threads = dav1d->tile_threads
-+                      ? dav1d->tile_threads
-+                      : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
-+@@ -148,6 +160,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
-+                       : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-+     av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
-+            s.n_frame_threads, s.n_tile_threads);
-++#endif
-+ 
-+     res = dav1d_open(&dav1d->c, &s);
-+     if (res < 0)
-+@@ -384,11 +397,18 @@ static av_cold int libdav1d_close(AVCodecContext *c)
-+     return 0;
-+ }
-+ 
-++#ifndef DAV1D_MAX_FRAME_THREADS
-++#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS
-++#endif
-++#ifndef DAV1D_MAX_TILE_THREADS
-++#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS
-++#endif
-++
-+ #define OFFSET(x) offsetof(Libdav1dContext, x)
-+ #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
-+ static const AVOption libdav1d_options[] = {
-+-    { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD },
-+-    { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD },
-++    { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED },
-++    { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED },
-+     { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD },
-+     { "oppoint",  "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD },
-+     { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
-+-- 
-+2.36.0
-+
diff --git a/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch b/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch
deleted file mode 100644
index e9ff90dfe55d..000000000000
--- a/media-tv/kodi/files/kodi-19.4-fix-mesa-22.3.0-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xbmc/xbmc/windowing/X11/GLContextEGL.h
-+++ xbmc/xbmc/windowing/X11/GLContextEGL.h
-@@ -13,7 +13,7 @@
- #include "threads/CriticalSection.h"
- 
- #include <EGL/eglext.h>
--#include <EGL/eglextchromium.h>
-+#include <EGL/eglext_angle.h>
- #include <X11/Xutil.h>
- 
- class CGLContextEGL : public CGLContext
-
diff --git a/media-tv/kodi/files/kodi-19.5-flatbuffers.patch b/media-tv/kodi/files/kodi-19.5-flatbuffers.patch
deleted file mode 100644
index 3e8f00c1449f..000000000000
--- a/media-tv/kodi/files/kodi-19.5-flatbuffers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/xbmc/xbmc/pull/23334
-
-From 07d8c98a0a65e005b85ef70e06eb1b9bbe7f764c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20H=C3=A4rer?= <markus.haerer@gmx.net>
-Date: Sun, 28 May 2023 00:49:40 +0200
-Subject: [PATCH] SavestateFlatBuffer: Remove forward declararion of
- FlatBufferBuilder
-
-This caused a compiler error with recent faltbuffers because the type changed:
-
-In file included from xbmc/cores/RetroPlayer/savestates/SavestateDatabase.cpp:12:
-xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h:19:7: error: definition of type 'FlatBufferBuilder' conflicts with type alias of the same name
-class FlatBufferBuilder;
-      ^
-/usr/include/flatbuffers/flatbuffer_builder.h:1414:7: note: 'FlatBufferBuilder' declared here
-using FlatBufferBuilder = FlatBufferBuilderImpl<false>;
-      ^
-1 error generated.
-
-(cherry picked from commit 351184d7e4e3edc447d04a297769eb41a477ba68)
---- a/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h
-+++ b/xbmc/cores/RetroPlayer/savestates/SavestateFlatBuffer.h
-@@ -14,11 +14,6 @@
- 
- #include <flatbuffers/flatbuffers.h>
- 
--namespace flatbuffers
--{
--class FlatBufferBuilder;
--}
--
- namespace KODI
- {
- namespace RETRO
-
diff --git a/media-tv/kodi/files/kodi-19.5-gcc-13.patch b/media-tv/kodi/files/kodi-19.5-gcc-13.patch
deleted file mode 100644
index 268ebc2737f7..000000000000
--- a/media-tv/kodi/files/kodi-19.5-gcc-13.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://bugs.gentoo.org/892503
-https://github.com/xbmc/xbmc/pull/22627
-https://github.com/xbmc/xbmc/pull/22631
-
-From 6730f62c5d709f8789e11d3f979c597fe702daa3 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 29 Jan 2023 22:14:16 +0000
-Subject: [PATCH] windowing: X11: Add missing <cstdint> include (fix build with
- GCC 13)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> etc is no longer transitively included.
-
-See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/892503
---- a/xbmc/windowing/X11/GLContext.h
-+++ b/xbmc/windowing/X11/GLContext.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- 
- #include <X11/Xlib.h>
-
---- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
-+++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
-@@ -12,6 +12,7 @@
- #include <lcms2.h>
- #endif
- 
-+#include <cstdint>
- #include <string>
- 
- extern "C"
---- a/xbmc/pictures/Picture.h
-+++ b/xbmc/pictures/Picture.h
-@@ -11,6 +11,8 @@
- #include "pictures/PictureScalingAlgorithm.h"
- #include "utils/Job.h"
- 
-+#include <cstddef>
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/xbmc/platform/Filesystem.h
-+++ b/xbmc/platform/Filesystem.h
-@@ -8,6 +8,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <system_error>
- namespace KODI
-diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
-index 66d1bf0200..dcd60698d6 100644
---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
-+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
-@@ -9,6 +9,7 @@
- #pragma once
- 
- #include <array>
-+#include <cstdint>
- 
- #if defined(HAS_GL)
- // always define GL_GLEXT_PROTOTYPES before include gl headers
diff --git a/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch b/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch
deleted file mode 100644
index 6ee7a55ee1de..000000000000
--- a/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/effadce6c756247ea8bae32dc13bb3e6f464f0eb
-
-From db99a6e0ed9490478a7af7b6a3299688b1a329e1 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Sun, 24 Dec 2023 14:02:37 +0200
-Subject: [PATCH] ffmpeg: add patch to fix build against binutils-2.41
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/cmake/modules/FindFFMPEG.cmake
-+++ b/cmake/modules/FindFFMPEG.cmake
-@@ -96,7 +96,9 @@ macro(buildFFMPEG)
-                  -DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig)
-   set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy
-                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
--                    <SOURCE_DIR>)
-+                    <SOURCE_DIR> &&
-+                    # patch internal ffmpeg, fix build against binutils 2.41
-+                    patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-binutils-2.41.patch)
- 
-   if(CMAKE_GENERATOR STREQUAL Xcode)
-     set(FFMPEG_GENERATOR CMAKE_GENERATOR "Unix Makefiles")
---- /dev/null
-+++ b/tools/depends/target/ffmpeg/build-fix-for-binutils-2.41.patch
-@@ -0,0 +1,76 @@
-+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-+Date: Sun, 16 Jul 2023 18:18:02 +0300
-+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
-+ instructions within inline assembly
-+
-+Fixes assembling with binutil as >= 2.41
-+
-+Signed-off-by: James Almer <jamrial@gmail.com>
-+---
-+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
-+ 1 file changed, 23 insertions(+), 3 deletions(-)
-+
-+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-+index 6298f5ed19..ca7e2dffc1 100644
-+--- a/libavcodec/x86/mathops.h
-++++ b/libavcodec/x86/mathops.h
-+@@ -35,12 +35,20 @@
-+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
-+ {
-+     int rt, dummy;
-++    if (__builtin_constant_p(shift))
-+     __asm__ (
-+         "imull %3               \n\t"
-+         "shrdl %4, %%edx, %%eax \n\t"
-+         :"=a"(rt), "=d"(dummy)
-+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-+     );
-++    else
-++        __asm__ (
-++            "imull %3               \n\t"
-++            "shrdl %4, %%edx, %%eax \n\t"
-++            :"=a"(rt), "=d"(dummy)
-++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-++        );
-+     return rt;
-+ }
-+ 
-+@@ -113,19 +121,31 @@ __asm__ volatile(\
-+ // avoid +32 for shift optimization (gcc should do that ...)
-+ #define NEG_SSR32 NEG_SSR32
-+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-++    if (__builtin_constant_p(s))
-+     __asm__ ("sarl %1, %0\n\t"
-+          : "+r" (a)
-+-         : "ic" ((uint8_t)(-s))
-++         : "i" (-s & 0x1F)
-+     );
-++    else
-++        __asm__ ("sarl %1, %0\n\t"
-++               : "+r" (a)
-++               : "c" ((uint8_t)(-s))
-++        );
-+     return a;
-+ }
-+ 
-+ #define NEG_USR32 NEG_USR32
-+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-++    if (__builtin_constant_p(s))
-+     __asm__ ("shrl %1, %0\n\t"
-+          : "+r" (a)
-+-         : "ic" ((uint8_t)(-s))
-++         : "i" (-s & 0x1F)
-+     );
-++    else
-++        __asm__ ("shrl %1, %0\n\t"
-++               : "+r" (a)
-++               : "c" ((uint8_t)(-s))
-++        );
-+     return a;
-+ }
-+ 
-+-- 
-+2.25.1
-+
--- 
-2.43.0
-
diff --git a/media-tv/kodi/files/kodi-20.3-gcc-14.patch b/media-tv/kodi/files/kodi-20.3-gcc-14.patch
deleted file mode 100644
index b4c5ee94eb80..000000000000
--- a/media-tv/kodi/files/kodi-20.3-gcc-14.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://github.com/xbmc/xbmc/commit/3dcea03c915f2062d4f8740d66abdf033fba9d6c
-https://bugs.gentoo.org/923041
-
-From 3dcea03c915f2062d4f8740d66abdf033fba9d6c Mon Sep 17 00:00:00 2001
-From: Manuel Lauss <manuel.lauss@gmail.com>
-Date: Fri, 13 Oct 2023 12:27:15 +0200
-Subject: [PATCH] add missing c++ headers
-
-Add a few missing headers which are no longer indirectly included by
-other headers, fixes build with gcc-14
---- a/xbmc/addons/AddonUpdateRules.cpp
-+++ b/xbmc/addons/AddonUpdateRules.cpp
-@@ -12,6 +12,7 @@
- #include "addons/addoninfo/AddonInfo.h"
- #include "utils/log.h"
- 
-+#include <algorithm>
- #include <mutex>
- 
- using namespace ADDON;
---- a/xbmc/addons/binary-addons/AddonDll.cpp
-+++ b/xbmc/addons/binary-addons/AddonDll.cpp
-@@ -27,6 +27,7 @@
- #include "utils/Variant.h"
- #include "utils/log.h"
- 
-+#include <algorithm>
- #include <utility>
- 
- using namespace KODI::MESSAGING;
---- a/xbmc/interfaces/json-rpc/TextureOperations.cpp
-+++ b/xbmc/interfaces/json-rpc/TextureOperations.cpp
-@@ -14,6 +14,8 @@
- #include "TextureDatabase.h"
- #include "utils/Variant.h"
- 
-+#include <algorithm>
-+
- using namespace JSONRPC;
- 
- JSONRPC_STATUS CTextureOperations::GetTextures(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
---- a/xbmc/utils/EGLImage.cpp
-+++ b/xbmc/utils/EGLImage.cpp
-@@ -14,6 +14,7 @@
- #include "utils/StringUtils.h"
- #include "utils/log.h"
- 
-+#include <algorithm>
- #include <map>
- 
- namespace
---- a/xbmc/windowing/gbm/drm/DRMConnector.cpp
-+++ b/xbmc/windowing/gbm/drm/DRMConnector.cpp
-@@ -11,6 +11,7 @@
- #include "utils/XTimeUtils.h"
- #include "utils/log.h"
- 
-+#include <algorithm>
- #include <map>
- 
- using namespace KODI::WINDOWING::GBM;
---- a/xbmc/windowing/gbm/drm/DRMPlane.cpp
-+++ b/xbmc/windowing/gbm/drm/DRMPlane.cpp
-@@ -13,6 +13,8 @@
- #include "utils/StringUtils.h"
- #include "utils/log.h"
- 
-+#include <algorithm>
-+
- using namespace KODI::WINDOWING::GBM;
- 
- CDRMPlane::CDRMPlane(int fd, uint32_t plane) : CDRMObject(fd), m_plane(drmModeGetPlane(m_fd, plane))
diff --git a/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch
new file mode 100644
index 000000000000..5ab776e70f50
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch
@@ -0,0 +1,116 @@
+https://bugs.gentoo.org/938531
+https://github.com/xbmc/xbmc/pull/25735
+
+From 75e7b25883af5d2c8c89dbe6d830a5c17e9452f2 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Sat, 14 Sep 2024 13:46:25 +0300
+Subject: [PATCH] Include missing <cstdint> includes
+
+* GCC-15 stopped implicitly including it.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/xbmc/ContextMenuItem.h
++++ b/xbmc/ContextMenuItem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <string>
+--- a/xbmc/addons/AddonManager.h
++++ b/xbmc/addons/AddonManager.h
+@@ -11,6 +11,7 @@
+ #include "threads/CriticalSection.h"
+ #include "utils/EventStream.h"
+ 
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <mutex>
+--- a/xbmc/addons/IAddon.h
++++ b/xbmc/addons/IAddon.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <string>
+--- a/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
++++ b/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
+@@ -11,6 +11,8 @@
+ #include "IRetroPlayerStream.h"
+ #include "cores/RetroPlayer/RetroPlayerTypes.h"
+ 
++#include <cstdint>
++
+ extern "C"
+ {
+ #include <libavutil/pixfmt.h>
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
+@@ -10,6 +10,7 @@
+ 
+ #include <array>
+ #include <cmath>
++#include <cstdint>
+ #include <memory>
+ 
+ extern "C" {
+--- a/xbmc/guilib/FFmpegImage.h
++++ b/xbmc/guilib/FFmpegImage.h
+@@ -9,6 +9,8 @@
+ #pragma once
+ 
+ #include "iimage.h"
++
++#include <cstdint>
+ #include <memory>
+ 
+ extern "C"
+--- a/xbmc/input/keymaps/remote/IRTranslator.h
++++ b/xbmc/input/keymaps/remote/IRTranslator.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <string>
+--- a/xbmc/messaging/ThreadMessage.h
++++ b/xbmc/messaging/ThreadMessage.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <utility>
+--- a/xbmc/settings/AdvancedSettings.h
++++ b/xbmc/settings/AdvancedSettings.h
+@@ -13,6 +13,7 @@
+ #include "settings/lib/ISettingsHandler.h"
+ #include "utils/SortUtils.h"
+ 
++#include <cstdint>
+ #include <set>
+ #include <string>
+ #include <utility>
+--- a/xbmc/utils/Archive.h
++++ b/xbmc/utils/Archive.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <string>
+-- 
+2.46.0
+
diff --git a/media-tv/kodi/kodi-19.5-r2.ebuild b/media-tv/kodi/kodi-19.5-r2.ebuild
deleted file mode 100644
index 7b7a084a897d..000000000000
--- a/media-tv/kodi/kodi-19.5-r2.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3.2"
-CODENAME="Matrix"
-FFMPEG_KODI_VERSION="19.1"
-PYTHON_COMPAT=( python3_{10..11} )
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-else
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/RC}
-	MY_PV="${MY_PV}-${CODENAME}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-	S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gbm wayland X )
-	?? ( mariadb mysql )
-	bluray? ( udf )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-	power-control? ( dbus )
-	vdpau? (
-		X
-		!gles
-		!gbm
-	)
-	zeroconf? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-libs/lzo-2.04
-	>=dev-libs/flatbuffers-1.12.0:=
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-"
-COMMON_TARGET_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		>=app-pda/libplist-2.0.0
-		net-libs/shairplay
-	)
-	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.1.2 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	<dev-libs/crossguid-0.2.2_p20190529
-	>=dev-libs/fribidi-1.0.5
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/spdlog-1.5.0:=
-	dev-libs/tinyxml[stl]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	')
-	>=dev-libs/libcdio-2.1.0[cxx]
-	>=dev-libs/libfmt-6.1.2
-	dev-libs/libfstrcmp
-	gbm? (
-		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm(+)]
-		x11-libs/libxkbcommon
-	)
-	gles? (
-		!raspberry-pi? (
-			|| (
-				>=media-libs/mesa-24.1.0_rc1[opengl]
-				<media-libs/mesa-24.1.0_rc1[gles2]
-			)
-		)
-	)
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-fonts/roboto
-	>=media-libs/freetype-2.10.1
-	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl(+)] )
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
-		=media-video/ffmpeg-4*[openssl]
-	)
-	!system-ffmpeg? (
-		app-arch/bzip2
-		dav1d? ( media-libs/dav1d:= )
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.68.0[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
-	!gles? ( media-libs/glu )
-	>=dev-libs/openssl-1.1.1k:0=
-	raspberry-pi? (
-		|| (
-			media-libs/raspberrypi-userland
-			media-libs/raspberrypi-userland-bin
-			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
-			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	>=sys-libs/zlib-1.2.11
-	udf? ( >=dev-libs/libudfread-1.0.0 )
-	udev? ( virtual/udev )
-	vaapi? (
-		media-libs/libva:=
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		wayland? ( media-libs/libva[wayland] )
-		X? ( media-libs/libva[X] )
-	)
-	virtual/libiconv
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	wayland? (
-		>=dev-cpp/waylandpp-0.2.3:=
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-		>=x11-libs/libxkbcommon-0.4.1
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] )
-	X? (
-		media-libs/mesa[X]
-		!gles? ( media-libs/libglvnd[X] )
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
-	)
-	x11-libs/libdrm
-	xslt? (
-		dev-libs/libxslt
-		>=dev-libs/libxml2-2.9.4
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
-	lirc? ( app-misc/lirc )
-	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
-	dev-libs/rapidjson
-	test? ( >=dev-cpp/gtest-1.10.0 )
-"
-BDEPEND="${COMMON_DEPEND}
-	dev-build/cmake
-	dev-lang/swig
-	media-libs/giflib
-	>=dev-libs/flatbuffers-1.11.0
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-	virtual/pkgconfig
-	virtual/jre
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-19.4-atomic.patch"
-	"${FILESDIR}/${PN}-19.4-dav1d-1.0.0.patch"
-	"${FILESDIR}/${PN}-19.5-gcc-13.patch"
-	"${FILESDIR}/${PN}-19.5-flatbuffers.patch"
-)
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/885419
-	if has_version ">=media-libs/mesa-22.3.0"; then
-		PATCHES+=( "${FILESDIR}/${PN}-19.4-fix-mesa-22.3.0-build.patch" )
-	fi
-
-	cmake_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/platform/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local platform=()
-	use gbm && platform+=( gbm )
-	use wayland && platform+=( wayland )
-	use X && platform+=( x11 )
-	local core_platform_name="${platform[@]}"
-	local mycmakeargs=(
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
-		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DVERBOSE=ON
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CLANGFORMAT=OFF
-		-DENABLE_CLANGTIDY=OFF
-		-DENABLE_CPPCHECK=OFF
-		-DENABLE_ISO9660PP=$(usex optical)
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_RapidJSON=OFF
-		-DENABLE_INTERNAL_FMT=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_INTERNAL_FLATBUFFERS=OFF
-		-DENABLE_INTERNAL_DAV1D=OFF
-		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_UDFREAD=OFF
-		-DENABLE_INTERNAL_SPDLOG=OFF
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MDNS=OFF # used only on Android
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex !gles)
-		-DENABLE_OPTICAL=$(usex optical)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SNDIO=OFF
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UDFREAD=$(usex udf)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
-		-DCORE_PLATFORM_NAME="${core_platform_name}"
-	)
-
-	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
-		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
-		CXXFLAGS+=' -DNDEBUG'
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_test() {
-	local myctestargs=(
-		# Known failing, unreliable test
-		# bug #743938
-		-E "(TestCPUInfo.GetCPUFrequency)"
-	)
-
-	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
-	KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-
-	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	if use !eventclients ; then
-		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
-		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
-		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
-		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
-	fi
-
-	python_optimize "${D}$(python_get_sitedir)"
-}
diff --git a/media-tv/kodi/kodi-20.5-r1.ebuild b/media-tv/kodi/kodi-20.5-r1.ebuild
deleted file mode 100644
index a518af43864c..000000000000
--- a/media-tv/kodi/kodi-20.5-r1.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# FFmpeg can be unbundled, but is currently stuck at a very old version.
-# libdvd{css,read,nav} are not unbundlable without patching the buildsystem.
-
-# Versions for the forked projects that are bundled
-# See tools/depends/target/<project>/<project>-VERSION
-LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
-LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
-LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
-FFMPEG_VERSION="4.4.1"
-CODENAME="Nexus"
-FFMPEG_KODI_VERSION="Alpha1"
-
-# Doesn't build with jdk-21
-_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} )
-JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]}
-# Required to be set, but not used.
-JAVA_PKG_WANT_SOURCE="17"
-JAVA_PKG_WANT_TARGET="17"
-
-PYTHON_REQ_USE="sqlite,ssl"
-PYTHON_COMPAT=( python3_{10..11} ) # python3.12 support added in 21
-
-CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
-
-inherit cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/"
-
-SRC_URI="
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz
-		-> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz
-		-> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
-	css? (
-		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
-			-> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
-	)
-	!system-ffmpeg? (
-		https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
-			-> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz
-	)
-"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	if [[ ${PV} != "9999" ]]; then
-		EGIT_BRANCH="${CODENAME}"
-	fi
-	inherit git-r3
-else
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/RC}
-	MY_PV="${MY_PV}-${CODENAME}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( gbm wayland X )
-	?? ( mariadb mysql )
-	bluray? ( udf )
-	gbm? ( udev )
-	udev? ( !libusb )
-	vdpau? ( X !gles !gbm )
-	zeroconf? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-# dev-libs/libcec[-cubox] bug #818262
-COMMON_DEPEND="
-	>=dev-libs/flatbuffers-1.12.0:=
-	>=dev-libs/lzo-2.04:2
-	media-libs/giflib:=
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-	wayland? (
-		dev-cpp/waylandpp:=
-	)
-"
-COMMON_TARGET_DEPEND="${PYTHON_DEPS}
-	>=net-misc/curl-7.68.0[http2]
-	>=sys-libs/zlib-1.2.11
-	dev-db/sqlite:3
-	dev-libs/crossguid
-	>=dev-libs/fribidi-1.0.5
-	>=dev-libs/libcdio-2.1.0:=[cxx]
-	>=dev-libs/libfmt-6.1.2:=
-	dev-libs/libfstrcmp
-	dev-libs/libpcre[cxx]
-	>=dev-libs/openssl-1.1.1k:0=
-	>=dev-libs/spdlog-1.5.0:=
-	dev-libs/tinyxml[stl]
-	media-fonts/roboto
-	media-libs/libglvnd[X?]
-	>=media-libs/freetype-2.10.1
-	media-libs/harfbuzz:=
-	>=media-libs/libass-0.13.4:=
-	media-libs/mesa[egl(+),gbm(+)?,wayland?,X?]
-	>=media-libs/taglib-1.9.0
-	sci-libs/kissfft
-	virtual/libiconv
-	virtual/ttf-fonts
-	x11-libs/libdrm
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	')
-	airplay? (
-		>=app-pda/libplist-2.0.0:=
-		net-libs/shairplay
-	)
-	alsa? (
-		>=media-libs/alsa-lib-1.1.4.1
-	)
-	bluetooth? (
-		net-wireless/bluez:=
-	)
-	bluray? (
-		>=media-libs/libbluray-1.1.2:=
-	)
-	caps? (
-		sys-libs/libcap
-	)
-	cec? (
-		>=dev-libs/libcec-4.0[-cubox]
-	)
-	dbus? (
-		sys-apps/dbus
-	)
-	gbm? (
-		>=dev-libs/libinput-1.10.5:=
-		x11-libs/libxkbcommon
-	)
-	gles? (
-		!raspberry-pi? (
-			|| (
-				>=media-libs/mesa-24.1.0_rc1[opengl]
-				<media-libs/mesa-24.1.0_rc1[gles2]
-			)
-		)
-	)
-	!gles? (
-		media-libs/glu
-	)
-	lcms? (
-		>=media-libs/lcms-2.10:2
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lirc? (
-		app-misc/lirc
-	)
-	mariadb? (
-		dev-db/mariadb-connector-c:=
-	)
-	mysql? (
-		dev-db/mysql-connector-c:=
-	)
-	nfs? (
-		>=net-fs/libnfs-2.0.0:=
-	)
-	pipewire? (
-		>=media-video/pipewire-0.3.24:=
-	)
-	pulseaudio? (
-		media-libs/libpulse
-	)
-	raspberry-pi? (
-		|| (
-			media-libs/raspberrypi-userland
-			media-libs/raspberrypi-userland-bin
-			>=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4]
-			<media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4]
-		)
-	)
-	samba? (
-		>=net-fs/samba-3.4.6[smbclient(+)]
-	)
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc,vaapi?,vdpau?,X?]
-		=media-video/ffmpeg-4*[openssl]
-	)
-	!system-ffmpeg? (
-		app-arch/bzip2
-		media-libs/dav1d:=
-	)
-	udf? (
-		>=dev-libs/libudfread-1.0.0
-	)
-	udev? (
-		virtual/libudev:=
-	)
-	vaapi? (
-		media-libs/libva:=[wayland?,X?]
-	)
-	vdpau? (
-		|| (
-			>=x11-libs/libvdpau-1.1
-			>=x11-drivers/nvidia-drivers-180.51
-		)
-	)
-	wayland? (
-		>=x11-libs/libxkbcommon-0.4.1[wayland]
-	)
-	webserver? (
-		>=net-libs/libmicrohttpd-0.9.55:=[messages(+)]
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-	)
-	xslt? (
-		dev-libs/libxslt
-		>=dev-libs/libxml2-2.9.4
-	)
-	zeroconf? (
-		net-dns/avahi[dbus]
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	${COMMON_TARGET_DEPEND}
-"
-DEPEND="
-	${COMMON_DEPEND}
-	${COMMON_TARGET_DEPEND}
-	dev-libs/rapidjson
-	test? (
-		>=dev-cpp/gtest-1.10.0
-	)
-	wayland? (
-		>=dev-libs/wayland-protocols-1.7
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXrender
-	)
-"
-# <dev-lang/swig-4.2.0 https://github.com/xbmc/xbmc/issues/24385
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-build/cmake
-	<dev-lang/swig-4.2.0
-	virtual/pkgconfig
-	<=virtual/jre-17:*
-	doc? (
-		app-text/doxygen
-	)
-"
-
-# bug #544020
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-PATCHES=(
-	"${FILESDIR}"/kodi-20.2-binutils-2.41.patch
-	"${FILESDIR}"/kodi-20.3-gcc-14.patch
-)
-
-pkg_setup() {
-	check_extra_config
-	java-pkg-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		unpack ${MY_P}.tar.gz
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/platform/linux/*.cpp || die
-
-	# Add all possible names for kissfft libraries
-	for datatype in {float,int16,int32,simd}; do
-		sed -i \
-			-e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \
-			cmake/modules/FindKissFFT.cmake || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev # less noise
-
-		-DAPP_RENDER_SYSTEM=$(usex gles gles gl)
-		-DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11)
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_TESTING=$(usex test)
-		-DVERBOSE=ON
-
-		# Enforce use of configured python interpeter
-		-DPYTHON_PATH=$(python_get_library_path)
-		-DPYTHON_VER=${EPYTHON##python} # wont work for pypy
-
-		# Toolchain
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CLANGFORMAT=OFF
-		-DENABLE_CLANGTIDY=OFF
-		-DENABLE_CPPCHECK=OFF
-		-DENABLE_INCLUDEWHATYOUUSE=OFF
-		# https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_GOLD=OFF
-		-DENABLE_LLD=OFF
-		-DENABLE_MOLD=OFF
-		-DUSE_LTO=OFF
-
-		# Features
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
-		-DENABLE_ISO9660PP=$(usex optical)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MDNS=OFF # used only on Android
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGL=$(usex !gles)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPTICAL=$(usex optical)
-		-DENABLE_PIPEWIRE=$(usex pipewire)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SNDIO=OFF
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UDFREAD=$(usex udf)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-
-		#To bundle or not
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_DAV1D=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FLATBUFFERS=OFF
-		-DENABLE_INTERNAL_FMT=OFF
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_KISSFFT=OFF
-		-DENABLE_INTERNAL_PCRE=OFF
-		-DENABLE_INTERNAL_RapidJSON=OFF
-		-DENABLE_INTERNAL_SPDLOG=OFF
-		-DENABLE_INTERNAL_TAGLIB=OFF
-		-DENABLE_INTERNAL_UDFREAD=OFF
-
-		-DWITH_FFMPEG=$(usex system-ffmpeg)
-
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-	)
-
-	# Separated to avoid "Manually-specified variables were not used by the project:"
-	use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" )
-	use !system-ffmpeg && mycmakeargs+=(
-		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz"
-	)
-	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
-	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
-
-	for flag in ${CPU_FLAGS[@]} ; do
-		local name=${flag#cpu_flags_*_}
-		mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) )
-	done
-
-	if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then
-		# Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
-		append-cflags -DNDEBUG
-		append-cxxflags -DNDEBUG
-	fi
-
-	# Violates ODR (bug #860984) and USE_LTO does spooky stuff
-	# https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e
-	filter-lto
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-	use doc && cmake_build doc
-	use test && cmake_build kodi-test
-}
-
-src_test() {
-	local -x CMAKE_SKIP_TESTS=(
-		# Known failing, unreliable test
-		# bug #743938
-		TestCPUInfo.GetCPUFrequency
-		# Test failure stemming from sci-libs/kissfft
-		# The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i]
-		# evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08.
-		TestRFFT.SimpleSignal
-		# bug #779184
-		# https://github.com/xbmc/xbmc/issues/18594
-		$(usev x86 TestDateTime.SetFromDBTime)
-	)
-
-	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
-	local -x KODI_HOME="${BUILD_DIR}"
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# bug #457588
-	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	if use !eventclients ; then
-		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
-		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
-		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
-		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
-	fi
-
-	python_optimize "${D}$(python_get_sitedir)"
-
-	einstalldocs
-	use doc && dodoc -r "${S}"/docs/html/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use dbus ; then
-		optfeature "getting battery level and active power source" sys-power/upower
-		optfeature "control of shutdown, reboot, suspend, and hibernate" sys-auth/elogind sys-apps/systemd
-		optfeature "storage management support (automounting, volume monitoring, etc)" sys-fs/udisks:2
-	fi
-}
diff --git a/media-tv/kodi/kodi-21.1.ebuild b/media-tv/kodi/kodi-21.1.ebuild
index 09ed7be38e5e..36837851624c 100644
--- a/media-tv/kodi/kodi-21.1.ebuild
+++ b/media-tv/kodi/kodi-21.1.ebuild
@@ -67,7 +67,7 @@ else
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
@@ -278,6 +278,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch
 	"${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch
+	"${FILESDIR}"/kodi-21.1-fix-gcc15.patch
 )
 
 # bug #544020
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1240046e6e88..3b81db4993a1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 55d9403432dd..e7ee318b0283 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,4 @@
 DIST mpv-0.38.0.tar.gz 3419741 BLAKE2B 3ff59d30bc305394f58a1fff4f24540aa3be9412bc3cad27bec0c3478f4b7c13190e26847f38edc52996bb9f9a36dd6832c6fccebd6d873058acf78a320e42e4 SHA512 b5b2af59039ef4711814f94bbdfedb37f8ce914301670e42d4ed05fe1900025a3d3a2f3d5e69628a8aad115a647a27c386718959e2df1a18740468b3a84f8975
 EBUILD mpv-0.38.0-r1.ebuild 6969 BLAKE2B 9e612ecd1738284c89e1ca1d15767bc6894d600c2a56b56a91d3079ba37a89ad0cede33800ae6446c0babf91597ee33f7d69f462162b8ff852fb8359e432953f SHA512 a2fbb84e9ec8a0108201e6b63c520b7a7d4ff245a293588dee452b275fdaa0c55d4295c9098b44da03aa7c33a97165c687dffbc4a533738e9954bce6b36f360c
-EBUILD mpv-9999.ebuild 6974 BLAKE2B d1d925b0f816c1398d448505c4425c2a1054cf129aa4125d163c16a52b0add1786e4b17a617f0026bedce2494b2157f0d11bc58c6eac9e5898124d359c6ce994 SHA512 c3e0318f9e8531e36e4155e495e15b3f7fbd9c61d72a0b4dfc6300a60d91e782e335a8bcedc9572e8ad232df52d9a6e860dce1056e13ee4571720ac7fe3bd20f
+EBUILD mpv-9999.ebuild 6974 BLAKE2B 9802cfb8d945fdc10cb02bbf612552b85530a845b423ea1b82964af182ae3082087185bcbe7652329843cd383ed39ee759478f8c87f4fd188feb12400651ed96 SHA512 f76e586a9084cdd5b5840bd716c3e8273d1541955eaf253882dd418088df23ca393a257794eafbcea215f1d9cd34762dc7b0e0f50789e35c333bbe1bdf954022
 MISC metadata.xml 2053 BLAKE2B dc35c3bcdb29eb08725a4f908575ecc2afed2d772988ff12ad052c39e9b195a68611e8037b82ee5ceefc33c40d8df666e03aa59d836eeb7c6472bd988f49b4ee SHA512 4e7cd2da4df81f9ecafddfe93788cabbc4f0de0ff9b976af2ab3fb0f63b2d7daee6d8c5607685240f41be37a158b9fa0acd030d8c62da835891d19af3870668c
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 31b23432e18e..2ddeff6f6a3a 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -46,7 +46,7 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	media-libs/libass:=[fontconfig]
-	>=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?]
+	>=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?]
 	>=media-video/ffmpeg-6.1:=[encode,soc(-)?,threads,vaapi?,vdpau?]
 	X? (
 		x11-libs/libX11
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e2b48b3255d3..64a19d623241 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4b557d38f46b..7040f602c54b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Sep 2024 11:12:19 +0000
+Sun, 15 Sep 2024 10:10:29 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c03da9fa43ce..ac87ec504cf4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 585357 BLAKE2B 90b484a7cfadba26e75b941b109643027b5530ea0e0da6565b28a1492ef9b8c6cfc7254e54f18ef93a17f476c8c87b2c8309fbac1afa85d144cc4d664931e811 SHA512 f5bbc1b0b0163958f91ecc02b4f0422622112ac5c642a105fef46e39550fd8622a03abd647b830a766a072ad993d41863d2d1d5ca05368f5af8d868f03aaeae4
-TIMESTAMP 2024-09-14T11:12:23Z
+TIMESTAMP 2024-09-15T10:10:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmblb5dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmbmsptfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDzTg/9G7B/AsSQMHDm6CxY7Kqu610SWx5aGoLGNYeG5vsNga5M0mxgDWHhBxF+
-UqmesAhrVLEkyHOiRX8QDRIqxYSi4GNPySWhBxXJyEZaOxbSt1w4Ym4FeMDf8IbF
-nfBy3Dz8muJYGU+rAHuhrNcrw8kF48Q48VHV5s8sWXsAN5MJvuM/4H7+mUH7gteA
-gcSA7tpiwZg4cj+Rq5mz3XNleD+A59C+PtabECkKLhD4mI3TPzYSsJA0C1BECGWd
-QxLF0Bng8L1AEhdrcu+Mvef9bN6UXErSxkzLUW2VLsNSQKn/OUDuMJxw6ShvYFKe
-BvWbMe6258FQ7JHbldyuSohqzGmhjW12nQsVxaydOD9zO89WT0E0gshSpDqLnjm/
-WEGqWWyeo+HqQZ0jkD5C410EeDMtOhW/WJA7Bn7NY9P6KE+66YPIpVCquqo/J+WH
-Wzu28L74eg2M3lriyVBnlGPf/QPBwYsj56hHbNMkUTNw/3b7ILrHAhsAC4Mpkz9R
-4mT4LQaUqPRdRSLtzwo5diDkiwpfLFTvC0hiaicX/NsX6d++l5uPUSYLwtF+ctXe
-RVKoohKjLGcSgKRV9nZlFtBeGMJpGQ9cZyOjXoYDIZDURCCmJiTEmaiDbcXkQL0b
-UERV15hhBl7lroADuy3ci8/C4Lb5UiFNozPa5c+TrWW49fJ9W8U=
-=6x91
+klABFA//fLdJjzcstAt2uTJ0Cz2JH1+M3txVLAeFNoTbCqVykyBEWiz4s4vNPbWL
+wmZrlzzFu5ostj+bF4aUr84YtF+GSKCfK0tWnMcxhSd4x4Y/3e56NsbdSEc19BoX
+H4YupgKtmQZAN67OBV6SBIjAh6fUVIfaIw595ojPVqGQFn2SUVc+0+uMfUwOz3Z5
+bBPKfkkfl4LQIGI/VwE9XJm0ngldtKlJbIxVVdTPH8QmPG1xK+RCxfnwdMQ/gZbc
+3xckqWEF2/kMO9Q+ksrWJHarQUTzKQJLya1PQr3CWR8YUb+DmGewj7h4dpABHIcS
+VoT7z04E48SAi/2VU3z6cvQoMMepl6UQODuX6Wara4X+M/I4UWtD5k23FxP7pikH
+XXguafeA+Nor8fw8jjmHqxpTWlIH6KHu3cKald+80aLgtv+UmFJBv4FwrrVPNACk
+cvRh1o31b//NDXaBg6KhGE4OqULtzWBH/JMICmaasBY9PwOAilgIYsyX3PAhNkx0
+X3akpGFX2ub1VYJnejDUNT0XFnl6TZ6TUqwr+NGD7wNOifdziBx0nR7ChW6HTwkx
+VjJJ/5fCcCyCNvoK/rXL0nFnNGnzp84UXQUh3TMsEydg/NLsGFPdBLqRww7aJDmo
+mL8YFdkI6AY2yueWs/JcpzFFneeuuoq+IKLn8etD0IH/o01kfTI=
+=lItz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d7693a8fec37..1cc56e07b69b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Sep 2024 11:12:20 +0000
+Sun, 15 Sep 2024 10:10:30 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ae57d64a53c9..985490923815 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 7519ad34fb5b..db5853ea40b8 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.34.10 b/metadata/md5-cache/app-admin/awscli-1.34.10
index 41f204be5964..f34d8f8487c8 100644
--- a/metadata/md5-cache/app-admin/awscli-1.34.10
+++ b/metadata/md5-cache/app-admin/awscli-1.34.10
@@ -5,7 +5,7 @@ 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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.35.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !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 ) 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://github.com/aws/aws-cli/archive/1.34.10.tar.gz -> aws-cli-1.34.10.gh.tar.gz
 _eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=523a5319dd7acf0fb70fe6e7e0262753
+_md5_=4c08319f1d75593a4bcbbe88a72bb8fe
diff --git a/metadata/md5-cache/app-admin/awscli-1.34.15 b/metadata/md5-cache/app-admin/awscli-1.34.15
deleted file mode 100644
index be3271afbac5..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.34.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/botocore-1.35.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !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 ) 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/aws/aws-cli/archive/1.34.15.tar.gz -> aws-cli-1.34.15.gh.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=523a5319dd7acf0fb70fe6e7e0262753
diff --git a/metadata/md5-cache/app-admin/awscli-1.34.16 b/metadata/md5-cache/app-admin/awscli-1.34.16
deleted file mode 100644
index 11acc2399711..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.34.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/botocore-1.35.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !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 ) 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/aws/aws-cli/archive/1.34.16.tar.gz -> aws-cli-1.34.16.gh.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=523a5319dd7acf0fb70fe6e7e0262753
diff --git a/metadata/md5-cache/app-admin/awscli-1.34.17 b/metadata/md5-cache/app-admin/awscli-1.34.17
deleted file mode 100644
index 5d61bbfb63d2..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.34.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/botocore-1.35.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !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 ) 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/aws/aws-cli/archive/1.34.17.tar.gz -> aws-cli-1.34.17.gh.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=523a5319dd7acf0fb70fe6e7e0262753
diff --git a/metadata/md5-cache/app-admin/awscli-1.34.18 b/metadata/md5-cache/app-admin/awscli-1.34.18
deleted file mode 100644
index 7a96a0feb0e7..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.34.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/botocore-1.35.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !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 ) 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/aws/aws-cli/archive/1.34.18.tar.gz -> aws-cli-1.34.18.gh.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=523a5319dd7acf0fb70fe6e7e0262753
diff --git a/metadata/md5-cache/app-admin/awscli-1.34.5 b/metadata/md5-cache/app-admin/awscli-1.34.5
deleted file mode 100644
index 9a5d58bc68f3..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.34.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/botocore-1.35.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_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=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 python_targets_python3_13
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !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 ) 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/aws/aws-cli/archive/1.34.5.tar.gz -> aws-cli-1.34.5.gh.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4c08319f1d75593a4bcbbe88a72bb8fe
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 49ba50586797..8e4c7b4a1311 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/docker-pushrm-1.9.0 b/metadata/md5-cache/app-containers/docker-pushrm-1.9.0
new file mode 100644
index 000000000000..642dcb2fcbdb
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-pushrm-1.9.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Docker CLI plugin to update container repository documentation
+EAPI=8
+HOMEPAGE=https://github.com/docker/buildx
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-containers/docker-cli
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/christian-korneck/docker-pushrm/archive/refs/tags/v1.9.0.tar.gz -> docker-pushrm-1.9.0.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/docker-pushrm-1.9.0-deps.tar.xz
+_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=c6f402613024d52b8803f2c5c38e1f80
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.13 b/metadata/md5-cache/app-containers/earthly-0.8.13
deleted file mode 100644
index ebe3d1e5d094..000000000000
--- a/metadata/md5-cache/app-containers/earthly-0.8.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Build automation tool that executes in containers
-EAPI=8
-HOMEPAGE=https://earthly.dev/ https://github.com/earthly/earthly/
-INHERIT=go-module
-KEYWORDS=amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=|| ( app-containers/docker app-containers/podman )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/earthly/earthly/archive/v0.8.13.tar.gz -> earthly-0.8.13.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.13-deps.tar.xz
-_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=dd9cad8c1f50076e27ec65a200235f51
diff --git a/metadata/md5-cache/app-containers/earthly-0.8.14 b/metadata/md5-cache/app-containers/earthly-0.8.14
deleted file mode 100644
index fe8e88f146bf..000000000000
--- a/metadata/md5-cache/app-containers/earthly-0.8.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Build automation tool that executes in containers
-EAPI=8
-HOMEPAGE=https://earthly.dev/ https://github.com/earthly/earthly/
-INHERIT=go-module
-KEYWORDS=amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=|| ( app-containers/docker app-containers/podman )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/earthly/earthly/archive/v0.8.14.tar.gz -> earthly-0.8.14.tar.gz https://dev.gentoo.org/~xgqt/distfiles/deps/earthly-0.8.14-deps.tar.xz
-_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	go-env	90efbc8636d2f02d9654183330e84cf7	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=2d4e9833b476ccbf68357027b7b4d863
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 6c85477fd464..73f6eafb5be2 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/okteta-0.26.17 b/metadata/md5-cache/app-editors/okteta-0.26.17
index d04b9c4bdc8b..fd47fe84725e 100644
--- a/metadata/md5-cache/app-editors/okteta-0.26.17
+++ b/metadata/md5-cache/app-editors/okteta-0.26.17
@@ -7,11 +7,11 @@ HOMEPAGE=https://apps.kde.org/okteta/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org
 IUSE=crypt test debug designer +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtscript-5.15.5:5[scripttools] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kbookmarks-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcodecs-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kjobwidgets-5.92.0:5 >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/kparts-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/okteta/0.26.17/src/okteta-0.26.17.tar.xz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	ecm	fe5d0f686a62c5a29db9433ce94c2e31	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kde.org	5b717883256e9841ce52e6cad2fca427	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a83c1cd06d46513d5c1f4e3140a600ec
+_md5_=716623165770052a83ea177637f020a1
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index bcfe58b38fdf..c9f1849950a8 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/orderless-1.2 b/metadata/md5-cache/app-emacs/orderless-1.2
index b509994ca1bb..307bc3e91050 100644
--- a/metadata/md5-cache/app-emacs/orderless-1.2
+++ b/metadata/md5-cache/app-emacs/orderless-1.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/texinfo >=app-editors/emacs-26:*
+BDEPEND=>=app-emacs/compat-30.0.0.0 sys-apps/texinfo >=app-editors/emacs-27.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Completion style that matches multiple regexps in any order
 EAPI=8
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/oantolin/orderless
 INHERIT=readme.gentoo-r1 elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=app-editors/emacs-26:*
+RDEPEND=>=app-emacs/compat-30.0.0.0 >=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/oantolin/orderless/archive/refs/tags/1.2.tar.gz -> orderless-1.2.tar.gz
 _eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	abb2dda42f680fce87602c8273f832c7	readme.gentoo-r1	32b48460d813533d85f082897cec1b80
-_md5_=7bb65326074707fe8c93931fe8198a1d
+_md5_=f3751b6b143246e97cfc7ed4e75e33c3
diff --git a/metadata/md5-cache/app-emacs/plz-0.9.1 b/metadata/md5-cache/app-emacs/plz-0.9.1
index a7fa201ff058..164b8bbf011c 100644
--- a/metadata/md5-cache/app-emacs/plz-0.9.1
+++ b/metadata/md5-cache/app-emacs/plz-0.9.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/alphapapa/plz.el/archive/v0.9.1.tar.gz -> plz-0.9.1.tar.gz
 _eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	abb2dda42f680fce87602c8273f832c7
-_md5_=9d83babe4e0c53509dd5c8aa9392bf73
+_md5_=fad1f27fe39c39b0f58b115fee768bdd
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 18a46fba0144..b21b4e825824 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-m17n-1.4.32 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.32
new file mode 100644
index 000000000000..e6a1610cd22f
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.32
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl )
+DESCRIPTION=M17N engine for IBus
+EAPI=8
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils xdg
+IUSE=gtk nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
+SLOT=0
+SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.32/ibus-m17n-1.4.32.tar.gz
+_eclasses_=gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=dbe892d8cb776cafd1bb4bf612836ff6
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.17.8 b/metadata/md5-cache/app-i18n/ibus-table-1.17.8
new file mode 100644
index 000000000000..9e967c2a13b2
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.17.8
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite(+)] ) 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(-)] ) virtual/libiconv nls? ( virtual/libintl )
+DESCRIPTION=Tables engines for IBus
+EAPI=8
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils python-single-r1 xdg
+IUSE=nls python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite(+)] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite(+)] ) 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(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.17.8/ibus-table-1.17.8.tar.gz
+_eclasses_=gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=5c8471a9f24fdf86477d2885b6f281e6
diff --git a/metadata/md5-cache/app-i18n/unicode-data-16.0.0 b/metadata/md5-cache/app-i18n/unicode-data-16.0.0
new file mode 100644
index 000000000000..0ab49d5e1ffb
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/unicode-data-16.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Unicode data from unicode.org
+EAPI=8
+HOMEPAGE=https://unicode.org/ucd/
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=unicode
+SLOT=0
+SRC_URI=https://unicode.org/Public/zipped/16.0.0/UCD.zip -> unicode-data-16.0.0-UCD.zip https://unicode.org/Public/zipped/16.0.0/Unihan.zip -> unicode-data-16.0.0-Unihan.zip
+_md5_=3fc7ed13b1e31b90b53ca7b1fc61bceb
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-16.0 b/metadata/md5-cache/app-i18n/unicode-emoji-16.0
new file mode 100644
index 000000000000..d8ac1a796fca
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/unicode-emoji-16.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=UTS #51 Unicode Emoji
+EAPI=8
+HOMEPAGE=https://unicode.org/emoji/techindex.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=unicode
+SLOT=0
+SRC_URI=https://unicode.org/Public/emoji/16.0/emoji-sequences.txt -> unicode-emoji-sequences-16.0.txt https://unicode.org/Public/emoji/16.0/emoji-test.txt -> unicode-emoji-test-16.0.txt https://unicode.org/Public/emoji/16.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-16.0.txt https://unicode.org/Public/16.0.0/ucd/emoji/emoji-data.txt -> unicode-emoji-data-16.0.txt https://unicode.org/Public/16.0.0/ucd/emoji/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-16.0.txt
+_md5_=e3c4f9e539318a216f73ba26135cc3b5
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index eea8f6002419..be8b534fd6a0 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/portpeek-3.2.4-r1 b/metadata/md5-cache/app-portage/portpeek-3.2.4-r1
index 427cc641cec2..e8f0e173d8bc 100644
--- a/metadata/md5-cache/app-portage/portpeek-3.2.4-r1
+++ b/metadata/md5-cache/app-portage/portpeek-3.2.4-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mpagano/portpeek
 INHERIT=python-r1
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 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 ) >=app-portage/gentoolkit-0.6.7 || ( >=sys-apps/portage-3.0.65-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 SLOT=0
 SRC_URI=https://github.com/mpagano/portpeek/releases/download/v3.2.4/portpeek-3.2.4.tar.gz
 _eclasses_=multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=eb7cc576530466d8994653be5f4161cb
+_md5_=9eaf7fa42e0e5e2b5908dfa8ff7ab9b9
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index ef09aa0e5d96..1b1f66df370e 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/yash-2.56.1 b/metadata/md5-cache/app-shells/yash-2.56.1
deleted file mode 100644
index 28e2d10ff543..000000000000
--- a/metadata/md5-cache/app-shells/yash-2.56.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) test? ( sys-apps/ed )
-DEFINED_PHASES=configure
-DEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
-DESCRIPTION=Yash is a POSIX-compliant command line shell
-EAPI=8
-HOMEPAGE=https://magicant.github.io/yash/
-INHERIT=flag-o-matic plocale toolchain-funcs
-IUSE=nls test
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/magicant/yash/releases/download/2.56.1/yash-2.56.1.tar.xz
-_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=38d050903affab83b2ecac186fa0462c
diff --git a/metadata/md5-cache/app-shells/yash-2.57 b/metadata/md5-cache/app-shells/yash-2.57
index 228b5a10e075..a0132d59c799 100644
--- a/metadata/md5-cache/app-shells/yash-2.57
+++ b/metadata/md5-cache/app-shells/yash-2.57
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://magicant.github.io/yash/
 INHERIT=flag-o-matic plocale toolchain-funcs
 IUSE=nls test
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/magicant/yash/releases/download/2.57/yash-2.57.tar.xz
 _eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4880bd8e57d03bb3aba6192ac825a806
+_md5_=38d050903affab83b2ecac186fa0462c
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 79a8214076fd..1018eb545686 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/m17n-db-1.8.0 b/metadata/md5-cache/dev-db/m17n-db-1.8.0
deleted file mode 100644
index 70426eea3afd..000000000000
--- a/metadata/md5-cache/dev-db/m17n-db-1.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install unpack
-DESCRIPTION=Database for the m17n library
-EAPI=8
-HOMEPAGE=https://www.nongnu.org/m17n/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=virtual/libintl
-SLOT=0
-SRC_URI=mirror://nongnu/m17n/m17n-db-1.8.0.tar.gz elibc_musl? ( mirror://gnu/glibc/glibc-2.39.tar.xz )
-_md5_=1936b586849ba946fcb8c8dbba71ecc9
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 9eb5f8f66d6b..d69342794d0b 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1 b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
deleted file mode 100644
index 79961aababc8..000000000000
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/c3p0:0 <dev-java/protobuf-java-3.26.0:0 dev-java/slf4j-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=JDBC Type 4 driver for MySQL
-EAPI=8
-HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~ppc64 ~x86
-LICENSE=GPL-2-with-MySQL-FLOSS-exception
-RDEPEND=dev-java/c3p0:0 <dev-java/protobuf-java-3.26.0:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.1.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/2.47.0/oci-java-sdk-common-2.47.0.jar
-_eclasses_=java-pkg-2	72587187cd548a5dcdb6a13453a3614d	java-pkg-simple	8221818a4df90800de803a44fd0875b4	java-utils-2	505f237da61d30569dcc6d5df8c51262
-_md5_=1ff9635e70772fbf9e0c0b6d103a25ab
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.23.3 b/metadata/md5-cache/dev-java/protobuf-java-3.23.3
deleted file mode 100644
index 85226a0dd800..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.23.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-protoc? ( ~dev-libs/protobuf-23.3:0 ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Core Protocol Buffers library
-EAPI=8
-HOMEPAGE=https://protobuf.dev
-INHERIT=java-pkg-2 java-pkg-simple cmake
-IUSE=system-protoc doc source test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.3.tar.gz -> protobuf-23.3.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	java-pkg-2	72587187cd548a5dcdb6a13453a3614d	java-pkg-simple	8221818a4df90800de803a44fd0875b4	java-utils-2	505f237da61d30569dcc6d5df8c51262	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a30ac81f522fb91dfe089749bf780dea
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.23.4 b/metadata/md5-cache/dev-java/protobuf-java-3.23.4
deleted file mode 100644
index f5db3562ccb0..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.23.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-protoc? ( ~dev-libs/protobuf-23.4:0 ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230125.3 <dev-cpp/abseil-cpp-20240116.2 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Core Protocol Buffers library
-EAPI=8
-HOMEPAGE=https://protobuf.dev
-INHERIT=java-pkg-2 java-pkg-simple cmake
-IUSE=system-protoc doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v23.4.tar.gz -> protobuf-23.4.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	java-pkg-2	72587187cd548a5dcdb6a13453a3614d	java-pkg-simple	8221818a4df90800de803a44fd0875b4	java-utils-2	505f237da61d30569dcc6d5df8c51262	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=22f9d433f55aadbc5055ef2730c70cbf
diff --git a/metadata/md5-cache/dev-java/protobuf-java-4.26.1 b/metadata/md5-cache/dev-java/protobuf-java-4.26.1
deleted file mode 100644
index 8c53e5f9b402..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-4.26.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-protoc? ( ~dev-libs/protobuf-26.1:0 ) !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Core Protocol Buffers library
-EAPI=8
-HOMEPAGE=https://protobuf.dev
-INHERIT=java-pkg-2 java-pkg-simple cmake
-IUSE=system-protoc doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v26.1.tar.gz -> protobuf-26.1.tar.gz test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	java-pkg-2	72587187cd548a5dcdb6a13453a3614d	java-pkg-simple	8221818a4df90800de803a44fd0875b4	java-utils-2	505f237da61d30569dcc6d5df8c51262	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=4423f2aff8a2708cda7b9dda2f598462
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index da50ad5d530f..6d1ea6c6a043 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.81.0 b/metadata/md5-cache/dev-lang/rust-bin-1.81.0
index 80b9f000fdfe..80f2153c06f8 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.81.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.81.0
@@ -11,6 +11,6 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-releas
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 RESTRICT=strip
 SLOT=stable
-SRC_URI=abi_x86_32? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-i686-unknown-linux-gnu.tar.xz.asc ) ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.81.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) ppc? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ) ppc64? ( big-endian? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) ) !big-endian? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) ) riscv? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) ) s390? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) ) loong? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-loongarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-loongarch64-unknown-linux-gnu.tar.xz.asc ) ) ) rust-src? ( https://static.rust-lang.org/dist/2024-09-05/rust-src-1.81.0.tar.xz )
+SRC_URI=abi_x86_32? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-i686-unknown-linux-gnu.tar.xz.asc ) ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.81.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) ppc? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ) ppc64? ( big-endian? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) ) !big-endian? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) ) riscv? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) ) s390? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) ) loong? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.81.0-loongarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.81.0-loongarch64-unknown-linux-gnu.tar.xz.asc ) ) ) rust-src? ( https://static.rust-lang.org/dist/2024-09-05/rust-src-1.81.0.tar.xz ) sparc? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-sparc64-unknown-linux-gnu.tar.xz ) mips? ( abi_mips_o32? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-mips-unknown-linux-gnu.tar.xz ) !big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-mipsel-unknown-linux-gnu.tar.xz ) ) abi_mips_n64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-mips64-unknown-linux-gnuabi64.tar.xz ) !big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-mips64el-unknown-linux-gnuabi64.tar.xz ) ) ) riscv? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-riscv64gc-unknown-linux-musl.tar.xz ) ) ppc64? ( elibc_musl? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-powerpc64-unknown-linux-musl.tar.xz ) !big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-lang/rust-bin/rust-1.81.0-powerpc64le-unknown-linux-musl.tar.xz ) ) )
 _eclasses_=multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multilib-build	8cdc28ee17e24f9f57730a28fe166a21	multilib-minimal	b93489cf816ff90770a3c1c61b25db44	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	prefix	629161311cdf29bf8596fdd036826a2c	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=84de6a4cbc73f3b819f164fc0b50264d
+_md5_=f607ecdae4c5842cc0a9f9942f0e7a46
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 066a08d5bad9..7401385cc4a8 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/m17n-lib-1.8.0-r1 b/metadata/md5-cache/dev-libs/m17n-lib-1.8.0-r1
deleted file mode 100644
index c7ab05032741..000000000000
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.8.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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-db/m17n-db-1.8.0 X? ( x11-libs/libX11 x11-libs/libXt athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
-DESCRIPTION=Multilingual Library for Unix/Linux
-EAPI=8
-HOMEPAGE=https://www.nongnu.org/m17n/
-INHERIT=autotools
-IUSE=X anthy athena bidi fontconfig gd libotf libxml2 spell xft
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=~dev-db/m17n-db-1.8.0 X? ( x11-libs/libX11 x11-libs/libXt athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
-SLOT=0
-SRC_URI=mirror://nongnu/m17n/m17n-lib-1.8.0.tar.gz
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9fb029ca1df0005599f7d69c2221edda
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-scala-0.23.2 b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.23.2
new file mode 100644
index 000000000000..4febaca1ed9c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-scala-0.23.2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-util/tree-sitter-cli )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Scala grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-scala
+INHERIT=tree-sitter-grammar
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-scala/archive/v0.23.2.tar.gz -> tree-sitter-scala-0.23.2.tar.gz
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	tree-sitter-grammar	0c372268818857dbb795d212ad120ea0
+_md5_=14b1bbc138ddc87402186692b73bce14
diff --git a/metadata/md5-cache/dev-python/Faker-27.0.0 b/metadata/md5-cache/dev-python/Faker-27.0.0
deleted file mode 100644
index 2882c887a219..000000000000
--- a/metadata/md5-cache/dev-python/Faker-27.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,tiff] dev-python/validators[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-ruby/faker >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-ruby/faker python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/faker-27.0.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=1e71978c1157af7339430b7477ddd380
diff --git a/metadata/md5-cache/dev-python/Faker-28.1.0 b/metadata/md5-cache/dev-python/Faker-28.1.0
index e953ff2da252..2236bd4539f9 100644
--- a/metadata/md5-cache/dev-python/Faker-28.1.0
+++ b/metadata/md5-cache/dev-python/Faker-28.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-ruby/faker python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/F/Faker/faker-28.1.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=68755e3d9fe3ca61edf7ea1febf8469c
+_md5_=1e71978c1157af7339430b7477ddd380
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0a86268e394b..0be21af5e26e 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/PyGithub-2.3.0 b/metadata/md5-cache/dev-python/PyGithub-2.3.0
deleted file mode 100644
index fc5cfab68f40..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-2.3.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/httpretty-1.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-subtests-0.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyjwt-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to access the Github API v3
-EAPI=8
-HOMEPAGE=https://github.com/PyGithub/PyGithub/ https://pypi.org/project/PyGithub/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyjwt-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/P/PyGithub/PyGithub-2.3.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=751eee7fb77d4b223dd89916a6128bf9
diff --git a/metadata/md5-cache/dev-python/PyGithub-2.4.0 b/metadata/md5-cache/dev-python/PyGithub-2.4.0
index ba4c3d6636c8..522d0aca2191 100644
--- a/metadata/md5-cache/dev-python/PyGithub-2.4.0
+++ b/metadata/md5-cache/dev-python/PyGithub-2.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyGithub/PyGithub/ https://pypi.org/project/PyGithub/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyjwt-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyGithub/pygithub-2.4.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=bf9c80a3e4564333751aa5a5641b484e
+_md5_=ce4d23f4ab252d69df1b5472e8ca869e
diff --git a/metadata/md5-cache/dev-python/asteval-1.0.4 b/metadata/md5-cache/dev-python/asteval-1.0.4
new file mode 100644
index 000000000000..4c84d3e6415b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asteval-1.0.4
@@ -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/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=Evaluator of Python expression using ast module
+EAPI=8
+HOMEPAGE=https://lmfit.github.io/asteval/ https://github.com/lmfit/asteval/ https://pypi.org/project/asteval/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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/lmfit/asteval/archive/1.0.4.tar.gz -> asteval-1.0.4.gh.tar.gz
+_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=c19f7c168fdc89dd94bd9dbda4a242d0
diff --git a/metadata/md5-cache/dev-python/boto3-1.35.10 b/metadata/md5-cache/dev-python/boto3-1.35.10
index ac119c1602e7..b383045a7477 100644
--- a/metadata/md5-cache/dev-python/boto3-1.35.10
+++ b/metadata/md5-cache/dev-python/boto3-1.35.10
@@ -5,7 +5,7 @@ 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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.35.10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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://github.com/boto/boto3/archive/1.35.10.tar.gz -> boto3-1.35.10.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f09e0d35add8cb8fb6f611c7c3edd5b2
+_md5_=0cac3e4c2f0dd1a312c84ecb56c6a2f0
diff --git a/metadata/md5-cache/dev-python/boto3-1.35.15 b/metadata/md5-cache/dev-python/boto3-1.35.15
deleted file mode 100644
index 48478c127717..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.35.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.35.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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/boto/boto3/archive/1.35.15.tar.gz -> boto3-1.35.15.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f09e0d35add8cb8fb6f611c7c3edd5b2
diff --git a/metadata/md5-cache/dev-python/boto3-1.35.16 b/metadata/md5-cache/dev-python/boto3-1.35.16
deleted file mode 100644
index 6cddd4689153..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.35.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.35.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.16[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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/boto/boto3/archive/1.35.16.tar.gz -> boto3-1.35.16.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f09e0d35add8cb8fb6f611c7c3edd5b2
diff --git a/metadata/md5-cache/dev-python/boto3-1.35.17 b/metadata/md5-cache/dev-python/boto3-1.35.17
deleted file mode 100644
index aafb99a0533c..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.35.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.35.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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/boto/boto3/archive/1.35.17.tar.gz -> boto3-1.35.17.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f09e0d35add8cb8fb6f611c7c3edd5b2
diff --git a/metadata/md5-cache/dev-python/boto3-1.35.18 b/metadata/md5-cache/dev-python/boto3-1.35.18
deleted file mode 100644
index 27a1981042ad..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.35.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.35.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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/boto/boto3/archive/1.35.18.tar.gz -> boto3-1.35.18.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f09e0d35add8cb8fb6f611c7c3edd5b2
diff --git a/metadata/md5-cache/dev-python/boto3-1.35.5 b/metadata/md5-cache/dev-python/boto3-1.35.5
deleted file mode 100644
index c1fb61797343..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.35.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.35.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.35.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/s3transfer-0.10.0[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/boto/boto3/archive/1.35.5.tar.gz -> boto3-1.35.5.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=0cac3e4c2f0dd1a312c84ecb56c6a2f0
diff --git a/metadata/md5-cache/dev-python/botocore-1.35.10 b/metadata/md5-cache/dev-python/botocore-1.35.10
index 2e8ffaf424ef..978c6e4c5ec7 100644
--- a/metadata/md5-cache/dev-python/botocore-1.35.10
+++ b/metadata/md5-cache/dev-python/botocore-1.35.10
@@ -5,7 +5,7 @@ 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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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://github.com/boto/botocore/archive/1.35.10.tar.gz -> botocore-1.35.10.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=00b59e8d9e15f94e08a4eaaf78424022
+_md5_=403ec05ac031ee12edebbc7e68d5f724
diff --git a/metadata/md5-cache/dev-python/botocore-1.35.15 b/metadata/md5-cache/dev-python/botocore-1.35.15
deleted file mode 100644
index f80c4faeb53d..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.35.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-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(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/boto/botocore/archive/1.35.15.tar.gz -> botocore-1.35.15.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=00b59e8d9e15f94e08a4eaaf78424022
diff --git a/metadata/md5-cache/dev-python/botocore-1.35.16 b/metadata/md5-cache/dev-python/botocore-1.35.16
deleted file mode 100644
index bd3022a15f0e..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.35.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-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(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/boto/botocore/archive/1.35.16.tar.gz -> botocore-1.35.16.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=00b59e8d9e15f94e08a4eaaf78424022
diff --git a/metadata/md5-cache/dev-python/botocore-1.35.17 b/metadata/md5-cache/dev-python/botocore-1.35.17
deleted file mode 100644
index 9e555049862d..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.35.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-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(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/boto/botocore/archive/1.35.17.tar.gz -> botocore-1.35.17.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=00b59e8d9e15f94e08a4eaaf78424022
diff --git a/metadata/md5-cache/dev-python/botocore-1.35.18 b/metadata/md5-cache/dev-python/botocore-1.35.18
deleted file mode 100644
index 38f447bb5964..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.35.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-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(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/boto/botocore/archive/1.35.18.tar.gz -> botocore-1.35.18.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=00b59e8d9e15f94e08a4eaaf78424022
diff --git a/metadata/md5-cache/dev-python/botocore-1.35.5 b/metadata/md5-cache/dev-python/botocore-1.35.5
deleted file mode 100644
index 3bffaf7c6d3a..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.35.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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(-)?] dev-python/pytest-xdist[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=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 python_targets_python3_13
-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(-)?,python_targets_python3_13(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/boto/botocore/archive/1.35.5.tar.gz -> botocore-1.35.5.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=403ec05ac031ee12edebbc7e68d5f724
diff --git a/metadata/md5-cache/dev-python/cfn-lint-1.10.3 b/metadata/md5-cache/dev-python/cfn-lint-1.10.3
deleted file mode 100644
index b8542bc8eeb2..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-1.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.0[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=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.89.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.0[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/cfn-lint/cfn_lint-1.10.3.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=c1cc4f1b2a8b1311eda0ff15c7d7d032
diff --git a/metadata/md5-cache/dev-python/cfn-lint-1.11.1 b/metadata/md5-cache/dev-python/cfn-lint-1.11.1
index 67d360eae069..24d36f31e4e8 100644
--- a/metadata/md5-cache/dev-python/cfn-lint-1.11.1
+++ b/metadata/md5-cache/dev-python/cfn-lint-1.11.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/aws-sam-translator-1.91.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jschema-to-python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/jsonschema-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/regex-2021.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sarif-om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sympy-1.0.0[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/c/cfn-lint/cfn_lint-1.11.1.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=fb0417c3310f85e722734477586e1a59
+_md5_=13fcab0509389d36fd3c8e1b0c13add9
diff --git a/metadata/md5-cache/dev-python/contourpy-1.3.0 b/metadata/md5-cache/dev-python/contourpy-1.3.0
index 508c5782b884..154322c6132e 100644
--- a/metadata/md5-cache/dev-python/contourpy-1.3.0
+++ b/metadata/md5-cache/dev-python/contourpy-1.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/contourpy/ https://github.com/contourpy/contourpy/
 INHERIT=distutils-r1
 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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.23[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://github.com/contourpy/contourpy/archive/v1.3.0.tar.gz -> contourpy-1.3.0.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	meson	99466844dd8d4fcfb07578a76f5a9922	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=ae007e8f26f6fbf796851adda1d093f7
+_md5_=2d61ebd3411aa921540233736438d91a
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.23.5 b/metadata/md5-cache/dev-python/fakeredis-2.23.5
deleted file mode 100644
index fc54cf003493..000000000000
--- a/metadata/md5-cache/dev-python/fakeredis-2.23.5
+++ /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.5.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4cf75adf476b36ad1d00b69e2aa091eb
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.24.0 b/metadata/md5-cache/dev-python/fakeredis-2.24.0
deleted file mode 100644
index eaf00ecf3456..000000000000
--- a/metadata/md5-cache/dev-python/fakeredis-2.24.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(-)?,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.24.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=514a9852bc166664dbe0f1eeecf092f3
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.24.1 b/metadata/md5-cache/dev-python/fakeredis-2.24.1
index a1a2a266c5d9..710024cc58d2 100644
--- a/metadata/md5-cache/dev-python/fakeredis-2.24.1
+++ b/metadata/md5-cache/dev-python/fakeredis-2.24.1
@@ -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.24.1.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=514a9852bc166664dbe0f1eeecf092f3
+_md5_=9fde9416bb09c60437573036174dcc29
diff --git a/metadata/md5-cache/dev-python/flask-cors-4.0.1 b/metadata/md5-cache/dev-python/flask-cors-4.0.1
deleted file mode 100644
index 211764da5a24..000000000000
--- a/metadata/md5-cache/dev-python/flask-cors-4.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/flask[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(-)?] ) doc? ( || ( ( dev-lang/python:3.13 >=dev-python/sphinx-7.2.6[python_targets_python3_13(-)] dev-python/sphinx-rtd-theme[python_targets_python3_13(-)] dev-python/sphinxcontrib-httpdomain[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] dev-python/sphinxcontrib-httpdomain[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/sphinxcontrib-httpdomain[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-httpdomain[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Flask extension for Cross Origin Resource Sharing (CORS)
-EAPI=8
-HOMEPAGE=https://github.com/corydolphin/flask-cors/ https://pypi.org/project/Flask-Cors/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/flask[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/corydolphin/flask-cors/archive/4.0.1.tar.gz -> flask-cors-4.0.1.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f03498ebecec04ff5bbd8b97c5ed46f6
diff --git a/metadata/md5-cache/dev-python/flask-cors-5.0.0 b/metadata/md5-cache/dev-python/flask-cors-5.0.0
index 48c1148e6951..dd7fca2b79cf 100644
--- a/metadata/md5-cache/dev-python/flask-cors-5.0.0
+++ b/metadata/md5-cache/dev-python/flask-cors-5.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/corydolphin/flask-cors/ https://pypi.org/project/Flask-Cors/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/flask[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://github.com/corydolphin/flask-cors/archive/5.0.0.tar.gz -> flask-cors-5.0.0.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=041955e699ed6a33a16f829bad3db50f
+_md5_=f03498ebecec04ff5bbd8b97c5ed46f6
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.19.1 b/metadata/md5-cache/dev-python/google-api-core-2.19.1
deleted file mode 100644
index 17e8ad8dc0e8..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-2.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/proto-plus-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/requests-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/namespace-google >=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=Core Library for Google Client Libraries
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/python-api-core/ https://pypi.org/project/google-api-core/ https://googleapis.dev/python/google-api-core/latest/index.html
-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=Apache-2.0
-RDEPEND=>=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/proto-plus-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/requests-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/namespace-google python_targets_python3_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/googleapis/python-api-core/archive/v2.19.1.tar.gz -> python-api-core-2.19.1.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=32df14ce10ce33ffc18267233390bc11
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.19.2 b/metadata/md5-cache/dev-python/google-api-core-2.19.2
index 2e7beafbdeb0..741c592c3958 100644
--- a/metadata/md5-cache/dev-python/google-api-core-2.19.2
+++ b/metadata/md5-cache/dev-python/google-api-core-2.19.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/python-api-core/ https://pypi.org/project/google-api-core/ https://googleapis.dev/python/google-api-core/latest/index.html
 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
+KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/proto-plus-1.22.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/requests-3[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://github.com/googleapis/python-api-core/archive/v2.19.2.tar.gz -> python-api-core-2.19.2.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4c8f417965cf768d5e2c1043fd144a9e
+_md5_=13a3075cc0ede079e5eca2a9eedb5d0f
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.142.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.142.0
deleted file mode 100644
index 97d89c63df72..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.142.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/uritemplate-5[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=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 python_targets_python3_13
-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(-)?,python_targets_python3_13(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/uritemplate-5[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/g/google-api-python-client/google_api_python_client-2.142.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=27e558da11e22e214723175aa4729c85
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.143.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.143.0
index 13eb0c7adc32..f83446de2b79 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.143.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.143.0
@@ -5,7 +5,7 @@ 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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm64 ~x86
+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(-)?,python_targets_python3_13(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/uritemplate-5[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/g/google-api-python-client/google_api_python_client-2.143.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=307c078207841dba25b99a46ac14d824
+_md5_=27e558da11e22e214723175aa4729c85
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.63.2-r1 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.63.2-r1
deleted file mode 100644
index bb9dcd369e06..000000000000
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.63.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=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=Python classes generated from the common protos in the googleapis repository
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/python-api-common-protos/ https://pypi.org/project/googleapis-common-protos/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/protobuf-python-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/namespace-google python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/g/googleapis-common-protos/googleapis-common-protos-1.63.2.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=aa7d11471cb36d000fc390cfb404ca7d
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.64.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.64.0
deleted file mode 100644
index c9c8a440368c..000000000000
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.64.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( <dev-python/protobuf-python-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/namespace-google >=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=Python classes generated from the common protos in the googleapis repository
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/python-api-common-protos/ https://pypi.org/project/googleapis-common-protos/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/protobuf-python-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/namespace-google python_targets_python3_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/g/googleapis-common-protos/googleapis_common_protos-1.64.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=31c0a0e057a6d88ce86c8fbe462bca70
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.65.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.65.0
index 9e92a80e39c2..2d6b85445307 100644
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.65.0
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.65.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/python-api-common-protos/ https://pypi.org/project/googleapis-common-protos/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/protobuf-python-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/protobuf-python-3.15.0[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/g/googleapis-common-protos/googleapis_common_protos-1.65.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=2cc1267b4504190a2fa0b6583ce33f13
+_md5_=388202742d8600d90e3957453d391f71
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.110.2 b/metadata/md5-cache/dev-python/hypothesis-6.110.2
deleted file mode 100644
index 548baf9d6d45..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.110.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.110.2.tar.gz -> hypothesis-6.110.2.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=0a4c2b5b26da514d68b513a7ae774ce5
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.111.1 b/metadata/md5-cache/dev-python/hypothesis-6.111.1
deleted file mode 100644
index 6d1071072e6f..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.111.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.111.1.tar.gz -> hypothesis-6.111.1.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=235689ca867cf0365a497e98312e2fea
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.111.2 b/metadata/md5-cache/dev-python/hypothesis-6.111.2
index 6f7b81ec0c15..6fc134ad20d9 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.111.2
+++ b/metadata/md5-cache/dev-python/hypothesis-6.111.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
 INHERIT=distutils-r1 optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.111.2.tar.gz -> hypothesis-6.111.2.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=235689ca867cf0365a497e98312e2fea
+_md5_=0a4c2b5b26da514d68b513a7ae774ce5
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.112.0 b/metadata/md5-cache/dev-python/hypothesis-6.112.0
deleted file mode 100644
index 13ccb2721965..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.112.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_pypy3? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/black[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) python_targets_python3_13? ( dev-lang/python:3.13[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.112.0.tar.gz -> hypothesis-6.112.0.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=235689ca867cf0365a497e98312e2fea
diff --git a/metadata/md5-cache/dev-python/identify-2.6.1 b/metadata/md5-cache/dev-python/identify-2.6.1
new file mode 100644
index 000000000000..218e93a4e8a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/identify-2.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ukkonen[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 identification library for Python
+EAPI=8
+HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
+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 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ukkonen[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/pre-commit/identify/archive/v2.6.1.tar.gz -> identify-2.6.1.gh.tar.gz
+_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=a7313a79946472baf18aae39ab787d95
diff --git a/metadata/md5-cache/dev-python/importlib-resources-6.4.3 b/metadata/md5-cache/dev-python/importlib-resources-6.4.3
deleted file mode 100644
index 7fa653217591..000000000000
--- a/metadata/md5-cache/dev-python/importlib-resources-6.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/jaraco-test-5.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zipp-3.17[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.4.4[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 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read resources from Python packages
-EAPI=8
-HOMEPAGE=https://github.com/python/importlib_resources/ https://pypi.org/project/importlib-resources/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib-resources/importlib_resources-6.4.3.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4b540c6df4c1575af229170262ba47a3
diff --git a/metadata/md5-cache/dev-python/importlib-resources-6.4.4 b/metadata/md5-cache/dev-python/importlib-resources-6.4.4
index b15facd478b4..5e627b4529c1 100644
--- a/metadata/md5-cache/dev-python/importlib-resources-6.4.4
+++ b/metadata/md5-cache/dev-python/importlib-resources-6.4.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python/importlib_resources/ https://pypi.org/project/importlib-resources/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib-resources/importlib_resources-6.4.4.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=c4157e5e608b775964eedf949e69a4a0
+_md5_=c42da7216e6210c4c10225349c8f9c86
diff --git a/metadata/md5-cache/dev-python/jsondiff-2.2.0 b/metadata/md5-cache/dev-python/jsondiff-2.2.0
deleted file mode 100644
index 371dc00e691a..000000000000
--- a/metadata/md5-cache/dev-python/jsondiff-2.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(-)?,python_targets_python3_13(-)?] test? ( dev-python/hypothesis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/pyyaml[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=Diff JSON and JSON-like structures in Python
-EAPI=8
-HOMEPAGE=https://github.com/xlwings/jsondiff/ https://pypi.org/project/jsondiff/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/pyyaml[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/xlwings/jsondiff/archive/2.2.0.tar.gz -> jsondiff-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=b283e479054edd913dcf8235933e9f39
diff --git a/metadata/md5-cache/dev-python/jsondiff-2.2.1 b/metadata/md5-cache/dev-python/jsondiff-2.2.1
index 3f8d1cb5e6fe..43b0e08a3d96 100644
--- a/metadata/md5-cache/dev-python/jsondiff-2.2.1
+++ b/metadata/md5-cache/dev-python/jsondiff-2.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/xlwings/jsondiff/ https://pypi.org/project/jsondiff/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/pyyaml[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://github.com/xlwings/jsondiff/archive/2.2.1.tar.gz -> jsondiff-2.2.1.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=1d9edca300b7e415ceae855fbeee309e
+_md5_=b283e479054edd913dcf8235933e9f39
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.2.4 b/metadata/md5-cache/dev-python/jupyterlab-4.2.4
deleted file mode 100644
index 45d070ff7b53..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab-4.2.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/hatch-jupyter-builder[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-console-scripts[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-cache[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/async-lru[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipykernel-6.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-40.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs >=dev-python/pytest-7.4.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=JupyterLab computational environment
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 pypi xdg
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
-LICENSE=BSD MIT GPL-3 Apache-2.0
-RDEPEND=dev-python/async-lru[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipykernel-6.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-40.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-4.2.4.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=53c44ba900db25fd1dea9f3fb1f6cc7b
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.2.5 b/metadata/md5-cache/dev-python/jupyterlab-4.2.5
index c1bf789783bd..6813015eebe2 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-4.2.5
+++ b/metadata/md5-cache/dev-python/jupyterlab-4.2.5
@@ -6,7 +6,7 @@ HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 pypi xdg
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=BSD MIT GPL-3 Apache-2.0
 RDEPEND=dev-python/async-lru[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/httpx-0.25.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/ipykernel-6.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jinja-3.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-core[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-40.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/tornado-6.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/traitlets[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] net-libs/nodejs python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-4.2.5.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=07fce29b6f2fd2361ea78dc1dbcd603e
+_md5_=53c44ba900db25fd1dea9f3fb1f6cc7b
diff --git a/metadata/md5-cache/dev-python/keystoneauth1-5.7.0 b/metadata/md5-cache/dev-python/keystoneauth1-5.7.0
deleted file mode 100644
index 96bfe40c0e18..000000000000
--- a/metadata/md5-cache/dev-python/keystoneauth1-5.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/betamax-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/lxml-4.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-kerberos-0.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/os-service-types-1.2.0[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=This package contains tools for authenticating to an OpenStack-based cloud
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/keystoneauth/ https://github.com/openstack/keystoneauth/ https://pypi.org/project/keystoneauth1/
-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 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/os-service-types-1.2.0[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/k/keystoneauth1/keystoneauth1-5.7.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=3b6d1e021f65940eb06b44853b6fa545
diff --git a/metadata/md5-cache/dev-python/keystoneauth1-5.8.0 b/metadata/md5-cache/dev-python/keystoneauth1-5.8.0
index 311bb135621c..5f51d150d21f 100644
--- a/metadata/md5-cache/dev-python/keystoneauth1-5.8.0
+++ b/metadata/md5-cache/dev-python/keystoneauth1-5.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/keystoneauth/ https://github.com/openstack/keystoneauth/ https://pypi.org/project/keystoneauth1/
 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 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/os-service-types-1.2.0[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/k/keystoneauth1/keystoneauth1-5.8.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9e49a9f92f0a33a446321ff893261cbf
+_md5_=3b6d1e021f65940eb06b44853b6fa545
diff --git a/metadata/md5-cache/dev-python/leechcorepyc-2.17.4 b/metadata/md5-cache/dev-python/leechcorepyc-2.17.4
deleted file mode 100644
index 41ac3d41ea72..000000000000
--- a/metadata/md5-cache/dev-python/leechcorepyc-2.17.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig python_targets_python3_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=virtual/libusb:= python_targets_python3_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 binding for LeechCore Physical Memory Acquisition Library
-EAPI=8
-HOMEPAGE=https://github.com/ufrisk/LeechCore
-INHERIT=distutils-r1 toolchain-funcs pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=virtual/libusb:= python_targets_python3_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/l/leechcorepyc/leechcorepyc-2.17.4.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4cbeb037198c28dd618fe88c66724b8e
diff --git a/metadata/md5-cache/dev-python/leechcorepyc-2.18.0 b/metadata/md5-cache/dev-python/leechcorepyc-2.18.0
deleted file mode 100644
index 61f62ed2e3c8..000000000000
--- a/metadata/md5-cache/dev-python/leechcorepyc-2.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig python_targets_python3_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=virtual/libusb:= python_targets_python3_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 binding for LeechCore Physical Memory Acquisition Library
-EAPI=8
-HOMEPAGE=https://github.com/ufrisk/LeechCore
-INHERIT=distutils-r1 toolchain-funcs pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=virtual/libusb:= python_targets_python3_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/l/leechcorepyc/leechcorepyc-2.18.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4cbeb037198c28dd618fe88c66724b8e
diff --git a/metadata/md5-cache/dev-python/leechcorepyc-2.18.7 b/metadata/md5-cache/dev-python/leechcorepyc-2.18.7
index 9b5d236e54ee..1b835b2a0f2d 100644
--- a/metadata/md5-cache/dev-python/leechcorepyc-2.18.7
+++ b/metadata/md5-cache/dev-python/leechcorepyc-2.18.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ufrisk/LeechCore
 INHERIT=distutils-r1 toolchain-funcs pypi
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=virtual/libusb:= python_targets_python3_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/l/leechcorepyc/leechcorepyc-2.18.7.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=87c8c47923a055d487ba7ce08e2e9a4d
+_md5_=4cbeb037198c28dd618fe88c66724b8e
diff --git a/metadata/md5-cache/dev-python/lxml-5.3.0 b/metadata/md5-cache/dev-python/lxml-5.3.0
index 63c7604c7194..7a18a53bfb71 100644
--- a/metadata/md5-cache/dev-python/lxml-5.3.0
+++ b/metadata/md5-cache/dev-python/lxml-5.3.0
@@ -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 ~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 ~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.3.0.tar.gz -> lxml-5.3.0.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=37dea335db918e6424da68a77c0672fa
+_md5_=2af8e3e7d98b6ae9b973b4b277224e64
diff --git a/metadata/md5-cache/dev-python/lxml-html-clean-0.2.0 b/metadata/md5-cache/dev-python/lxml-html-clean-0.2.0
deleted file mode 100644
index 9500589839d6..000000000000
--- a/metadata/md5-cache/dev-python/lxml-html-clean-0.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/lxml-5.2.0[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=Separate project for HTML cleaning functionalities copied from lxml.html.clean
-EAPI=8
-HOMEPAGE=https://pypi.org/project/lxml-html-clean/
-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
-LICENSE=BSD
-RDEPEND=>=dev-python/lxml-5.2.0[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/l/lxml-html-clean/lxml_html_clean-0.2.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=b01e3ce8bbe52a1ff9cc94ec01c283c6
diff --git a/metadata/md5-cache/dev-python/lxml-html-clean-0.2.2 b/metadata/md5-cache/dev-python/lxml-html-clean-0.2.2
index 40d659d1b3ff..ce694d539807 100644
--- a/metadata/md5-cache/dev-python/lxml-html-clean-0.2.2
+++ b/metadata/md5-cache/dev-python/lxml-html-clean-0.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fedora-python/lxml_html_clean/ https://pypi.org/project/lxml-html-clean/
 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
+KEYWORDS=amd64 ~arm64
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-5.2.0[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/l/lxml-html-clean/lxml_html_clean-0.2.2.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=704cba1902bab4a15c045d0685457d25
+_md5_=db3b418fd339637291264946f178b359
diff --git a/metadata/md5-cache/dev-python/mypy-1.11.1 b/metadata/md5-cache/dev-python/mypy-1.11.1
deleted file mode 100644
index d236741d4e5d..000000000000
--- a/metadata/md5-cache/dev-python/mypy-1.11.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=native-extensions? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) dev-python/types-psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/types-setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/attrs-18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/filelock-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/lxml-4.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( !dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-xdist[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
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-DESCRIPTION=Optional static typing for Python
-EAPI=8
-HOMEPAGE=https://www.mypy-lang.org/ https://github.com/python/mypy/ https://pypi.org/project/mypy/
-INHERIT=distutils-r1
-IUSE=+native-extensions test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=amd64 arm64 ~loong ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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/python/mypy/archive/v1.11.1.tar.gz -> mypy-1.11.1.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=85286fdaf46b84d6a7cd6b730779f611
diff --git a/metadata/md5-cache/dev-python/mypy-1.11.2 b/metadata/md5-cache/dev-python/mypy-1.11.2
index b96017f9f189..610dcbd39861 100644
--- a/metadata/md5-cache/dev-python/mypy-1.11.2
+++ b/metadata/md5-cache/dev-python/mypy-1.11.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mypy-lang.org/ https://github.com/python/mypy/ https://pypi.org/project/mypy/
 INHERIT=distutils-r1
 IUSE=+native-extensions test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/mypy_extensions-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( dev-python/tomli[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v1.11.2.tar.gz -> mypy-1.11.2.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=57d745aab2eadb3398518df3e130c003
+_md5_=85286fdaf46b84d6a7cd6b730779f611
diff --git a/metadata/md5-cache/dev-python/notebook-7.2.1 b/metadata/md5-cache/dev-python/notebook-7.2.1
deleted file mode 100644
index fceacc5ef5ab..000000000000
--- a/metadata/md5-cache/dev-python/notebook-7.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-jupyter-builder[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/ipykernel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/nbval[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-unixsocket[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-console-scripts[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-jupyter[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-4.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-4.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/notebook-shim-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2.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:=[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/hatchling-1.21.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=Jupyter Interactive Notebook
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/notebook/ https://pypi.org/project/notebook/
-INHERIT=distutils-r1 pypi xdg-utils
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-4.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-4.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/notebook-shim-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2.0[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/n/notebook/notebook-7.2.1.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a6234050e58669cfe2b9ebeb7ca152ff
diff --git a/metadata/md5-cache/dev-python/notebook-7.2.2 b/metadata/md5-cache/dev-python/notebook-7.2.2
index 2e843730ff13..771c543c85af 100644
--- a/metadata/md5-cache/dev-python/notebook-7.2.2
+++ b/metadata/md5-cache/dev-python/notebook-7.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/notebook/ https://pypi.org/project/notebook/
 INHERIT=distutils-r1 pypi xdg-utils
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter-server-2.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyter-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-4.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-4.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyterlab-server-2.27.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/jupyterlab-server-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/notebook-shim-0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/notebook-shim-0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2.0[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/notebook/notebook-7.2.2.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=63b84d35d48befbca3a27a411ea90391
+_md5_=a6234050e58669cfe2b9ebeb7ca152ff
diff --git a/metadata/md5-cache/dev-python/oslo-config-9.5.0 b/metadata/md5-cache/dev-python/oslo-config-9.5.0
deleted file mode 100644
index 50d20aa494fb..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-9.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-mock-1.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pbr-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.18.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] 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 ) 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=Oslo Configuration API
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/oslo.config/ https://github.com/openstack/oslo.config/ https://pypi.org/project/oslo.config/
-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 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.18.0[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/o/oslo.config/oslo.config-9.5.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=5ba8fa2e2443366628fec093e968edd2
diff --git a/metadata/md5-cache/dev-python/oslo-config-9.6.0 b/metadata/md5-cache/dev-python/oslo-config-9.6.0
index 9d87d284a72e..18eee99ff4a1 100644
--- a/metadata/md5-cache/dev-python/oslo-config-9.6.0
+++ b/metadata/md5-cache/dev-python/oslo-config-9.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/oslo.config/ https://github.com/openstack/oslo.config/ https://pypi.org/project/oslo.config/
 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 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.18.0[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/o/oslo.config/oslo.config-9.6.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=3d0c29aa7933fbad3a2e09beb6405781
+_md5_=004dfd876e867cd69827b0c2e32345dd
diff --git a/metadata/md5-cache/dev-python/paginate-0.5.6 b/metadata/md5-cache/dev-python/paginate-0.5.6
deleted file mode 100644
index 6d6988db4a36..000000000000
--- a/metadata/md5-cache/dev-python/paginate-0.5.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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/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=Divides large result sets into pages for easier browsing
-EAPI=8
-HOMEPAGE=https://github.com/Pylons/paginate/ https://pypi.org/project/paginate/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Pylons/paginate/archive/0.5.6.tar.gz -> paginate-0.5.6.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=918b1d67c87b010422709dec1bcb5520
diff --git a/metadata/md5-cache/dev-python/paginate-0.5.7 b/metadata/md5-cache/dev-python/paginate-0.5.7
index a3752c80d457..b28d997d49fb 100644
--- a/metadata/md5-cache/dev-python/paginate-0.5.7
+++ b/metadata/md5-cache/dev-python/paginate-0.5.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Pylons/paginate/ https://pypi.org/project/paginate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/paginate/archive/0.5.7.tar.gz -> paginate-0.5.7.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=158a939c1de10a33beb34f22bbe9491c
+_md5_=918b1d67c87b010422709dec1bcb5520
diff --git a/metadata/md5-cache/dev-python/parse-type-0.6.2 b/metadata/md5-cache/dev-python/parse-type-0.6.2
deleted file mode 100644
index 127c2b18d4f4..000000000000
--- a/metadata/md5-cache/dev-python/parse-type-0.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/parse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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=Extension to the parse module
-EAPI=8
-HOMEPAGE=https://pypi.org/project/parse-type/
-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 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/parse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/p/parse-type/parse_type-0.6.2.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=99fc4ceee8663f7519daacdee658b345
diff --git a/metadata/md5-cache/dev-python/parse-type-0.6.3 b/metadata/md5-cache/dev-python/parse-type-0.6.3
index fbd057c69fb1..7c14bc01a76e 100644
--- a/metadata/md5-cache/dev-python/parse-type-0.6.3
+++ b/metadata/md5-cache/dev-python/parse-type-0.6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/parse-type/
 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 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/parse[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/six[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/p/parse-type/parse_type-0.6.3.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=406f12e34709d675f2401f78e6dd7711
+_md5_=99fc4ceee8663f7519daacdee658b345
diff --git a/metadata/md5-cache/dev-python/pefile-2023.2.7 b/metadata/md5-cache/dev-python/pefile-2023.2.7
deleted file mode 100644
index 7e2721e18717..000000000000
--- a/metadata/md5-cache/dev-python/pefile-2023.2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=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=Module to read and work with Portable Executable (PE) files
-EAPI=8
-HOMEPAGE=https://github.com/erocarrera/pefile
-INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-SLOT=0
-SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2023.2.7/pefile-2023.2.7.tar.gz -> pefile-2023.2.7.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f1f91193a49b4dba2afef5f4d5b32992
diff --git a/metadata/md5-cache/dev-python/pefile-2024.8.26 b/metadata/md5-cache/dev-python/pefile-2024.8.26
index 7203beef5eb3..f40933ba43c3 100644
--- a/metadata/md5-cache/dev-python/pefile-2024.8.26
+++ b/metadata/md5-cache/dev-python/pefile-2024.8.26
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/erocarrera/pefile
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) 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
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2024.8.26/pefile-2024.8.26.tar.gz -> pefile-2024.8.26.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4af379a3637f4373886dc7bc8285894e
+_md5_=b532a076d771c5d3d8809fb8f56a887b
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.43 b/metadata/md5-cache/dev-python/phonenumbers-8.13.43
deleted file mode 100644
index 4c452bd460c7..000000000000
--- a/metadata/md5-cache/dev-python/phonenumbers-8.13.43
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/protobuf-python[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=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 python_targets_python3_13
-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 ) 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/daviddrysdale/python-phonenumbers/archive/v8.13.43.tar.gz -> python-phonenumbers-8.13.43.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=5b3df11923870bf5a64d08791728686b
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.44 b/metadata/md5-cache/dev-python/phonenumbers-8.13.44
index d9ff0c237077..2e425bc3773e 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.13.44
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.13.44
@@ -5,7 +5,7 @@ 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 python_targets_python3_13
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+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 ) 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://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.44.tar.gz -> python-phonenumbers-8.13.44.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=af18b1f779b1bc959921ce395c94c298
+_md5_=5b3df11923870bf5a64d08791728686b
diff --git a/metadata/md5-cache/dev-python/progressbar2-4.4.2 b/metadata/md5-cache/dev-python/progressbar2-4.4.2
deleted file mode 100644
index cfa0edc2ee14..000000000000
--- a/metadata/md5-cache/dev-python/progressbar2-4.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/dill-0.3.6[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/python-utils-3.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/progressbar >=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=Text progressbar library for python
-EAPI=8
-HOMEPAGE=https://progressbar-2.readthedocs.io/ https://github.com/WoLpH/python-progressbar/ https://pypi.org/project/progressbar2/
-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 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/python-utils-3.8.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] !dev-python/progressbar 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/progressbar2/progressbar2-4.4.2.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=b3ad4654ebe260345fef010b3e59ff8d
diff --git a/metadata/md5-cache/dev-python/progressbar2-4.5.0 b/metadata/md5-cache/dev-python/progressbar2-4.5.0
index 5c641ec9688d..e6ffffb89981 100644
--- a/metadata/md5-cache/dev-python/progressbar2-4.5.0
+++ b/metadata/md5-cache/dev-python/progressbar2-4.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://progressbar-2.readthedocs.io/ https://github.com/WoLpH/python-progressbar/ https://pypi.org/project/progressbar2/
 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 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/python-utils-3.8.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/progressbar2/progressbar2-4.5.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=90a882cf6a69050e399874b26bf75a01
+_md5_=cc38795aa336b643d0c34ff55cfbefe0
diff --git a/metadata/md5-cache/dev-python/pulsectl-24.4.0 b/metadata/md5-cache/dev-python/pulsectl-24.4.0
deleted file mode 100644
index 78a367f7ffbd..000000000000
--- a/metadata/md5-cache/dev-python/pulsectl-24.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( media-sound/pulseaudio-daemon ) test? ( media-libs/libpulse python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
-EAPI=8
-HOMEPAGE=https://github.com/mk-fg/python-pulse-control/ https://pypi.org/project/pulsectl/
-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 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=media-libs/libpulse 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/pulsectl/pulsectl-24.4.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=28b28568222ec39e185efe3c4244cf93
diff --git a/metadata/md5-cache/dev-python/pulsectl-24.8.0 b/metadata/md5-cache/dev-python/pulsectl-24.8.0
index 4a277fd18d12..bd9e2bbecba9 100644
--- a/metadata/md5-cache/dev-python/pulsectl-24.8.0
+++ b/metadata/md5-cache/dev-python/pulsectl-24.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mk-fg/python-pulse-control/ https://pypi.org/project/pulsectl/
 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 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=media-libs/libpulse 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/pulsectl/pulsectl-24.8.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9953cb1a6923443bd3bf7c9266b9bcaa
+_md5_=28b28568222ec39e185efe3c4244cf93
diff --git a/metadata/md5-cache/dev-python/pyasynchat-1.0.4 b/metadata/md5-cache/dev-python/pyasynchat-1.0.4
index 120e7c3a9906..81f8238a5303 100644
--- a/metadata/md5-cache/dev-python/pyasynchat-1.0.4
+++ b/metadata/md5-cache/dev-python/pyasynchat-1.0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simonrob/pyasynchat/ https://pypi.org/project/pyasynchat/
 INHERIT=distutils-r1 pypi
 IUSE=test test python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=>=dev-python/pyasyncore-1.0.2[python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_python3_12 python_targets_python3_13 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyasynchat/pyasynchat-1.0.4.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=bbbc4707e9e5d89d21c1a40eeb066248
+_md5_=43cae627a39d5409ddb8855c29492d08
diff --git a/metadata/md5-cache/dev-python/pyasyncore-1.0.4 b/metadata/md5-cache/dev-python/pyasyncore-1.0.4
index 636065265592..9d6a1e15cc80 100644
--- a/metadata/md5-cache/dev-python/pyasyncore-1.0.4
+++ b/metadata/md5-cache/dev-python/pyasyncore-1.0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simonrob/pyasyncore https://pypi.org/project/pyasyncore/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( 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/pyasyncore/pyasyncore-1.0.4.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=3da0d52f88c68a442c2e024bb457a832
+_md5_=3f7d6adab321770a7ceb5db4ce5f9696
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-2.0.0 b/metadata/md5-cache/dev-python/pyftpdlib-2.0.0
index 22d60ff23ab7..8b252e48eec8 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-2.0.0
+++ b/metadata/md5-cache/dev-python/pyftpdlib-2.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/giampaolo/pyftpdlib/ https://pypi.org/project/pyftpdlib/
 INHERIT=distutils-r1 pypi
 IUSE=examples ssl test doc 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_12? ( dev-python/pyasynchat[python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyasyncore[python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_13? ( dev-python/pyasynchat[python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pyasyncore[python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) ssl? ( dev-python/pyopenssl[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[ssl(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[ssl(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[ssl(+)] ) python_targets_python3_13? ( dev-lang/python:3.13[ssl(+)] )
 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/p/pyftpdlib/pyftpdlib-2.0.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=67a2c035de8af17b5be4839a1ea8bcdd
+_md5_=40e28d656efae54abbf98600507b3d86
diff --git a/metadata/md5-cache/dev-python/pyfuse3-3.3.0 b/metadata/md5-cache/dev-python/pyfuse3-3.3.0
deleted file mode 100644
index b68e212c6d5a..000000000000
--- a/metadata/md5-cache/dev-python/pyfuse3-3.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/pytest-trio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( sys-fs/fuse:3 dev-python/trio[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
-DEPEND=sys-fs/fuse:3 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-DESCRIPTION=Python 3 bindings for libfuse 3 with asynchronous API
-EAPI=8
-HOMEPAGE=https://github.com/libfuse/pyfuse3/ https://pypi.org/project/pyfuse3/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2
-RDEPEND=sys-fs/fuse:3 dev-python/trio[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/p/pyfuse3/pyfuse3-3.3.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=e8a4c7620ba68e113450d1838965c121
diff --git a/metadata/md5-cache/dev-python/pyfuse3-3.4.0 b/metadata/md5-cache/dev-python/pyfuse3-3.4.0
index 6e8a2764ba0a..a89b7e7b0823 100644
--- a/metadata/md5-cache/dev-python/pyfuse3-3.4.0
+++ b/metadata/md5-cache/dev-python/pyfuse3-3.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libfuse/pyfuse3/ https://pypi.org/project/pyfuse3/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2
 RDEPEND=sys-fs/fuse:3 dev-python/trio[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyfuse3/pyfuse3-3.4.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f6bb5a2a2c074528e86281a7889c0d33
+_md5_=e8a4c7620ba68e113450d1838965c121
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.4-r1 b/metadata/md5-cache/dev-python/pysmi-0.3.4-r1
deleted file mode 100644
index 1ea751176bc2..000000000000
--- a/metadata/md5-cache/dev-python/pysmi-0.3.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pysnmp[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ply[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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(-)?] ) ) 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(-)] ) ) ) 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
-DESCRIPTION=Python Lex & Yacc
-EAPI=8
-HOMEPAGE=https://github.com/etingof/pysmi/ https://pypi.org/project/pysmi/
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/ply[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pysmi/pysmi-0.3.4.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=3cb5fe70621d2af931d8324adce07ffc
diff --git a/metadata/md5-cache/dev-python/pysmi-1.4.4 b/metadata/md5-cache/dev-python/pysmi-1.4.4
index 52c527607a74..5f8a71c0720d 100644
--- a/metadata/md5-cache/dev-python/pysmi-1.4.4
+++ b/metadata/md5-cache/dev-python/pysmi-1.4.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lextudio/pysmi/ https://pypi.org/project/pysmi/
 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 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ~sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-python/jinja-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/ply-3.11[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.26.0[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/p/pysmi/pysmi-1.4.4.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=264f1fa3e29ec9d3f1a2682499f4860e
+_md5_=f393fc28f1061629a3c40fa5f68a46f4
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.12-r2 b/metadata/md5-cache/dev-python/pysnmp-4.4.12-r2
deleted file mode 100644
index 003c036f2847..000000000000
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.12-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python SNMP library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp
-INHERIT=distutils-r1 optfeature pypi
-IUSE=doc examples doc python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ppc ~sparc x86
-LICENSE=BSD
-PDEPEND=dev-python/pysmi[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycryptodome[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 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pysnmp/pysnmp-4.4.12.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9f5832e07f1d323efd422311cddf6531
diff --git a/metadata/md5-cache/dev-python/pysnmp-7.0.3 b/metadata/md5-cache/dev-python/pysnmp-7.0.3
index a9077573414f..05a2322bb7ee 100644
--- a/metadata/md5-cache/dev-python/pysnmp-7.0.3
+++ b/metadata/md5-cache/dev-python/pysnmp-7.0.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pysnmp/ https://github.com/lextudio/pysnmp/
 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 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ~sparc x86
 LICENSE=BSD-2
 PROPERTIES=test_network
 RDEPEND=>=dev-python/pyasn1-0.4.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pysnmpcrypto-0.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pysmi-1.3.0[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 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pysnmp/pysnmp-7.0.3.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9dde161f50791798bf0e233f9934207a
+_md5_=f9ce2f3ea040f400fd0e2b29e5d51fda
diff --git a/metadata/md5-cache/dev-python/pysnmpcrypto-0.0.4 b/metadata/md5-cache/dev-python/pysnmpcrypto-0.0.4
index 4a864b939898..79cfcdebb33e 100644
--- a/metadata/md5-cache/dev-python/pysnmpcrypto-0.0.4
+++ b/metadata/md5-cache/dev-python/pysnmpcrypto-0.0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pysnmpcrypto/ https://github.com/lextudio/pysnmpcrypto
 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 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pycryptodome[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/pysnmpcrypto/pysnmpcrypto-0.0.4.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=8f544585c9bb20eebe3550b934668a1a
+_md5_=b638beef3aee681c1fb5691cebe85842
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.0-r1 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.0-r1
deleted file mode 100644
index 0dc464a4f921..000000000000
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.0-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/pytest-subtests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/attrs-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/psutil-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-skip-markers[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=pytest plugin: fixtures and code to help with running shell commands on tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/attrs-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/psutil-6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-skip-markers[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/saltstack/pytest-shell-utilities/archive/1.9.0.tar.gz -> pytest-shell-utilities-1.9.0.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=0b8fdefc6b428248ae4f8f4bd0f1dcf0
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.3 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.3
index 49054ba415c9..9270cad13f5c 100644
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.3
+++ b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.9.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/attrs-22.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/pytest-7.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/pytest-skip-markers[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://github.com/saltstack/pytest-shell-utilities/archive/1.9.3.tar.gz -> pytest-shell-utilities-1.9.3.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=bd263101374da7562b6224f8b8bf1110
+_md5_=5dd47704aee8d1e54699ea3ec2858904
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-9.5.0 b/metadata/md5-cache/dev-python/python-cinderclient-9.5.0
deleted file mode 100644
index f909c15c77dd..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-9.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/ddt[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/fixtures[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/oslo-serialization[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/testtools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/keystoneauth1-4.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.25.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] 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 ) 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 client for the OpenStack Cinder API
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/python-cinderclient/ https://github.com/openstack/python-cinderclient/ https://pypi.org/project/python-cinderclient/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth1-4.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.25.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-3.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-cinderclient/python-cinderclient-9.5.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=c38cad7385a4d930e561287bbec2124b
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-9.6.0 b/metadata/md5-cache/dev-python/python-cinderclient-9.6.0
index f557f24e8820..c8cc1d3054b3 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-9.6.0
+++ b/metadata/md5-cache/dev-python/python-cinderclient-9.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/python-cinderclient/ https://github.com/openstack/python-cinderclient/ https://pypi.org/project/python-cinderclient/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth1-4.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.25.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/stevedore-3.3.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-cinderclient/python-cinderclient-9.6.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=d15ae23fefb58e524b1ff097cf4d6b29
+_md5_=c38cad7385a4d930e561287bbec2124b
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-5.4.0 b/metadata/md5-cache/dev-python/python-keystoneclient-5.4.0
deleted file mode 100644
index f8360d088cab..000000000000
--- a/metadata/md5-cache/dev-python/python-keystoneclient-5.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oauthlib-0.6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/keystoneauth1-3.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] 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 ) 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=Client Library for OpenStack Identity
-EAPI=8
-HOMEPAGE=https://opendev.org/openstack/python-keystoneclient/ https://github.com/openstack/python-keystoneclient/ https://pypi.org/project/python-keystoneclient/
-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 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/keystoneauth1-3.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[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/p/python-keystoneclient/python-keystoneclient-5.4.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=70dc74ef9334b32dbbebd02906e58cad
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-5.5.0 b/metadata/md5-cache/dev-python/python-keystoneclient-5.5.0
index cb68d5568344..320d2deb128b 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-5.5.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-5.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/python-keystoneclient/ https://github.com/openstack/python-keystoneclient/ https://pypi.org/project/python-keystoneclient/
 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 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/keystoneauth1-3.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/requests-2.14.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/six-1.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/stevedore-1.20.0[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/p/python-keystoneclient/python-keystoneclient-5.5.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=393a3dd1ef0496a647fde299d9937a80
+_md5_=70dc74ef9334b32dbbebd02906e58cad
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.11.0 b/metadata/md5-cache/dev-python/python-lsp-server-1.11.0
deleted file mode 100644
index ac5b35781fa4..000000000000
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/autopep8-1.6.0[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/flake8-5.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/matplotlib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.7.0[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/pycodestyle-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.0[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/QtPy[gui,testlib,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/docstring-to-markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jedi-0.17.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-lsp-jsonrpc-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] all-plugins? ( >=dev-python/autopep8-2.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flake8-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycodestyle-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python Language Server for the Language Server Protocol
-EAPI=8
-HOMEPAGE=https://github.com/python-lsp/python-lsp-server/ https://pypi.org/project/python-lsp-server/
-INHERIT=distutils-r1 optfeature pypi
-IUSE=all-plugins test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/docstring-to-markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jedi-0.17.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-lsp-jsonrpc-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] all-plugins? ( >=dev-python/autopep8-2.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flake8-7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycodestyle-2.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/python-lsp-server/python-lsp-server-1.11.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=69948ee5beb334f2c12da8dcc41ceb61
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.12.0 b/metadata/md5-cache/dev-python/python-lsp-server-1.12.0
index b150ed626357..026a73d47009 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.12.0
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.12.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-lsp/python-lsp-server/ https://pypi.org/project/python-lsp-server/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=all-plugins 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/docstring-to-markdown[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jedi-0.17.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-lsp-jsonrpc-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pluggy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] all-plugins? ( >=dev-python/autopep8-2.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flake8-7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mccabe-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pycodestyle-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyflakes-3.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pylint-3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/rope-1.11.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/whatthepatch-1.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/yapf-0.33.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/python-lsp-server/python_lsp_server-1.12.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=c6ea89dc0675055aec7b38e7d4f16eaa
+_md5_=d30fcae778e05cb0ee3b83590bcfa1c9
diff --git a/metadata/md5-cache/dev-python/python-snappy-0.7.2 b/metadata/md5-cache/dev-python/python-snappy-0.7.2
deleted file mode 100644
index 890819884ee2..000000000000
--- a/metadata/md5-cache/dev-python/python-snappy-0.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/cramjam-2.6.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/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for the snappy compression library from Google
-EAPI=8
-HOMEPAGE=https://github.com/intake/python-snappy/ https://pypi.org/project/python-snappy/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cramjam-2.6.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/python-snappy/python_snappy-0.7.2.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=37f9888111bb7c1215b758c142f6a35c
diff --git a/metadata/md5-cache/dev-python/python-snappy-0.7.3 b/metadata/md5-cache/dev-python/python-snappy-0.7.3
index 33d8a7c5d518..54bdf50334f1 100644
--- a/metadata/md5-cache/dev-python/python-snappy-0.7.3
+++ b/metadata/md5-cache/dev-python/python-snappy-0.7.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/intake/python-snappy/ https://pypi.org/project/python-snappy/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cramjam-2.6.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/python-snappy/python_snappy-0.7.3.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=27ec07f77fcb811995ee57901849aa5b
+_md5_=37f9888111bb7c1215b758c142f6a35c
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.6.0 b/metadata/md5-cache/dev-python/qtconsole-5.6.0
index 90ce684ac63d..15b5e3c8dffb 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.6.0
+++ b/metadata/md5-cache/dev-python/qtconsole-5.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/qtconsole/ https://pypi.org/project/qtconsole/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~riscv x86
 LICENSE=BSD
 PDEPEND=dev-python/ipython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
 RDEPEND=>=dev-python/ipykernel-4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/jupyter-client-4.1.1[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/pygments[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/traitlets-5.2.2_p1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/QtPy-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?,gui,printsupport,svg] 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(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/q/qtconsole/qtconsole-5.6.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c
-_md5_=a1a2aa6741105f0905b4a82fc0fba59a
+_md5_=b764f15c3d2aae6da3cbec97e3050953
diff --git a/metadata/md5-cache/dev-python/quantities-0.15.0-r1 b/metadata/md5-cache/dev-python/quantities-0.15.0-r1
deleted file mode 100644
index 81093656afbf..000000000000
--- a/metadata/md5-cache/dev-python/quantities-0.15.0-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/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Support for physical quantities with units, based on numpy
-EAPI=8
-HOMEPAGE=https://github.com/python-quantities/python-quantities/ https://pypi.org/project/quantities/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/numpy-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-quantities/python-quantities/archive/v0.15.0.tar.gz -> python-quantities-0.15.0.gh.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=49983163b9d99a69cc90e2120baef44d
diff --git a/metadata/md5-cache/dev-python/quantities-0.16.0 b/metadata/md5-cache/dev-python/quantities-0.16.0
index 822691bf09a3..97b69ed411d7 100644
--- a/metadata/md5-cache/dev-python/quantities-0.16.0
+++ b/metadata/md5-cache/dev-python/quantities-0.16.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-quantities/python-quantities/ https://pypi.org/project/quantities/
 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
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_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://github.com/python-quantities/python-quantities/archive/v0.16.0.tar.gz -> python-quantities-0.16.0.gh.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=d834a4597abfae7c7e8e2cd692739066
+_md5_=5d79cb3adca463d5863ccecaa6b4d091
diff --git a/metadata/md5-cache/dev-python/selenium-4.24.0 b/metadata/md5-cache/dev-python/selenium-4.24.0
index 8d0cfc6b22ad..f427ca084473 100644
--- a/metadata/md5-cache/dev-python/selenium-4.24.0
+++ b/metadata/md5-cache/dev-python/selenium-4.24.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.seleniumhq.org/ https://github.com/SeleniumHQ/selenium/tree/trunk/py/ https://pypi.org/project/selenium/
 INHERIT=distutils-r1 pypi
 IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2021.10.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/trio-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/trio-0.17[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/trio-websocket-1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/trio-websocket-0.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/typing-extensions-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.9[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/urllib3-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/urllib3-1.26[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] <dev-python/websocket-client-2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/websocket-client-1.8.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/s/selenium/selenium-4.24.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-4.24.0.tar.gz -> selenium-selenium-4.24.0.gh.tar.gz )
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=17f5c84e9afe8dd05c9b9ca7eb54251c
+_md5_=fec1229e7f198e8a209f213e0f85caf1
diff --git a/metadata/md5-cache/dev-python/sqlglot-25.21.3 b/metadata/md5-cache/dev-python/sqlglot-25.21.3
new file mode 100644
index 000000000000..44452d3fd3cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlglot-25.21.3
@@ -0,0 +1,17 @@
+BDEPEND=native-extensions? ( >=virtual/rust-1.53 dev-util/maturin[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+DESCRIPTION=An easily customizable SQL parser and transpiler
+EAPI=8
+HOMEPAGE=https://sqlglot.com/ https://github.com/tobymao/sqlglot/ https://pypi.org/project/sqlglot/
+INHERIT=cargo distutils-r1 pypi optfeature
+IUSE=+native-extensions test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT native-extensions? ( Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016 )
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-25.21.3.tar.gz native-extensions? ( https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/indoc/2.0.4/download -> indoc-2.0.4.crate https://crates.io/api/v1/crates/libc/0.2.150/download -> libc-0.2.150.crate https://crates.io/api/v1/crates/lock_api/0.4.11/download -> lock_api-0.4.11.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/once_cell/1.19.0/download -> once_cell-1.19.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.9/download -> parking_lot_core-0.9.9.crate https://crates.io/api/v1/crates/proc-macro2/1.0.70/download -> proc-macro2-1.0.70.crate https://crates.io/api/v1/crates/pyo3-build-config/0.20.0/download -> pyo3-build-config-0.20.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.20.0/download -> pyo3-ffi-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.20.0/download -> pyo3-macros-backend-0.20.0.crate https://crates.io/api/v1/crates/pyo3-macros/0.20.0/download -> pyo3-macros-0.20.0.crate https://crates.io/api/v1/crates/pyo3/0.20.0/download -> pyo3-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.33/download -> quote-1.0.33.crate https://crates.io/api/v1/crates/redox_syscall/0.4.1/download -> redox_syscall-0.4.1.crate https://crates.io/api/v1/crates/scopeguard/1.2.0/download -> scopeguard-1.2.0.crate https://crates.io/api/v1/crates/smallvec/1.11.2/download -> smallvec-1.11.2.crate https://crates.io/api/v1/crates/syn/2.0.41/download -> syn-2.0.41.crate https://crates.io/api/v1/crates/target-lexicon/0.12.12/download -> target-lexicon-0.12.12.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unindent/0.2.3/download -> unindent-0.2.3.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate )
+_eclasses_=cargo	c806360bab90e2b49223df1810172c2b	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=4b27df346cd796a97204a01dd7e5d017
diff --git a/metadata/md5-cache/dev-python/stripe-10.8.0 b/metadata/md5-cache/dev-python/stripe-10.8.0
deleted file mode 100644
index 7d88f55e84ce..000000000000
--- a/metadata/md5-cache/dev-python/stripe-10.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.188.0 dev-python/aiohttp[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/anyio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] dev-python/httpx[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/trio[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.5.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(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-69.0.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stripe Python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-INHERIT=distutils-r1 pypi
-IUSE=telemetry test python_targets_pypy3 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/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.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/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/s/stripe/stripe-10.8.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=704562fc079fb0056631244ccba6bce1
diff --git a/metadata/md5-cache/dev-python/stripe-10.9.0 b/metadata/md5-cache/dev-python/stripe-10.9.0
index ff8dd16e4421..42161db2521d 100644
--- a/metadata/md5-cache/dev-python/stripe-10.9.0
+++ b/metadata/md5-cache/dev-python/stripe-10.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
 INHERIT=distutils-r1 pypi
 IUSE=telemetry test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/typing-extensions-4.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/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/s/stripe/stripe-10.9.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=46ec10feadd11241d487fd8d4407882a
+_md5_=704562fc079fb0056631244ccba6bce1
diff --git a/metadata/md5-cache/dev-python/types-setuptools-73.0.0.20240822 b/metadata/md5-cache/dev-python/types-setuptools-73.0.0.20240822
deleted file mode 100644
index 98e7a00fa2e4..000000000000
--- a/metadata/md5-cache/dev-python/types-setuptools-73.0.0.20240822
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=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=Typing stubs for setuptools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-setuptools/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc 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 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-73.0.0.20240822.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=a312fc7343e568efe60d569cbe1dc799
diff --git a/metadata/md5-cache/dev-python/types-setuptools-74.0.0.20240831 b/metadata/md5-cache/dev-python/types-setuptools-74.0.0.20240831
deleted file mode 100644
index 52acb65ea1c7..000000000000
--- a/metadata/md5-cache/dev-python/types-setuptools-74.0.0.20240831
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 ) >=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=Typing stubs for setuptools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/types-setuptools/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-74.0.0.20240831.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=a38a26f21fad9c0875915ebf1fc38443
diff --git a/metadata/md5-cache/dev-python/types-setuptools-74.1.0.20240907 b/metadata/md5-cache/dev-python/types-setuptools-74.1.0.20240907
index f55ea6ce8196..87e54600526a 100644
--- a/metadata/md5-cache/dev-python/types-setuptools-74.1.0.20240907
+++ b/metadata/md5-cache/dev-python/types-setuptools-74.1.0.20240907
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/types-setuptools/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc 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 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-74.1.0.20240907.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=a38a26f21fad9c0875915ebf1fc38443
+_md5_=a312fc7343e568efe60d569cbe1dc799
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.24.0 b/metadata/md5-cache/dev-python/watchfiles-0.24.0
index 4ac30cf50306..293e5bf9f988 100644
--- a/metadata/md5-cache/dev-python/watchfiles-0.24.0
+++ b/metadata/md5-cache/dev-python/watchfiles-0.24.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/watchfiles/ https://github.com/samuelcolvin/watchfiles/
 INHERIT=cargo distutils-r1
 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT Unicode-DFS-2016
 RDEPEND=>=dev-python/anyio-4.0.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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/watchfiles/archive/v0.24.0.tar.gz -> watchfiles-0.24.0.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.3.0/download -> autocfg-1.3.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.6.0/download -> bitflags-2.6.0.crate https://crates.io/api/v1/crates/cc/1.0.96/download -> cc-1.0.96.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.12/download -> crossbeam-channel-0.5.12.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/filetime/0.2.24/download -> filetime-0.2.24.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/heck/0.5.0/download -> heck-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/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/inotify/0.10.2/download -> inotify-0.10.2.crate https://crates.io/api/v1/crates/instant/0.1.13/download -> instant-0.1.13.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/libredox/0.1.3/download -> libredox-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.22/download -> log-0.4.22.crate https://crates.io/api/v1/crates/memoffset/0.9.1/download -> memoffset-0.9.1.crate https://crates.io/api/v1/crates/mio/0.8.11/download -> mio-0.8.11.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/portable-atomic/1.6.0/download -> portable-atomic-1.6.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.22.2/download -> pyo3-build-config-0.22.2.crate https://crates.io/api/v1/crates/pyo3-ffi/0.22.2/download -> pyo3-ffi-0.22.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.22.2/download -> pyo3-macros-backend-0.22.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.22.2/download -> pyo3-macros-0.22.2.crate https://crates.io/api/v1/crates/pyo3/0.22.2/download -> pyo3-0.22.2.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.10/download -> python3-dll-a-0.2.10.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.5.3/download -> redox_syscall-0.5.3.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/syn/2.0.60/download -> syn-2.0.60.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/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/walkdir/2.5.0/download -> walkdir-2.5.0.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi-util/0.1.9/download -> winapi-util-0.1.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-sys/0.59.0/download -> windows-sys-0.59.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.6/download -> windows-targets-0.52.6.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.6/download -> windows_aarch64_gnullvm-0.52.6.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.6/download -> windows_aarch64_msvc-0.52.6.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.6/download -> windows_i686_gnu-0.52.6.crate https://crates.io/api/v1/crates/windows_i686_gnullvm/0.52.6/download -> windows_i686_gnullvm-0.52.6.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.6/download -> windows_i686_msvc-0.52.6.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.6/download -> windows_x86_64_gnu-0.52.6.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.6/download -> windows_x86_64_gnullvm-0.52.6.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.6/download -> windows_x86_64_msvc-0.52.6.crate https://github.com/samuelcolvin/notify/archive/0f87ab12707d231fa44180454d59478d3992eb59.tar.gz -> notify-0f87ab12707d231fa44180454d59478d3992eb59.gh.tar.gz https://github.com/samuelcolvin/notify/archive/0f87ab12707d231fa44180454d59478d3992eb59.tar.gz -> notify-0f87ab12707d231fa44180454d59478d3992eb59.gh.tar.gz
 _eclasses_=cargo	c806360bab90e2b49223df1810172c2b	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=1487964b403b46b5667681ac3cb3480f
+_md5_=41ea6bf2ce51a454a295a917ac115789
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.8.0 b/metadata/md5-cache/dev-python/ytmusicapi-1.8.0
deleted file mode 100644
index cf5dc5ed25ff..000000000000
--- a/metadata/md5-cache/dev-python/ytmusicapi-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-7.2.6[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-7.2.6[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-7.2.6[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-69.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unofficial API for YouTube Music
-EAPI=8
-HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
-INHERIT=distutils-r1 pypi
-IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/requests[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/y/ytmusicapi/ytmusicapi-1.8.0.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=3c52df2ce37b601faace7d60fcaaf2d0
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.8.1 b/metadata/md5-cache/dev-python/ytmusicapi-1.8.1
index 86fe403e4295..35bc1d983195 100644
--- a/metadata/md5-cache/dev-python/ytmusicapi-1.8.1
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.8.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
 INHERIT=distutils-r1 pypi
 IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/requests[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/y/ytmusicapi/ytmusicapi-1.8.1.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9cf6c50931a6e9346ad3d2ab95236c16
+_md5_=3c52df2ce37b601faace7d60fcaaf2d0
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.132.2 b/metadata/md5-cache/dev-python/zeroconf-0.132.2
deleted file mode 100644
index 19c529645313..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.132.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-3.0.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_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
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
-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/z/zeroconf/zeroconf-0.132.2.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=04d43e4d950c2c6c861cd741b40eab52
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.133.0 b/metadata/md5-cache/dev-python/zeroconf-0.133.0
index c687cb59b14a..89f3fb23a756 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.133.0
+++ b/metadata/md5-cache/dev-python/zeroconf-0.133.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 python_targets_python3_13 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?,python_targets_python3_13(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) python_targets_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=|| ( 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/z/zeroconf/zeroconf-0.133.0.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=72003a9fb1f85983dcab615f1d183c89
+_md5_=04d43e4d950c2c6c861cd741b40eab52
diff --git a/metadata/md5-cache/dev-python/zope-interface-7.0.3 b/metadata/md5-cache/dev-python/zope-interface-7.0.3
index 92723138c006..71c87f5c652f 100644
--- a/metadata/md5-cache/dev-python/zope-interface-7.0.3
+++ b/metadata/md5-cache/dev-python/zope-interface-7.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/zopefoundation/zope.interface/ https://pypi.org/project/zope.interface/
 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 ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=ZPL
 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/z/zope.interface/zope.interface-7.0.3.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=1507dbadae6efaad41125c88f6f606cf
+_md5_=2baca95ca8bf73f9e7bef0bb880e03e3
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 89fd68a0d3f2..8547c803dd00 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/execjs-2.9.1 b/metadata/md5-cache/dev-ruby/execjs-2.9.1
index f3fe2ca3a725..1b8df9b0bdc8 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.9.1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.9.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rails/execjs
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=|| ( dev-ruby/duktape-rb net-libs/nodejs ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.9.1.tar.gz -> execjs-2.9.1.tar.gz
 _eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	ruby-fakegem	c15e9262e9d714e53eb7e03047d12643	ruby-ng	a6e22e2e4ba7527ba0590c8df492c1c0	ruby-utils	ec73f640a49f4fb6394ef1d90fbb3b3c	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=8860f46f630a59177aaef0b848e75cad
+_md5_=42103c1c64b71a338972aad29151ef02
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.4.1 b/metadata/md5-cache/dev-ruby/timeout-0.4.1
index 47c54b764c0f..bb21842df7b6 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.4.1
+++ b/metadata/md5-cache/dev-ruby/timeout-0.4.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/timeout
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ruby_targets_ruby33? ( virtual/rubygems[ruby_targets_ruby33(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.4.1.tar.gz -> timeout-0.4.1.tar.gz
 _eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	ruby-fakegem	c15e9262e9d714e53eb7e03047d12643	ruby-ng	a6e22e2e4ba7527ba0590c8df492c1c0	ruby-utils	ec73f640a49f4fb6394ef1d90fbb3b3c	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=8f48f943ac29b69c9fb8abb20e537ef5
+_md5_=0ab7519d762e76dc33bc17cb7e226366
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a230643d5711..8f80832760fb 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/bindgen-0.69.4 b/metadata/md5-cache/dev-util/bindgen-0.69.4
index f695c19864e6..65c25dc16753 100644
--- a/metadata/md5-cache/dev-util/bindgen-0.69.4
+++ b/metadata/md5-cache/dev-util/bindgen-0.69.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://rust-lang.github.io/rust-bindgen/
 INHERIT=rust-toolchain cargo
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv
 LICENSE=BSD Apache-2.0 BSD ISC MIT Unicode-DFS-2016
 RDEPEND=virtual/rust sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-bindgen/archive/refs/tags/v0.69.4.tar.gz -> bindgen-0.69.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/annotate-snippets/0.9.1/download -> annotate-snippets-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.2.1/download -> bitflags-2.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.1.4/download -> clap-4.1.4.crate https://crates.io/api/v1/crates/clap_complete/4.2.0/download -> clap_complete-4.2.0.crate https://crates.io/api/v1/crates/clap_derive/4.1.0/download -> clap_derive-4.1.0.crate https://crates.io/api/v1/crates/clap_lex/0.3.1/download -> clap_lex-0.3.1.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/env_logger/0.10.0/download -> env_logger-0.10.0.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.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.1/download -> errno-0.3.1.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.3.2/download -> hermit-abi-0.3.2.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.7/download -> is-terminal-0.4.7.crate https://crates.io/api/v1/crates/itertools/0.12.1/download -> itertools-0.12.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.8/download -> linux-raw-sys-0.3.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/owo-colors/3.5.0/download -> owo-colors-3.5.0.crate https://crates.io/api/v1/crates/prettyplease/0.2.7/download -> prettyplease-0.2.7.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.60/download -> proc-macro2-1.0.60.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.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/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.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/rustix/0.36.16/download -> rustix-0.36.16.crate https://crates.io/api/v1/crates/rustix/0.37.3/download -> rustix-0.37.3.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/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/syn/2.0.18/download -> syn-2.0.18.crate https://crates.io/api/v1/crates/tempfile/3.4.0/download -> tempfile-3.4.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/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/which/4.4.0/download -> which-4.4.0.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.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.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-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows-targets/0.48.1/download -> windows-targets-0.48.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate https://crates.io/api/v1/crates/yansi-term/0.1.2/download -> yansi-term-0.1.2.crate
 _eclasses_=cargo	c806360bab90e2b49223df1810172c2b	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=f4ba3d6cbd1e37bad74da9663247174c
+_md5_=186a25e9bc2d2471d954a204edaa3792
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 63bc6b09a0f4..106d38dac01c 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-absorb-0.6.13-r1 b/metadata/md5-cache/dev-vcs/git-absorb-0.6.13-r1
deleted file mode 100644
index 8ad2f7674c96..000000000000
--- a/metadata/md5-cache/dev-vcs/git-absorb-0.6.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/libgit2-1.7:= <dev-libs/libgit2-1.8:=
-DESCRIPTION=Automatically absorb staged changes into git current branch
-EAPI=8
-HOMEPAGE=https://github.com/tummychow/git-absorb
-INHERIT=cargo shell-completion
-IUSE=debug
-KEYWORDS=~amd64 ~arm64
-LICENSE=BSD MIT Unicode-DFS-2016
-RDEPEND=>=dev-libs/libgit2-1.7:= <dev-libs/libgit2-1.8:=
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/anstream/0.6.13/download -> anstream-0.6.13.crate https://crates.io/api/v1/crates/anstyle-parse/0.2.3/download -> anstyle-parse-0.2.3.crate https://crates.io/api/v1/crates/anstyle-query/1.0.2/download -> anstyle-query-1.0.2.crate https://crates.io/api/v1/crates/anstyle-wincon/3.0.2/download -> anstyle-wincon-3.0.2.crate https://crates.io/api/v1/crates/anstyle/1.0.6/download -> anstyle-1.0.6.crate https://crates.io/api/v1/crates/anyhow/1.0.81/download -> anyhow-1.0.81.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/cc/1.0.90/download -> cc-1.0.90.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/4.5.3/download -> clap-4.5.3.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.1/download -> clap_complete-4.5.1.crate https://crates.io/api/v1/crates/clap_complete_nushell/4.5.1/download -> clap_complete_nushell-4.5.1.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.0/download -> colorchoice-1.0.0.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-utils/0.8.19/download -> crossbeam-utils-0.8.19.crate https://crates.io/api/v1/crates/deranged/0.3.11/download -> deranged-0.3.11.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/errno/0.3.8/download -> errno-0.3.8.crate https://crates.io/api/v1/crates/fastrand/2.0.1/download -> fastrand-2.0.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.1/download -> form_urlencoded-1.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.12/download -> getrandom-0.2.12.crate https://crates.io/api/v1/crates/git2/0.18.3/download -> git2-0.18.3.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/idna/0.5.0/download -> idna-0.5.0.crate https://crates.io/api/v1/crates/is-terminal/0.4.12/download -> is-terminal-0.4.12.crate https://crates.io/api/v1/crates/itoa/1.0.10/download -> itoa-1.0.10.crate https://crates.io/api/v1/crates/jobserver/0.1.28/download -> jobserver-0.1.28.crate https://crates.io/api/v1/crates/libc/0.2.153/download -> libc-0.2.153.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/libredox/0.0.1/download -> libredox-0.0.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.16/download -> libz-sys-1.1.16.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/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/memchr/2.7.1/download -> memchr-2.7.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/percent-encoding/2.3.1/download -> percent-encoding-2.3.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.30/download -> pkg-config-0.3.30.crate https://crates.io/api/v1/crates/powerfmt/0.2.0/download -> powerfmt-0.2.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.79/download -> proc-macro2-1.0.79.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/redox_users/0.4.4/download -> redox_users-0.4.4.crate https://crates.io/api/v1/crates/rustix/0.38.32/download -> rustix-0.38.32.crate https://crates.io/api/v1/crates/rustversion/1.0.14/download -> rustversion-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.197/download -> serde-1.0.197.crate https://crates.io/api/v1/crates/serde_derive/1.0.197/download -> serde_derive-1.0.197.crate https://crates.io/api/v1/crates/slog-async/2.8.0/download -> slog-async-2.8.0.crate https://crates.io/api/v1/crates/slog-term/2.9.1/download -> slog-term-2.9.1.crate https://crates.io/api/v1/crates/slog/2.7.0/download -> slog-2.7.0.crate https://crates.io/api/v1/crates/strsim/0.11.0/download -> strsim-0.11.0.crate https://crates.io/api/v1/crates/syn/2.0.53/download -> syn-2.0.53.crate https://crates.io/api/v1/crates/take_mut/0.2.2/download -> take_mut-0.2.2.crate https://crates.io/api/v1/crates/tempfile/3.10.1/download -> tempfile-3.10.1.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.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.58/download -> thiserror-impl-1.0.58.crate https://crates.io/api/v1/crates/thiserror/1.0.58/download -> thiserror-1.0.58.crate https://crates.io/api/v1/crates/thread_local/1.1.8/download -> thread_local-1.1.8.crate https://crates.io/api/v1/crates/time-core/0.1.2/download -> time-core-0.1.2.crate https://crates.io/api/v1/crates/time-macros/0.2.17/download -> time-macros-0.2.17.crate https://crates.io/api/v1/crates/time/0.3.34/download -> time-0.3.34.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.15/download -> unicode-bidi-0.3.15.crate https://crates.io/api/v1/crates/unicode-ident/1.0.12/download -> unicode-ident-1.0.12.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.23/download -> unicode-normalization-0.1.23.crate https://crates.io/api/v1/crates/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/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-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.4/download -> windows-targets-0.52.4.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.4/download -> windows_aarch64_gnullvm-0.52.4.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.4/download -> windows_aarch64_msvc-0.52.4.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.4/download -> windows_i686_gnu-0.52.4.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.4/download -> windows_i686_msvc-0.52.4.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.4/download -> windows_x86_64_gnu-0.52.4.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.4/download -> windows_x86_64_gnullvm-0.52.4.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.4/download -> windows_x86_64_msvc-0.52.4.crate https://github.com/tummychow/git-absorb/archive/refs/tags/0.6.13.tar.gz -> git-absorb-0.6.13.tar.gz
-_eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	cargo	c806360bab90e2b49223df1810172c2b	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=9a45c53650396caff55969c0fd83b4e4
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index cc6142fd5b9f..93f6e62f4289 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.32.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.32.0
new file mode 100644
index 000000000000..3d193c4ab2c1
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.32.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip dev-lang/perl || ( dev-lang/python:3.13 dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.13 dev-python/pyyaml[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/pyyaml[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ) app-alternatives/lex tiles? ( advpng? ( app-arch/advancecomp ) !advpng? ( media-gfx/pngcrush ) ) virtual/pkgconfig app-alternatives/yacc
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) test? ( <dev-cpp/catch-3.0.0:0 ) tiles? ( sys-libs/ncurses:0 )
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=8
+HOMEPAGE=https://crawl.develz.org
+INHERIT=desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+IUSE=advpng debug ncurses sound test +tiles +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0.32
+SRC_URI=https://github.com/crawl/crawl/archive/refs/tags/0.32.0.tar.gz -> stone-soup-0.32.0.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.32.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.32.svg
+_eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	lua-single	3ae43cac1bf8275a847245b9a475a54e	lua-utils	1f91de68f9a26642216e45d7765fd4fb	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	python-any-r1	5af215c3da6aef17a2d5e02968df1d5a	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=bc855e9df8bd811caf7c4f11ca380200
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 439ce4947156..cadeb44e8f8b 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/gorm-1.3.1 b/metadata/md5-cache/gnustep-apps/gorm-1.3.1
deleted file mode 100644
index be9d1e743b11..000000000000
--- a/metadata/md5-cache/gnustep-apps/gorm-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=gnustep-base/gnustep-make-2.0
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-gui-0.22.0 virtual/gnustep-back
-DESCRIPTION=A clone of the NeXTstep Interface Builder application for GNUstep
-EAPI=7
-HOMEPAGE=https://gnustep.github.io/experience/Gorm.html
-INHERIT=gnustep-2
-IUSE=debug doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3+ LGPL-2.1+
-RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 virtual/gnustep-back
-SLOT=0
-SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.3.1.tar.gz
-_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gnustep-2	cfafeebb1111f944995a3bb7ae64ce8b	gnustep-base	2b9571bc4b56a107f4efee592fa2f2a8	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=c3aaf75a03a3325c7f2670de3c1682d3
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 29bff9e3fce3..98c0fe6890fa 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/kajongg-24.08.1 b/metadata/md5-cache/kde-apps/kajongg-24.08.1-r1
index d370a87f071e..ea519ffaabfd 100644
--- a/metadata/md5-cache/kde-apps/kajongg-24.08.1
+++ b/metadata/md5-cache/kde-apps/kajongg-24.08.1-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 SLOT=6
 SRC_URI=mirror://kde/stable/release-service/24.08.1/src/kajongg-24.08.1.tar.xz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	ecm	fe5d0f686a62c5a29db9433ce94c2e31	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gear.kde.org	9eaba1558ae60129a59a7243175a309d	kde.org	5b717883256e9841ce52e6cad2fca427	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=491564dc6d48cfa4a623ec413b85bd97
+_md5_=1e708fc381852088335b6497cf3e0ad8
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 35108bbbe24a..f8a17faa6b8f 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.4.3 b/metadata/md5-cache/kde-misc/kdirstat-3.4.3
index 0b2424f6a98a..6134bcecf823 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.4.3
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.4.3
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/jeromerobert/k4dirstat
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/jeromerobert/k4dirstat/archive/3.4.3.tar.gz -> k4dirstat-3.4.3.tar.gz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	ecm	fe5d0f686a62c5a29db9433ce94c2e31	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a75c0e4ca72b65c5db4a641351e9ab01
+_md5_=dc2157a0ee9368440e24b7620f65381c
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index bedc45c7e1df..e88ea9fc3528 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-6.1.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-6.1.5-r1
index fcf81c6f11f8..7c9c02c22925 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-6.1.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-6.1.5-r1
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=mirror://kde/stable/plasma/6.1.5/plasma-workspace-6.1.5.tar.xz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	ecm	fe5d0f686a62c5a29db9433ce94c2e31	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kde.org	5b717883256e9841ce52e6cad2fca427	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	plasma.kde.org	04eb5849283348eac80db74a8749b14a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=6f2dbbbf7ee89a300bf12963aec79f1f
+_md5_=6a961b7221560c71fc536e4b2c54af07
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7cc16e14801d..3a4fa21e551c 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/freecad-1.0_rc1 b/metadata/md5-cache/media-gfx/freecad-1.0_rc1
new file mode 100644
index 000000000000..036e04a5fbec
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/freecad-1.0_rc1
@@ -0,0 +1,18 @@
+BDEPEND=app-text/dos2unix dev-lang/swig test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] ) !qt6? ( dev-qt/qttest:5 ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( sci-libs/vtk:=[qt5,rendering] ) qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2:=[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2:=[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2:=[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6:=[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6:=[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6:=[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/matplotlib[python_targets_python3_12(-)] >=dev-python/pivy-0.6.5[python_targets_python3_12(-)] dev-python/pyside6:=[gui,svg,webchannel,webengine,python_targets_python3_12(-)] dev-python/shiboken6:=[python_targets_python3_12(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_12(-)] ) fem? ( dev-python/ply[python_targets_python3_12(-)] ) ) >=dev-cpp/eigen-3.3.1:3 test? ( python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pyyaml[python_targets_python3_12(-)] ) !qt6? ( dev-qt/qttest:5 ) )
+DESCRIPTION=QT based Computer Aided Design application
+EAPI=8
+HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
+IUSE=debug designer +gui qt6 test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud netgen pcl python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64
+LICENSE=LGPL-2 CC-BY-SA-4.0
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype media-libs/qhull:= sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 sci-libs/opencascade:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/libusb:1 cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( !qt6? ( sci-libs/vtk:=[qt5,rendering] ) qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl !qt6? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 pcl? ( sci-libs/pcl[qt5] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside2:=[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside2:=[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken2:=[python_targets_python3_11(-)] ) ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pyside6:=[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken6:=[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/matplotlib[python_targets_python3_11(-)] >=dev-python/pivy-0.6.5[python_targets_python3_11(-)] dev-python/pyside6:=[gui,svg,webchannel,webengine,python_targets_python3_11(-)] dev-python/shiboken6:=[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/matplotlib[python_targets_python3_12(-)] >=dev-python/pivy-0.6.5[python_targets_python3_12(-)] dev-python/pyside6:=[gui,svg,webchannel,webengine,python_targets_python3_12(-)] dev-python/shiboken6:=[python_targets_python3_12(-)] ) ) ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_11(-)] ) fem? ( dev-python/ply[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/numpy[python_targets_python3_12(-)] dev-python/pybind11[python_targets_python3_12(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_12(-)] ) fem? ( dev-python/ply[python_targets_python3_12(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) designer? ( gui ) inspection? ( points ) path? ( robot ) python_single_target_python3_12? ( gui? ( qt6 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/1.0rc1.tar.gz -> freecad-1.0_rc1.tar.gz
+_eclasses_=check-reqs	f5db0b1ec36d0899adc2b41f8c447823	cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=38f5ff510454b18f78dc5afbc3d58666
diff --git a/metadata/md5-cache/media-gfx/hugin-2024.0_beta1 b/metadata/md5-cache/media-gfx/hugin-2024.0_beta1
new file mode 100644
index 000000000000..4cc6ed6fc3e0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hugin-2024.0_beta1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-db/sqlite:3 dev-libs/boost:= >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.2-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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 ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 )
+DESCRIPTION=GUI for the creation & processing of panoramic images
+EAPI=8
+HOMEPAGE=http://hugin.sf.net
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=python-single-r1 wxwidgets cmake xdg
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:= >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.2-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+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=https://downloads.sourceforge.net/hugin/hugin-2024.0beta1.tar.bz2
+_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=8e14e2cdbbfdf958ea804cb098dcebc7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a583fb490570..dc1572d5adbb 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/simage-9999 b/metadata/md5-cache/media-libs/simage-9999
index e941f2736bf5..254a3eab002d 100644
--- a/metadata/md5-cache/media-libs/simage-9999
+++ b/metadata/md5-cache/media-libs/simage-9999
@@ -1,16 +1,15 @@
 BDEPEND=test? ( media-libs/libsndfile ) app-alternatives/ninja >=dev-build/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) qt6? ( dev-qt/qtbase:6[gui] ) sndfile? ( media-libs/libsndfile media-libs/flac:= ) tiff? ( media-libs/tiff:=[lzma,zstd] app-arch/xz-utils app-arch/zstd:= ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/opus ) zlib? ( sys-libs/zlib:= )
+DEPEND=gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) qt6? ( dev-qt/qtbase:6[gui] ) sndfile? ( media-libs/libsndfile media-libs/flac:= ) tiff? ( media-libs/tiff:=[lzma,zstd] app-arch/xz-utils app-arch/zstd:= ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/opus ) zlib? ( sys-libs/zlib:= )
 DESCRIPTION=Image and video texturing library
 EAPI=8
 HOMEPAGE=https://github.com/coin3d/simage/
 INHERIT=cmake git-r3
-IUSE=gif jpeg png qt5 qt6 sndfile test tiff vorbis zlib
+IUSE=gif jpeg png qt6 sndfile test tiff vorbis zlib
 LICENSE=BSD-1
 PROPERTIES=live
-RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) qt6? ( dev-qt/qtbase:6[gui] ) sndfile? ( media-libs/libsndfile media-libs/flac:= ) tiff? ( media-libs/tiff:=[lzma,zstd] app-arch/xz-utils app-arch/zstd:= ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/opus ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=qt5? ( !qt6 )
+RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) qt6? ( dev-qt/qtbase:6[gui] ) sndfile? ( media-libs/libsndfile media-libs/flac:= ) tiff? ( media-libs/tiff:=[lzma,zstd] app-arch/xz-utils app-arch/zstd:= ) vorbis? ( media-libs/libogg media-libs/libvorbis media-libs/opus ) zlib? ( sys-libs/zlib:= )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	git-r3	875eb471682d3e1f18da124be97dcc81	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=66dddfd426abb1f32f1ffe65294ecf34
+_md5_=d4ae37e0e2118aaba9bf8d5175a660cd
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 625b7776ab34..c041ca689644 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
deleted file mode 100644
index 61eafc52675b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libmodplug-0.8.9.0
-DESCRIPTION=Modplug decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.modplug
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libmodplug-0.8.9.0
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.modplug/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-modplug-3.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=217c055b74395997e56139df4e52d178
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
deleted file mode 100644
index d51b0ceb53ae..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Nosefart decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.nosefart
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.nosefart/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-nosefart-3.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=c34f88411da870c7d7c508252013cd0b
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
deleted file mode 100644
index 69e1950a0207..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* media-sound/wavpack virtual/libiconv
-DESCRIPTION=Super Audio CD ISO-Image decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.sacd
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* media-sound/wavpack virtual/libiconv
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.sacd/archive/0.1.1-Matrix.tar.gz -> kodi-audiodecoder-sacd-0.1.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=174a7c2fa4f0695dd12845f87fc608a3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
deleted file mode 100644
index 4b8f024e2766..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* media-libs/libsidplay:2
-DESCRIPTION=SidPlay decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.sidplay
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* media-libs/libsidplay:2
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.sidplay/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-sidplay-3.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=f7620a2b76cf36e8245c127fe869aa7a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
deleted file mode 100644
index 897f4affdc4c..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=SPC decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.snesapu
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.snesapu/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-snesapu-3.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=9035dbbc65f5b78eece52352876a9448
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
deleted file mode 100644
index 862d31cbae34..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=SPC decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.stsound
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.stsound/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-stsound-3.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=c8e476996b1ea9a66e79f924594884d3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
deleted file mode 100644
index 604089954207..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Timidity decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.timidity
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.timidity/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=056f4cce952c3d1f97105a7577aa311a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
deleted file mode 100644
index 648d42bb6fff..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=vgmstream decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audiodecoder.vgmstream
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audiodecoder.vgmstream/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-vgmstream-3.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=cd822441b63c906c11d821c6b3b29916
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1
deleted file mode 100644
index 5ca118e6a814..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-19.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 media-libs/flac:=
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 media-libs/flac:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-flac-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=9d4c59f9b4602a8063a8f8972edf95c1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0
deleted file mode 100644
index c84b15f4f171..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
-DESCRIPTION=Lame MP3 encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.lame
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-lame-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=25eba38c709604c823e45235fac6710c
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0
deleted file mode 100644
index 6416ee96976f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 >=media-libs/libvorbis-1.3.6
-DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.5 >=media-libs/libvorbis-1.3.6
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-vorbis-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a34455158b0802a1fb66fc33598158e8
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0
deleted file mode 100644
index 5c6879b32551..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=WAV encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.wav
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/19.0.0-Matrix.tar.gz -> kodi-audioencoder-wav-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=0fb2c511b3c6e1bf19c4fc20f6419ac7
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0 b/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0
deleted file mode 100644
index 0a8564cf0399..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro/archive/19.0.0-Matrix.tar.gz -> kodi-game-libretro-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=8e1c96805943f2eb0fa8fb7bdfb49f17
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8
deleted file mode 100644
index a7af75419a6c..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* games-emulation/libretro-bnes
-DESCRIPTION=bNES GameClient for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro.bnes
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-bnes
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro.bnes/archive/0.83.0.8-Matrix.tar.gz -> kodi-game-libretro-bnes-0.83.0.8.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=183d227e31bbd4035621db12b2975929
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9
deleted file mode 100644
index 1393868ea475..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* games-emulation/libretro-dosbox
-DESCRIPTION=DOSBox GameClient for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro.dosbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-dosbox
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro.dosbox/archive/0.74.0.9-Matrix.tar.gz -> kodi-game-libretro-dosbox-0.74.0.9.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=fe3ae42420c385b42ed9879b7bc6b7fa
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16
deleted file mode 100644
index d2f3010621bb..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.51.0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* games-emulation/libretro-nestopia
-DESCRIPTION=Nestopia GameClient for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro.nestopia
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-nestopia
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.51.0.16-Matrix.tar.gz -> kodi-game-libretro-nestopia-1.51.0.16.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=1a74d1174748878f24cc8778097254db
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20
deleted file mode 100644
index 71b11871e752..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* games-emulation/libretro-snes9x
-DESCRIPTION=Snes9x GameClient for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro.snes9x
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-snes9x
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro.snes9x/archive/1.60.0.20-Matrix.tar.gz -> kodi-game-libretro-snes9x-1.60.0.20.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=95f0178e252f2bfcd77dcc6d6d897823
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118
deleted file mode 100644
index fc2a33ce5117..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.118
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* games-emulation/libretro-twentyfortyeight
-DESCRIPTION=2048 for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro.2048
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-twentyfortyeight
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro.2048/archive/1.0.0.118-Matrix.tar.gz -> kodi-game-libretro-twentyfortyeight-1.0.0.118.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=e5dc9ab1e5ae4b501a1d72fd686c2d8b
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0
deleted file mode 100644
index 4e1d418e9536..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.12.0
-DESCRIPTION=HEIF image decoder for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/imagedecoder.heif
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.12.0
-SLOT=0
-SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/19.0.0-Matrix.tar.gz -> kodi-imagedecoder-heif-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=557ca67d7749114bd6fec352af6daa25
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0
deleted file mode 100644
index 8dcaba9ec1cc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libjpeg-turbo-2.1.1 >=media-libs/libraw-0.20.2[jpeg,lcms] >=media-libs/lcms-2.12
-DESCRIPTION=RAW image decoder for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/imagedecoder.raw
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libjpeg-turbo-2.1.1 >=media-libs/libraw-0.20.2[jpeg,lcms] >=media-libs/lcms-2.12
-SLOT=0
-SRC_URI=https://github.com/xbmc/imagedecoder.raw/archive/19.0.0-Matrix.tar.gz -> kodi-imagedecoder-raw-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=979681db7b27a1d3ecd5dddc91240cd3
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0
deleted file mode 100644
index 04c3e9bf88e5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-19.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-19* test? ( dev-cpp/gtest )
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-INHERIT=cmake kodi-addon
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-19*
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-adaptive-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=e6eb9dbf94e1023552f1c9e89ea0137f
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
deleted file mode 100644
index 5c411d759080..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
-DESCRIPTION=Kodi's FFMpeg Direct Inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.ffmpegdirect
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.ffmpegdirect/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-ffmpegdirect-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=5105d516358a5473fab08ce7ea82ade6
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0
deleted file mode 100644
index 4b2491df14cc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-rtmp-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=804b475e5a6f7b44d7b6f58fca78a5ed
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0
deleted file mode 100644
index cdbf278d207b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/peripheral.joystick
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/19.0.0-Matrix.tar.gz -> kodi-peripheral-joystick-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=fd45399c680119538f4f5f7a37b713e2
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
deleted file mode 100644
index 2a91e62a10b8..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/7.1.2-Matrix.tar.gz -> kodi-pvr-argustv-7.1.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=7fa9b9e33616a2eae5c74104806777b1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4
deleted file mode 100644
index f6abdc2c2056..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Demo PVR for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/7.1.4-Matrix.tar.gz -> kodi-pvr-demo-7.1.4.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=ade8c58ea09056b637c7f963f6d6f9f9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2
deleted file mode 100644
index d9f8dbe82e29..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's DVBLink client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/9.1.2-Matrix.tar.gz -> kodi-pvr-dvblink-9.1.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=301d66a05d088298c61616ceb30e06cd
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
deleted file mode 100644
index c42ee436340b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.3.3-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=9b58362aff7ed1977336ae4e5797d5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
deleted file mode 100644
index 059da7fe7f69..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's Filmon client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/6.1.2-Matrix.tar.gz -> kodi-pvr-filmon-6.1.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=431ff8674f3d1d36a464011034d02c13
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
deleted file mode 100644
index a8b773680e57..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.4.0-Matrix.tar.gz -> kodi-pvr-hts-8.4.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
deleted file mode 100644
index 02a3fef073d5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.9-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.9.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1
deleted file mode 100644
index 950aae276a0d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's MediaPortal TVServer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/8.2.1-Matrix.tar.gz -> kodi-pvr-mediaportal-tvserver-8.2.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=fd8fcc7662099393dcc030866f97a248
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1
deleted file mode 100644
index 0b00870b4211..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib =media-tv/kodi-19*
-DESCRIPTION=MythTV PVR for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/janbar/pvr.mythtv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib =media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/janbar/pvr.mythtv/archive/7.3.1-Matrix.tar.gz -> kodi-pvr-mythtv-7.3.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=61f0c467cad40d9a09eb8dbfddb3780c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
deleted file mode 100644
index ffbc86a61ffa..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's NextPVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/8.2.6-Matrix.tar.gz -> kodi-pvr-nextpvr-8.2.6.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=ca4c53900186dc3ef139139d913d7f48
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1
deleted file mode 100644
index 60d0fd981c84..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's Njoy N7 client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-njoy-7.1.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=2d6182f884ad4c2d44614379ff5bcc97
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1
deleted file mode 100644
index 7e9f53d30827..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's PCTV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/6.1.1-Matrix.tar.gz -> kodi-pvr-pctv-6.1.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=68ab846f80772a64e43594d050ffb65e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1
deleted file mode 100644
index 82a995b4ff85..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-stalker-7.1.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=12c096ae873717f179782ffe61d59b82
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2
deleted file mode 100644
index 634d623936c8..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/8.1.2-Matrix.tar.gz -> kodi-pvr-vbox-8.1.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=0596d478586d35c389fe983899e5270a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.5 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-21.1.0
index fde29528a7f6..ff7e1d529378 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-21.1.0
@@ -1,14 +1,14 @@
 BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* virtual/opengl
+DEPEND==media-tv/kodi-21* virtual/opengl
 DESCRIPTION=Kodi PVR addon VNSI
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.vdr.vnsi
-INHERIT=cmake kodi-addon
+INHERIT=kodi-addon
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* virtual/opengl
+RDEPEND==media-tv/kodi-21* virtual/opengl
 SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/19.0.5-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-19.0.5.tar.gz
+SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/21.1.0-Omega.tar.gz -> kodi-pvr-vdr-vnsi-21.1.0.tar.gz
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=857d3c70e92a5064364986048cf5aff9
+_md5_=2d95e236daaad372bce7cfdd028ba8cb
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
deleted file mode 100644
index 2488d539b5d6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.9-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.9.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2
deleted file mode 100644
index d1bc9ed230b2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
-DESCRIPTION=Kodi's Windows Media Center client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.wmc
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/6.1.2-Matrix.tar.gz -> kodi-pvr-wmc-6.1.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=dc7ad21c98b3a7f1ba483e16ab11ab6d
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9 b/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9
deleted file mode 100644
index 703324355db0..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-zattoo-19.7.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/rapidjson dev-libs/tinyxml2 virtual/opengl
-DESCRIPTION=Zattoo PVR addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/rbuehlma/pvr.zattoo
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* dev-libs/rapidjson dev-libs/tinyxml2 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/rbuehlma/pvr.zattoo/archive/19.7.9-Matrix.tar.gz -> kodi-pvr-zattoo-19.7.9.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=e92a1f1a0917c209207f355d5ed736aa
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
deleted file mode 100644
index 0b8ea8492b20..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-DESCRIPTION=Asteroids screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.asteroids
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.4.2-Matrix.tar.gz -> kodi-screensaver-asteroids-2.4.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=dede65626323cb615b6ae68a152f6527
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0
deleted file mode 100644
index 55b5575f9b8f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asterwave-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-DESCRIPTION=AsterWave screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.asterwave
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.asterwave/archive/3.3.0-Matrix.tar.gz -> kodi-screensaver-asterwave-3.3.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=bdc29dcda0614f1d44f7a6d3e76c206d
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
deleted file mode 100644
index 09799afbe7f7..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:=
-DESCRIPTION=Biogenesis screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.biogenesis
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.biogenesis/archive/2.3.2-Matrix.tar.gz -> kodi-screensaver-biogenesis-2.3.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=d127c0cfd164c99fa9641cdd6320b5f1
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0
deleted file mode 100644
index a95648dfa67b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-cpblobs-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-DESCRIPTION=CpBlobs screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.cpblobs
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.cpblobs/archive/3.4.0-Matrix.tar.gz -> kodi-screensaver-cpblobs-3.4.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=6e533b5b5f61b9892d41432c4406d054
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
deleted file mode 100644
index 2e2b01ef696c..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Greynetic screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.greynetic
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.3.1-Matrix.tar.gz -> kodi-screensaver-greynetic-2.3.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=2f0b3ad46cb73f7ad9e2b7911b0968a7
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
deleted file mode 100644
index e5785f895050..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= virtual/opengl
-DESCRIPTION=Matrix Trails screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.matrixtrails
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.6.0-Matrix.tar.gz -> kodi-screensaver-matrixtrails-2.6.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
deleted file mode 100644
index ef16436a8575..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Ping-pong screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.pingpong
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.2.2-Matrix.tar.gz -> kodi-screensaver-pingpong-2.2.2.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=6a68882ed13e769e373af1c03228162f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
deleted file mode 100644
index c8a1f9f6d29e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Pyro screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.pyro
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/3.3.0-Matrix.tar.gz -> kodi-screensaver-pyro-3.3.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=0b1f116859e4049e61dc8c1d4a0f5b69
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0
deleted file mode 100644
index ee2e96266aa6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-shadertoy-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-DESCRIPTION=Shadertoy screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.shadertoy
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.shadertoy/archive/3.2.0-Matrix.tar.gz -> kodi-screensaver-shadertoy-3.2.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=b2477d7861b154004fab27455c824f75
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0
deleted file mode 100644
index 77ed13265d40..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-stars-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:=
-DESCRIPTION=Stars screensaver for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/screensaver.stars
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/screensaver.stars/archive/2.4.0-Matrix.tar.gz -> kodi-screensaver-stars-2.4.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=805915a02d5381f9f99b64408e5c5b32
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1
deleted file mode 100644
index 08c131314a08..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 >=dev-libs/openssl-1.0.2l:0= =media-tv/kodi-19*
-DESCRIPTION=Libarchive VFS add-on for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/vfs.libarchive
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib(+)] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 >=dev-libs/openssl-1.0.2l:0= =media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/vfs.libarchive/archive/2.0.1-Matrix.tar.gz -> kodi-vfs-libarchive-2.0.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=22e1a62ecf4c0a01553e98f1fb5a370c
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
deleted file mode 100644
index 374e8423a8a5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= dev-libs/tinyxml
-DESCRIPTION=RAR VFS addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/vfs.rar
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/xbmc/vfs.rar/archive/4.0.0-Matrix.tar.gz -> kodi-vfs-rar-4.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=3a38ed5767e64262b547a27fcab44b8c
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
deleted file mode 100644
index 1a5ba8a7bb8e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libssh[sftp] =media-tv/kodi-19*
-DESCRIPTION=SFTP VFS addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/vfs.sftp
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libssh[sftp] =media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/vfs.sftp/archive/2.0.0-Matrix.tar.gz -> kodi-vfs-sftp-2.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a0aa61d143e649eec34bc9769a39e478
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0
deleted file mode 100644
index 9f65c319288c..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Fische visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.fishbmc
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-fishbmc-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=ec5b0b0ec5f35ff49463a1e738be49c3
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0
deleted file mode 100644
index ef3ddb2e16c9..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Goom visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.goom
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.goom/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-goom-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=749b963c94def9a8e728097f547fe7fc
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1
deleted file mode 100644
index 94e3a7e0aac6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
-DESCRIPTION=ProjectM visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.projectm
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.projectm/archive/19.0.1-Matrix.tar.gz -> kodi-visualization-projectm-19.0.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=4964b85457f7f784849f20a665508551
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1
deleted file mode 100644
index c6e08c8d847b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-19.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Shadertoy visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.shadertoy
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/19.1.1-Matrix.tar.gz -> kodi-visualization-shadertoy-19.1.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=a1221ed7342575e69acd92d7f34b0abb
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
deleted file mode 100644
index 66bcb6fed423..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Spectrum visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.spectrum
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-spectrum-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=c00a342acbe1661f9acba1676d4b5db9
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
deleted file mode 100644
index ee16dd4b69e5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=StarBurst visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.starburst
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.starburst/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-starburst-19.0.0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=d158c26ce5ad6c301e4223c7fa3e1335
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1
deleted file mode 100644
index df104fc334a5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Waveform visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.waveform
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.waveform/archive/19.0.1-Matrix.tar.gz -> kodi-visualization-waveform-19.0.1.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=18f09748a43ba9bdab749ddcc3c3e74b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d8f421446d4b..a31d06160a8d 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/picard-2.12.1 b/metadata/md5-cache/media-sound/picard-2.12.1
index 1615e296d5a8..940a6ed40e1e 100644
--- a/metadata/md5-cache/media-sound/picard-2.12.1
+++ b/metadata/md5-cache/media-sound/picard-2.12.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://picard.musicbrainz.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=discid fingerprints nls test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/pyjwt[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/discid[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/fasteners[python_targets_python3_11(-)] dev-python/pyjwt[python_targets_python3_11(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] media-libs/mutagen[python_targets_python3_11(-)] discid? ( dev-python/discid[python_targets_python3_11(-)] ) ) python_single_target_python3_12? ( dev-python/fasteners[python_targets_python3_12(-)] dev-python/pyjwt[python_targets_python3_12(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] media-libs/mutagen[python_targets_python3_12(-)] discid? ( dev-python/discid[python_targets_python3_12(-)] ) ) python_single_target_python3_13? ( dev-python/fasteners[python_targets_python3_13(-)] dev-python/pyjwt[python_targets_python3_13(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_13(-)] dev-python/python-dateutil[python_targets_python3_13(-)] dev-python/pyyaml[python_targets_python3_13(-)] media-libs/mutagen[python_targets_python3_13(-)] discid? ( dev-python/discid[python_targets_python3_13(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://data.musicbrainz.org/pub/musicbrainz/picard/picard-2.12.1.tar.gz
 _eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=d7d0b6e6258b528bafafb6d17368db39
+_md5_=da8a473a051b08fd85e6ac5c2d9506a0
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index b178b749b156..1c4b544e6e63 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-19.5-r2 b/metadata/md5-cache/media-tv/kodi-19.5-r2
deleted file mode 100644
index bfcf70b1c6bc..000000000000
--- a/metadata/md5-cache/media-tv/kodi-19.5-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-build/cmake dev-lang/swig media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4] <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-INHERIT=autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4] <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.5-Matrix.tar.gz -> kodi-19.5-Matrix.tar.gz
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	cmake	10a50dfaf728b802fcfd37f8d0da9056	desktop	56973babb9c5f19cab0eeb53ece644c6	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pax-utils	6285e04fab2343992d2df0df4edf6003	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=e6b15a286da53fcdca09d8973afa7b9c
diff --git a/metadata/md5-cache/media-tv/kodi-20.5-r1 b/metadata/md5-cache/media-tv/kodi-20.5-r1
deleted file mode 100644
index 93d5efb4b06b..000000000000
--- a/metadata/md5-cache/media-tv/kodi-20.5-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-libs/flatbuffers-1.12.0:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) dev-build/cmake <dev-lang/swig-4.2.0 virtual/pkgconfig <=virtual/jre-17:* doc? ( app-text/doxygen ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/flatbuffers-1.12.0:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.13.4:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.24:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4] <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] ) ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[encode,postproc,vaapi?,vdpau?,X?] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 media-libs/dav1d:= ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) wayland? ( >=dev-libs/wayland-protocols-1.7 ) X? ( x11-base/xorg-proto x11-libs/libXrender ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=8
-HOMEPAGE=https://kodi.tv/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/flatbuffers-1.12.0:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.13.4:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.24:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin >=media-libs/mesa-24.1.0_rc1[opengl,video_cards_vc4] <media-libs/mesa-24.1.0_rc1[egl(+),gles2,video_cards_vc4] ) ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[encode,postproc,vaapi?,vdpau?,X?] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 media-libs/dav1d:= ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.55:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) gbm? ( udev ) udev? ( !libusb ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz -> ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz ) https://github.com/xbmc/xbmc/archive/20.5-Nexus.tar.gz -> kodi-20.5-Nexus.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	desktop	56973babb9c5f19cab0eeb53ece644c6	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	java-pkg-2	72587187cd548a5dcdb6a13453a3614d	java-utils-2	505f237da61d30569dcc6d5df8c51262	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	6285e04fab2343992d2df0df4edf6003	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=82243488cdbded62144c20bebf6f96d5
diff --git a/metadata/md5-cache/media-tv/kodi-21.1 b/metadata/md5-cache/media-tv/kodi-21.1
index 92a6c8aadbdc..9e65923121be 100644
--- a/metadata/md5-cache/media-tv/kodi-21.1
+++ b/metadata/md5-cache/media-tv/kodi-21.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://kodi.tv/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 toolchain-funcs xdg
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~riscv ~x86
 LICENSE=GPL-2+ Apache-2.0 GPL-2+ !system-ffmpeg? ( GPL-2 )
 RDEPEND=>=dev-libs/flatbuffers-23.3.3:= >=dev-libs/lzo-2.04:2 media-libs/giflib:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= wayland? ( dev-cpp/waylandpp:= ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,ssl] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,ssl] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite,ssl] ) >=net-misc/curl-7.68.0[http2] >=sys-libs/zlib-1.2.11 dev-db/sqlite:3 dev-libs/crossguid >=dev-libs/fribidi-1.0.5 >=dev-libs/libcdio-2.1.0:=[cxx] >=dev-libs/libfmt-6.1.2:= dev-libs/libfstrcmp dev-libs/libpcre[cxx] >=dev-libs/openssl-1.1.1k:0= >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] dev-libs/tinyxml2:= media-fonts/roboto media-libs/libglvnd[X?] >=media-libs/freetype-2.10.1 media-libs/harfbuzz:= >=media-libs/libass-0.15.0:= media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] >=media-libs/taglib-1.9.0 sci-libs/kissfft virtual/libiconv virtual/ttf-fonts x11-libs/libdrm python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/pillow[python_targets_python3_12(-)] dev-python/pycryptodome[python_targets_python3_12(-)] ) airplay? ( >=app-pda/libplist-2.0.0:= net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez:= ) bluray? ( >=media-libs/libbluray-1.1.2:= ) caps? ( sys-libs/libcap ) cec? ( >=dev-libs/libcec-4.0[-cubox] ) dbus? ( sys-apps/dbus ) gbm? ( >=dev-libs/libinput-1.10.5:= media-libs/libdisplay-info x11-libs/libxkbcommon ) gles? ( || ( >=media-libs/mesa-24.1.0_rc1[opengl] <media-libs/mesa-24.1.0_rc1[gles2] ) ) !gles? ( media-libs/glu ) lcms? ( >=media-libs/lcms-2.10:2 ) libusb? ( virtual/libusb:1 ) lirc? ( app-misc/lirc ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) nfs? ( >=net-fs/libnfs-2.0.0:= ) pipewire? ( >=media-video/pipewire-0.3.50:= ) pulseaudio? ( media-libs/libpulse ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) system-ffmpeg? ( =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] ) !system-ffmpeg? ( app-arch/bzip2 app-arch/xz-utils media-libs/dav1d:= net-libs/gnutls:= ) udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/libudev:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) ) wayland? ( >=x11-libs/libxkbcommon-0.4.1[wayland] ) webserver? ( >=net-libs/libmicrohttpd-0.9.77:=[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-java/java-config-2.2.0-r3
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) gbm? ( udev ) soc? ( system-ffmpeg ) udev? ( !libusb ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip https://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz https://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz css? ( https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2-2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz ) !system-ffmpeg? ( https://ffmpeg.org/releases/ffmpeg-6.0.1.tar.gz ) https://github.com/xbmc/xbmc/archive/21.1-Omega.tar.gz -> kodi-21.1-Omega.tar.gz
 _eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	cmake	10a50dfaf728b802fcfd37f8d0da9056	desktop	56973babb9c5f19cab0eeb53ece644c6	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	java-pkg-2	72587187cd548a5dcdb6a13453a3614d	java-utils-2	505f237da61d30569dcc6d5df8c51262	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	6285e04fab2343992d2df0df4edf6003	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=4009bd9297dae71346bee7a472fb8281
+_md5_=58ba2b917a7ea0d78fa6c5e61c951742
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index bba81789e36f..e721f6e7497c 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/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 3637f2649479..544c32206582 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) virtual/pkgconfig cli? ( dev-python/docutils ) 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 postinst postrm preinst setup test unpack
-DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-6.1:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads(+),video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) vulkan? ( dev-util/vulkan-headers ) wayland? ( dev-libs/wayland-protocols )
+DEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?] >=media-video/ffmpeg-6.1:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads(+),video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto ) dvb? ( sys-kernel/linux-headers ) nvenc? ( media-libs/nv-codec-headers ) vulkan? ( dev-util/vulkan-headers ) wayland? ( dev-libs/wayland-protocols )
 DESCRIPTION=Media player for the command line
 EAPI=8
 HOMEPAGE=https://mpv.io/
@@ -9,9 +9,9 @@ INHERIT=flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
 IUSE=+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv zimg zlib lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13
 LICENSE=LGPL-2.1+ GPL-2+ BSD ISC MIT
 PROPERTIES=live
-RDEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-6.1:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads(+),video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) selinux? ( sec-policy/selinux-mplayer ) tools? ( 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 ) )
+RDEPEND=media-libs/libass:=[fontconfig] >=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?] >=media-video/ffmpeg-6.1:=[encode,soc(-)?,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( x11-libs/libdrm egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd media-libs/libplacebo[opengl] ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads(+),video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 python_single_target_python3_13 ) || ( cli libmpv ) egl? ( || ( X drm wayland ) ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( || ( egl opengl vulkan ) ) opengl? ( || ( X aqua ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( X drm wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) ) xv? ( X )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	git-r3	875eb471682d3e1f18da124be97dcc81	lua-single	3ae43cac1bf8275a847245b9a475a54e	lua-utils	1f91de68f9a26642216e45d7765fd4fb	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	6285e04fab2343992d2df0df4edf6003	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=3ad260374b182715f709c1584b7b05e7
+_md5_=f90ff918d6bf35c4ebdc37265d10a44a
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index dbbd1029ebe0..b9129d847c74 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/notus-scanner-22.6.4 b/metadata/md5-cache/net-analyzer/notus-scanner-22.6.4-r1
index 504126158351..a7016a63959f 100644
--- a/metadata/md5-cache/net-analyzer/notus-scanner-22.6.4
+++ b/metadata/md5-cache/net-analyzer/notus-scanner-22.6.4-r1
@@ -1,10 +1,10 @@
 BDEPEND=test? ( acct-user/gvm net-libs/paho-mqtt-c >=dev-python/psutil-6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-gnupg-0.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/packaging-24.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/paho-mqtt-1.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] app-misc/mosquitto 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/poetry-core-1.9.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install postinst preinst prepare test
 DEPEND=acct-user/gvm net-libs/paho-mqtt-c >=dev-python/psutil-6.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/python-gnupg-0.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/packaging-24.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/paho-mqtt-1.5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DESCRIPTION=Notus is a vulnerability scanner for creating results from local security checks
 EAPI=8
 HOMEPAGE=https://github.com/greenbone/notus-scanner
-INHERIT=distutils-r1 readme.gentoo-r1 systemd
+INHERIT=distutils-r1 greadme systemd
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 AGPL-3+
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/notus-scanner/archive/refs/tags/v22.6.4.tar.gz -> notus-scanner-22.6.4.tar.gz
-_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=4cd7ab86dedb6ddca63e13a655a5906a
+_eclasses_=distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	greadme	0d8804ed37a2bcbd1f7d1e0695c30662	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=c26282c823f94ae7e3341861ded80538
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 340b8c05f37a..e0de848a51d7 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.18-r2 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.18-r2
index a89e969efa40..3bc0f3c3e866 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.18-r2
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.18-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/xelerance/xl2tpd
 INHERIT=systemd toolchain-funcs tmpfiles
 IUSE=+kernel
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.18.tar.gz -> xl2tpd-1.3.18.tar.gz
 _eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	systemd	0f241b5c9f3758c3d3423df59a7f655a	tmpfiles	abdfd90f8841c1cb4b94575d5d109952	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=35ff193d3b78d027c31f9c85b676379a
+_md5_=437e59f353da88006bc5260cea1995e6
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b5824bfbef4d..12b4b2b63222 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/whatsie-4.15.5 b/metadata/md5-cache/net-im/whatsie-4.15.5
new file mode 100644
index 000000000000..7c300c25cbf0
--- /dev/null
+++ b/metadata/md5-cache/net-im/whatsie-4.15.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=x11-libs/libX11 x11-libs/libxcb:= >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtpositioning-5.15:5 >=dev-qt/qtwebengine-5.15:5[widgets] >=dev-qt/qtwidgets-5.15:5
+DESCRIPTION=Qt Based WhatsApp Client
+EAPI=8
+HOMEPAGE=https://github.com/keshavbhatt/whatsie
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=qmake-utils xdg
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libxcb:= >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtpositioning-5.15:5 >=dev-qt/qtwebengine-5.15:5[widgets] >=dev-qt/qtwidgets-5.15:5
+SLOT=0
+SRC_URI=https://github.com/keshavbhatt/whatsie/archive/refs/tags/v4.15.5.tar.gz -> whatsie-4.15.5.tar.gz
+_eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=260270a8eeb25e1a844c2f4a7bb1ad3d
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 5cb5f167332a..64a0b7800204 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/irssi-xmpp-0.54 b/metadata/md5-cache/net-irc/irssi-xmpp-0.54
deleted file mode 100644
index c33ca286e7a7..000000000000
--- a/metadata/md5-cache/net-irc/irssi-xmpp-0.54
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=net-irc/irssi net-libs/loudmouth
-DESCRIPTION=Irssi plugin providing Jabber/XMPP support
-EAPI=7
-HOMEPAGE=https://github.com/cdidier/irssi-xmpp
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-irc/irssi net-libs/loudmouth
-SLOT=0
-SRC_URI=https://github.com/cdidier/irssi-xmpp/archive/v0.54.tar.gz -> irssi-xmpp-0.54.tar.gz https://dev.gentoo.org/~sam/distfiles/net-irc/irssi-xmpp/irssi-xmpp-0.54-musl-build.patch
-_eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=5c1c09d21bd6898e1e1f420b1176ecc2
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0f975326f12e..8562c4427ba1 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/libgssglue-0.4-r1 b/metadata/md5-cache/net-libs/libgssglue-0.4-r1
deleted file mode 100644
index fdbce1d81fef..000000000000
--- a/metadata/md5-cache/net-libs/libgssglue-0.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Exports a gssapi interface which calls other random gssapi libraries
-EAPI=7
-HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=!app-crypt/libgssapi
-SLOT=0
-SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/libgssglue-0.4.tar.gz
-_md5_=c7e4ab9d83a40b2a5755103bc9bbaeab
diff --git a/metadata/md5-cache/net-libs/libgssglue-0.9 b/metadata/md5-cache/net-libs/libgssglue-0.9
index b52962ce6599..38935789225d 100644
--- a/metadata/md5-cache/net-libs/libgssglue-0.9
+++ b/metadata/md5-cache/net-libs/libgssglue-0.9
@@ -2,7 +2,7 @@ BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Exports a gssapi interface which calls other random gssapi libraries
 EAPI=8
-HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue
+HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/ https://gitlab.com/gsasl/libgssglue
 INHERIT=autotools readme.gentoo-r1
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=virtual/krb5
 SLOT=0
 SRC_URI=https://gitlab.com/gsasl/libgssglue/-/archive/libgssglue-0.9/libgssglue-libgssglue-0.9.tar.bz2
 _eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	multilib	7e1347c006a76bb812f3a9f663b79991	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=0fec75addf97ad13b14075528560ccbc
+_md5_=f60164d57b3e3e8024b60772fedd1366
diff --git a/metadata/md5-cache/net-libs/libnatpmp-20150609 b/metadata/md5-cache/net-libs/libnatpmp-20150609
deleted file mode 100644
index f16838a82e8c..000000000000
--- a/metadata/md5-cache/net-libs/libnatpmp-20150609
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=An alternative protocol to UPnP IGD specification
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/libnatpmp.html https://miniupnp.tuxfamily.org/libnatpmp.html https://github.com/miniupnp/libnatpmp/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://miniupnp.tuxfamily.org/files/libnatpmp-20150609.tar.gz
-_eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=418e1db242bd17b53b09a124aa29b76c
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.63.0 b/metadata/md5-cache/net-libs/nghttp2-1.63.0
new file mode 100644
index 000000000000..d58a85439391
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.63.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( >=sys-apps/systemd-209 ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=8
+HOMEPAGE=https://nghttp2.org/
+INHERIT=cmake-multilib
+IUSE=debug hpack-tools jemalloc static-libs systemd test utils xml 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( >=sys-apps/systemd-209 ) xml? ( >=dev-libs/libxml2-2.7.7: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? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nghttp2-1.63.0.tar.xz
+_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multilib-build	8cdc28ee17e24f9f57730a28fe166a21	multilib-minimal	b93489cf816ff90770a3c1c61b25db44	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=73fb6d2b459ae8d386a3a3a2b5e42636
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b69a3d8ff1f8..8b1ccfa4abe6 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/asterisk-base-3 b/metadata/md5-cache/net-misc/asterisk-base-3
index f5071735342e..1b5ca44d1304 100644
--- a/metadata/md5-cache/net-misc/asterisk-base-3
+++ b/metadata/md5-cache/net-misc/asterisk-base-3
@@ -4,10 +4,10 @@ DESCRIPTION=Gentoo Asterisk init scripts
 EAPI=8
 HOMEPAGE=https://github.com/jkroonza/asterisk-base
 INHERIT=systemd tmpfiles
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=net-misc/asterisk !<=net-misc/asterisk-16.30.0:0/16 !<=net-misc/asterisk-18.18.0:0/18 !<=net-misc/asterisk-20.3.0:0/20 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/jkroonza/asterisk-base/archive/refs/tags/v3.tar.gz -> asterisk-base-3.tar.gz
 _eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	systemd	0f241b5c9f3758c3d3423df59a7f655a	tmpfiles	abdfd90f8841c1cb4b94575d5d109952	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=ec0c5715b6cd043ce517dfd7940b1061
+_md5_=185a947f7791f631cc4c24d09a9ee033
diff --git a/metadata/md5-cache/net-misc/axel-2.17.13 b/metadata/md5-cache/net-misc/axel-2.17.13
index 085b8bbc98db..e6d6f4408fe6 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.13
+++ b/metadata/md5-cache/net-misc/axel-2.17.13
@@ -10,4 +10,4 @@ LICENSE=GPL-2+
 RDEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.13/axel-2.17.13.tar.xz
-_md5_=e510cfe91d025d088e65bf544813df34
+_md5_=89c034acc109a4133e7c0fd5f15eb4ba
diff --git a/metadata/md5-cache/net-misc/axel-2.17.10 b/metadata/md5-cache/net-misc/axel-2.17.14
index f3b195983bc9..cd6ea2b6d495 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.10
+++ b/metadata/md5-cache/net-misc/axel-2.17.14
@@ -1,12 +1,13 @@
+BDEPEND=nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure postinst
-DEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( sys-devel/gettext )
+DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Light Unix download accelerator
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
-IUSE=debug nls ssl
-KEYWORDS=amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
+IUSE=nls ssl
+KEYWORDS=~amd64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
 RDEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
-SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.10/axel-2.17.10.tar.xz
-_md5_=57395ab615b4e62a01426de71d99be21
+SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.14/axel-2.17.14.tar.xz
+_md5_=355f6c355b16a5d0a19d9774634f4dd6
diff --git a/metadata/md5-cache/net-misc/curl-8.10.0 b/metadata/md5-cache/net-misc/curl-8.10.0-r1
index 561677e22278..cdf01f493680 100644
--- a/metadata/md5-cache/net-misc/curl-8.10.0
+++ b/metadata/md5-cache/net-misc/curl-8.10.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.10.0.tar.xz verify-sig? ( https://curl.se/download/curl-8.10.0.tar.xz.asc )
 _eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multilib-build	8cdc28ee17e24f9f57730a28fe166a21	multilib-minimal	b93489cf816ff90770a3c1c61b25db44	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	prefix	629161311cdf29bf8596fdd036826a2c	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=d789fcada1ca44c979016de328e1e779
+_md5_=39b9639f531769f27e65c1c191ee2017
diff --git a/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.8 b/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.8
deleted file mode 100644
index 6c9b9262c3b4..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-ui-0.7.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/libintl virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 ) libnotify? ( x11-libs/libnotify ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/mesa ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop notification and configuration for dhcpcd
-EAPI=7
-HOMEPAGE=https://github.com/NetworkConfiguration/dhcpcd-ui https://roy.marples.name/projects/dhcpcd-ui/
-INHERIT=qmake-utils systemd xdg
-IUSE=debug gtk libnotify ncurses qt5
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 ) libnotify? ( x11-libs/libnotify ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/mesa ) >=net-misc/dhcpcd-6.4.4
-REQUIRED_USE=libnotify? ( gtk ) qt5? ( !libnotify )
-SLOT=0
-SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-0.7.8.tar.xz
-_eclasses_=multilib	7e1347c006a76bb812f3a9f663b79991	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=0a735688e0316f6e144e3bf0fa26abba
diff --git a/metadata/md5-cache/net-misc/dropbear-2024.85-r2 b/metadata/md5-cache/net-misc/dropbear-2024.85-r2
new file mode 100644
index 000000000000..56687f02aa6d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbear-2024.85-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( sys-libs/nss_wrapper || ( ( dev-lang/python:3.13 dev-python/attrs[python_targets_python3_13(-)] dev-python/iniconfig[python_targets_python3_13(-)] dev-python/packaging[python_targets_python3_13(-)] dev-python/pluggy[python_targets_python3_13(-)] dev-python/py[python_targets_python3_13(-)] dev-python/pyparsing[python_targets_python3_13(-)] dev-python/pytest[python_targets_python3_13(-)] dev-python/psutil[python_targets_python3_13(-)] ) ( dev-lang/python:3.12 dev-python/attrs[python_targets_python3_12(-)] dev-python/iniconfig[python_targets_python3_12(-)] dev-python/packaging[python_targets_python3_12(-)] dev-python/pluggy[python_targets_python3_12(-)] dev-python/py[python_targets_python3_12(-)] dev-python/pyparsing[python_targets_python3_12(-)] dev-python/pytest[python_targets_python3_12(-)] dev-python/psutil[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/attrs[python_targets_python3_11(-)] dev-python/iniconfig[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] dev-python/pluggy[python_targets_python3_11(-)] dev-python/py[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/attrs[python_targets_python3_10(-)] dev-python/iniconfig[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] dev-python/pluggy[python_targets_python3_10(-)] dev-python/py[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-dropbear ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) static? ( virtual/libcrypt[static-libs(+)] zlib? ( sys-libs/zlib[static-libs(+)] ) )
+DESCRIPTION=Small SSH 2 client/server designed for small memory environments
+EAPI=8
+HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
+INHERIT=pam python-any-r1 savedconfig verify-sig
+IUSE=bsdpty minimal multicall pam +shadow static +syslog test zlib savedconfig verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT GPL-2
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
+REQUIRED_USE=pam? ( !static )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2024.85.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2024.85.tar.bz2 verify-sig? ( https://matt.ucc.asn.au/dropbear/releases/dropbear-2024.85.tar.bz2.asc https://matt.ucc.asn.au/dropbear/testing/dropbear-2024.85.tar.bz2.asc )
+_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	pam	b56d0c9c20fc5b553f13c8ae165a10a5	portability	01f478fa22185b3606f2d4adea4675ed	python-any-r1	5af215c3da6aef17a2d5e02968df1d5a	python-utils-r1	6881b056477c23167d9a6b33e146374e	savedconfig	b9131abe556ad2ea96c01b06d658d363	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	verify-sig	a79ba011daaf532d71a219182474d150
+_md5_=ac207ec1d1d19a51a652da49aacf41be
diff --git a/metadata/md5-cache/net-misc/libteam-1.23 b/metadata/md5-cache/net-misc/libteam-1.23
deleted file mode 100644
index a15ae72ab84b..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.23
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 setup
-DEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=7
-HOMEPAGE=http://libteam.org
-INHERIT=autotools linux-info
-IUSE=dbus debug examples static-libs +syslog zmq
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=https://github.com/jpirko/libteam/archive/v1.23.tar.gz -> libteam-1.23.tar.gz
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=bb7e3a096432cbd20475db5c78883e9d
diff --git a/metadata/md5-cache/net-misc/libteam-1.31-r1 b/metadata/md5-cache/net-misc/libteam-1.31-r1
deleted file mode 100644
index ba587ebc6f84..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.31-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 setup
-DEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=7
-HOMEPAGE=http://libteam.org
-INHERIT=autotools linux-info
-IUSE=dbus debug examples static-libs +syslog zmq
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=https://github.com/jpirko/libteam/archive/v1.31.tar.gz -> libteam-1.31.tar.gz
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=a1f8dc5ba129b425260f82cea605d565
diff --git a/metadata/md5-cache/net-misc/libteam-1.32 b/metadata/md5-cache/net-misc/libteam-1.32-r1
index ba7a69a07378..6249e2f7b053 100644
--- a/metadata/md5-cache/net-misc/libteam-1.32
+++ b/metadata/md5-cache/net-misc/libteam-1.32-r1
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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
+BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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=configure install prepare setup
 DEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
 DESCRIPTION=Library and tools set for controlling team network device
 EAPI=8
 HOMEPAGE=https://libteam.org
-INHERIT=autotools linux-info
+INHERIT=autotools linux-info systemd
 IUSE=dbus debug examples static-libs +syslog zmq
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.32.tar.gz -> libteam-1.32.tar.gz
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=940a68aee7a248b157e31f9032d148f2
+_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=10565f3f12aa891a896bc501e589ce9d
diff --git a/metadata/md5-cache/net-misc/libteam-9999 b/metadata/md5-cache/net-misc/libteam-9999
index 9b8333107291..a3b4d44822ee 100644
--- a/metadata/md5-cache/net-misc/libteam-9999
+++ b/metadata/md5-cache/net-misc/libteam-9999
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 )
 DESCRIPTION=Library and tools set for controlling team network device
 EAPI=8
 HOMEPAGE=https://libteam.org
-INHERIT=autotools linux-info git-r3
+INHERIT=autotools linux-info systemd git-r3
 IUSE=dbus debug examples static-libs +syslog zmq
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=940a68aee7a248b157e31f9032d148f2
+_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	git-r3	875eb471682d3e1f18da124be97dcc81	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
+_md5_=cda496001010da2c1da8d6e4f3b7b50f
diff --git a/metadata/md5-cache/net-misc/tipcutils-2.0.3 b/metadata/md5-cache/net-misc/tipcutils-2.0.3
deleted file mode 100644
index 53692ac726bd..000000000000
--- a/metadata/md5-cache/net-misc/tipcutils-2.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for TIPC (Transparent Inter-Process Communication)
-EAPI=7
-HOMEPAGE=https://tipc.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( BSD-2 GPL-2 )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/tipc/tipcutils-2.0.3.tar.gz
-_md5_=a013e2857ef9bd562ba737ba4b4805a2
diff --git a/metadata/md5-cache/net-misc/tuba-0.8.2 b/metadata/md5-cache/net-misc/tuba-0.8.2
deleted file mode 100644
index 5f75130b7bc5..000000000000
--- a/metadata/md5-cache/net-misc/tuba-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) sys-devel/gettext virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=app-crypt/libsecret[introspection,vala] >=dev-libs/glib-2.76.0:2 dev-libs/icu:= >=dev-libs/json-glib-1.4.4[introspection] >=dev-libs/libgee-0.8.5:0.8[introspection] dev-libs/libxml2 >=gui-libs/gtk-4.13.4:4[gstreamer,introspection] >=gui-libs/libadwaita-1.5:1[introspection,vala] >=gui-libs/gtksourceview-5.6.0:5[introspection,vala] net-libs/libsoup:3.0[introspection,vala]
-DESCRIPTION=Browse the Fediverse (GTK client)
-EAPI=8
-HOMEPAGE=https://tuba.geopjr.dev/ https://github.com/GeopJr/Tuba/
-INHERIT=gnome2-utils meson optfeature vala
-KEYWORDS=amd64 arm64
-LICENSE=GPL-3 CC-BY-SA-4.0
-RDEPEND=app-crypt/libsecret[introspection,vala] >=dev-libs/glib-2.76.0:2 dev-libs/icu:= >=dev-libs/json-glib-1.4.4[introspection] >=dev-libs/libgee-0.8.5:0.8[introspection] dev-libs/libxml2 >=gui-libs/gtk-4.13.4:4[gstreamer,introspection] >=gui-libs/libadwaita-1.5:1[introspection,vala] >=gui-libs/gtksourceview-5.6.0:5[introspection,vala] net-libs/libsoup:3.0[introspection,vala]
-SLOT=0
-SRC_URI=https://github.com/GeopJr/Tuba/archive/v0.8.2.tar.gz -> Tuba-0.8.2.gh.tar.gz
-_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=2882d985e05382d0672b87786067c6dd
diff --git a/metadata/md5-cache/net-misc/tuba-0.8.3 b/metadata/md5-cache/net-misc/tuba-0.8.3
index d16d7245222f..178aaca8e19d 100644
--- a/metadata/md5-cache/net-misc/tuba-0.8.3
+++ b/metadata/md5-cache/net-misc/tuba-0.8.3
@@ -5,10 +5,10 @@ DESCRIPTION=Browse the Fediverse (GTK client)
 EAPI=8
 HOMEPAGE=https://tuba.geopjr.dev/ https://github.com/GeopJr/Tuba/
 INHERIT=gnome2-utils meson optfeature vala
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=GPL-3 CC-BY-SA-4.0
 RDEPEND=app-crypt/libsecret[introspection,vala] >=dev-libs/glib-2.76.0:2 dev-libs/icu:= >=dev-libs/json-glib-1.4.4[introspection] >=dev-libs/libgee-0.8.5:0.8[introspection] dev-libs/libxml2 >=gui-libs/gtk-4.13.4:4[gstreamer,introspection] >=gui-libs/libadwaita-1.5:1[introspection,vala] >=gui-libs/gtksourceview-5.6.0:5[introspection,vala] net-libs/libsoup:3.0[introspection,vala]
 SLOT=0
 SRC_URI=https://github.com/GeopJr/Tuba/archive/v0.8.3.tar.gz -> Tuba-0.8.3.gh.tar.gz
 _eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	gnome2-utils	a8cf148ec7f5ae0b1f1d33ae5f7f9e88	meson	99466844dd8d4fcfb07578a76f5a9922	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	vala	e477903dbe0105930c51f170a592dc16	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=d3fa6a5a320f044ca57496c617a029ba
+_md5_=2882d985e05382d0672b87786067c6dd
diff --git a/metadata/md5-cache/net-misc/wput-0.6.2 b/metadata/md5-cache/net-misc/wput-0.6.2
deleted file mode 100644
index ce457dcc630f..000000000000
--- a/metadata/md5-cache/net-misc/wput-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure
-DEPEND=ssl? ( net-libs/gnutls )
-DESCRIPTION=Tiny program like wget, to upload files/whole directories via FTP
-EAPI=7
-HOMEPAGE=https://wput.sourceforge.net/
-IUSE=debug nls ssl
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=ssl? ( net-libs/gnutls )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/wput/wput-0.6.2.tgz
-_md5_=a8960adef445d9763ca05a45b1f0d894
diff --git a/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11 b/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
deleted file mode 100644
index e46c6455fe8f..000000000000
--- a/metadata/md5-cache/net-misc/wput-0.6.2_p20130413_p11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=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 prepare
-DEPEND=ssl? ( net-libs/gnutls:= )
-DESCRIPTION=Tiny program like wget, to upload files/whole directories via FTP
-EAPI=8
-HOMEPAGE=https://wput.sourceforge.net/
-INHERIT=autotools
-IUSE=debug ssl
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=ssl? ( net-libs/gnutls:= )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/wput/wput_0.6.2+git20130413.orig.tar.bz2 mirror://debian/pool/main/w/wput/wput_0.6.2+git20130413-11.debian.tar.xz
-_eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=3d72146f2a689b9ec7ec6d87e123f1d0
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 0261b0ad6577..fedac89a0f31 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/gpsbabel-1.7.0-r1 b/metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1
deleted file mode 100644
index d2e7e05b1270..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt )
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-qt/qtcore:5 sci-libs/shapelib:= sys-libs/zlib virtual/libusb:1
-DESCRIPTION=GPS waypoints, tracks and routes converter
-EAPI=7
-HOMEPAGE=https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel
-INHERIT=flag-o-matic qmake-utils
-IUSE=doc
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 sci-libs/shapelib:= sys-libs/zlib virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_7_0.tar.gz doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
-_eclasses_=flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=8e03c8af6ddeda483280475f87f785ae
diff --git a/metadata/md5-cache/sci-geosciences/gpsbabel-1.8.0-r1 b/metadata/md5-cache/sci-geosciences/gpsbabel-1.8.0-r1
deleted file mode 100644
index 9ce95efa662f..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsbabel-1.8.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 dev-lang/perl dev-libs/libxslt ) !qt6? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/ninja >=dev-build/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/expat sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtserialport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) qt6? ( dev-qt/qtbase:6[gui,network,widgets,xml] dev-qt/qtserialport:6 dev-qt/qtwebchannel:6 dev-qt/qtwebengine:6[widgets] dev-qt/qt5compat:6 )
-DESCRIPTION=GPS waypoints, tracks and routes converter
-EAPI=8
-HOMEPAGE=https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop flag-o-matic xdg
-IUSE=doc qt6
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat sci-libs/shapelib:= sys-libs/zlib:=[minizip] virtual/libusb:1 !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtserialport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) qt6? ( dev-qt/qtbase:6[gui,network,widgets,xml] dev-qt/qtserialport:6 dev-qt/qtwebchannel:6 dev-qt/qtwebengine:6[widgets] dev-qt/qt5compat:6 )
-SLOT=0
-SRC_URI=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_8_0.tar.gz
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	desktop	56973babb9c5f19cab0eeb53ece644c6	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=fe2c26b64ad9e4e47cda5162075e956b
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.28.10 b/metadata/md5-cache/sci-geosciences/qgis-3.28.10
index 300dcac4b3c5..241f85b20e81 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.28.10
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.28.10
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.qgis.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic python-single-r1 virtualx xdg
 IUSE=3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain[qt5(+)] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) serial? ( dev-qt/qtserialport:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) mapserver? ( python ) test? ( postgres )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.28.10.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=ae7989a5fc203291dc5b2c392e25b3d7
+_md5_=24ac3d8d7df1cbc42244b3de238e2890
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.36.3-r1 b/metadata/md5-cache/sci-geosciences/qgis-3.36.3-r1
deleted file mode 100644
index 819e124d1d41..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.36.3-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) !qt6? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( python_single_target_python3_10? ( !qt6? ( dev-python/PyQt5[python_targets_python3_10(-),testlib] ) qt6? ( dev-python/PyQt6[python_targets_python3_10(-),testlib] ) dev-python/nose2[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( !qt6? ( dev-python/PyQt5[python_targets_python3_11(-),testlib] ) qt6? ( dev-python/PyQt6[python_targets_python3_11(-),testlib] ) dev-python/nose2[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) python_single_target_python3_12? ( !qt6? ( dev-python/PyQt5[python_targets_python3_12(-),testlib] ) qt6? ( dev-python/PyQt6[python_targets_python3_12(-),testlib] ) dev-python/nose2[python_targets_python3_12(-)] dev-python/mock[python_targets_python3_12(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/markupsafe[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:0[python_targets_python3_10(-)] ) !qt6? ( dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt5] ) qt6? ( dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/markupsafe[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pytz[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:0[python_targets_python3_11(-)] ) !qt6? ( dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt5] ) qt6? ( dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) python_single_target_python3_12? ( dev-python/httplib2[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/markupsafe[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/owslib[python_targets_python3_12(-)] dev-python/pygments[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/pytz[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] dev-python/sip:=[python_targets_python3_12(-)] postgres? ( dev-python/psycopg:0[python_targets_python3_12(-)] ) !qt6? ( dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[qt5] ) qt6? ( dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) ) !qt6? ( app-crypt/qca:2[qt5,ssl] dev-libs/qtkeychain[qt5] x11-libs/qwt:=[qt5(+),svg(+)] >=x11-libs/qscintilla-2.10.1:=[qt5] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 3d? ( dev-qt/qt3d:5 ) polar? ( || ( ( x11-libs/qwt:5 x11-libs/qwtpolar ) ( x11-libs/qwt:6/1.5 x11-libs/qwtpolar ) ( >=x11-libs/qwt-6.2[polar(+)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) ) qt6? ( app-crypt/qca:2[qt6,ssl] dev-libs/qtkeychain[qt6] >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] >=x11-libs/qscintilla-2.10.1:=[qt6] dev-qt/qttools:6[designer] dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] dev-qt/qtmultimedia:6 dev-qt/qtpositioning:6 dev-qt/qtserialport:6 dev-qt/qtsvg:6 3d? ( dev-qt/qt3d:6 ) polar? ( x11-libs/qwt:=[polar(+)] ) qml? ( dev-qt/qtdeclarative:6 ) ) !qt6? ( dev-qt/qttest:5 ) test? ( python? ( app-text/qpdf app-text/poppler[cairo,utils] ) )
-DESCRIPTION=User friendly Geographic Information System
-EAPI=8
-HOMEPAGE=https://www.qgis.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic python-single-r1 virtualx xdg
-IUSE=3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=>=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/markupsafe[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:0[python_targets_python3_10(-)] ) !qt6? ( dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt5] ) qt6? ( dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/markupsafe[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pytz[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:0[python_targets_python3_11(-)] ) !qt6? ( dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt5] ) qt6? ( dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) python_single_target_python3_12? ( dev-python/httplib2[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/markupsafe[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/owslib[python_targets_python3_12(-)] dev-python/pygments[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/pytz[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] dev-python/sip:=[python_targets_python3_12(-)] postgres? ( dev-python/psycopg:0[python_targets_python3_12(-)] ) !qt6? ( dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[qt5] ) qt6? ( dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) ) !qt6? ( app-crypt/qca:2[qt5,ssl] dev-libs/qtkeychain[qt5] x11-libs/qwt:=[qt5(+),svg(+)] >=x11-libs/qscintilla-2.10.1:=[qt5] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 3d? ( dev-qt/qt3d:5 ) polar? ( || ( ( x11-libs/qwt:5 x11-libs/qwtpolar ) ( x11-libs/qwt:6/1.5 x11-libs/qwtpolar ) ( >=x11-libs/qwt-6.2[polar(+)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) ) qt6? ( app-crypt/qca:2[qt6,ssl] dev-libs/qtkeychain[qt6] >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] >=x11-libs/qscintilla-2.10.1:=[qt6] dev-qt/qttools:6[designer] dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] dev-qt/qtmultimedia:6 dev-qt/qtpositioning:6 dev-qt/qtserialport:6 dev-qt/qtsvg:6 3d? ( dev-qt/qt3d:6 ) polar? ( x11-libs/qwt:=[polar(+)] ) qml? ( dev-qt/qtdeclarative:6 ) ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) mapserver? ( python ) qt6? ( polar ) test? ( postgres )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.36.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=22a3b768dddb3ff74afbb2bfb8914980
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.38.3 b/metadata/md5-cache/sci-geosciences/qgis-3.38.3
new file mode 100644
index 000000000000..d682eb5eebc2
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.38.3
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) dev-qt/qttools:6[linguist] app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( python? ( python_single_target_python3_10? ( dev-python/PyQt6[python_targets_python3_10(-),testlib] dev-python/nose2[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt6[python_targets_python3_11(-),testlib] dev-python/nose2[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/PyQt6[python_targets_python3_12(-),testlib] dev-python/nose2[python_targets_python3_12(-)] dev-python/mock[python_targets_python3_12(-)] ) ) ) app-alternatives/ninja >=dev-build/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain[qt6] dev-qt/qttools:6[designer] dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] dev-qt/qtmultimedia:6 dev-qt/qtpositioning:6 dev-qt/qtserialport:6 dev-qt/qtsvg:6 dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt6] >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/markupsafe[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/markupsafe[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pytz[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) python_single_target_python3_12? ( dev-python/httplib2[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/markupsafe[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/owslib[python_targets_python3_12(-)] dev-python/pygments[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/pytz[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] dev-python/sip:=[python_targets_python3_12(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_12(-)] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) qml? ( dev-qt/qtdeclarative:6 ) webengine? ( dev-qt/qtwebengine:6 ) test? ( python? ( app-text/qpdf app-text/poppler[cairo,utils] ) )
+DESCRIPTION=User friendly Geographic Information System
+EAPI=8
+HOMEPAGE=https://www.qgis.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic python-single-r1 virtualx xdg
+IUSE=3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 test
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=app-crypt/qca:2[qt6,ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain[qt6] dev-qt/qttools:6[designer] dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml] dev-qt/qtmultimedia:6 dev-qt/qtpositioning:6 dev-qt/qtserialport:6 dev-qt/qtsvg:6 dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib >=x11-libs/qscintilla-2.10.1:=[qt6] >=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)] 3d? ( dev-qt/qt3d:6 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) python_single_target_python3_12? ( dev-lang/python:3.12[sqlite] ) >=sci-libs/gdal-2.2.3[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?,python_single_target_python3_12(-)?] python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] dev-python/markupsafe[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/owslib[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pytz[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sip:=[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_10(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] dev-python/markupsafe[python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/owslib[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pytz[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/sip:=[python_targets_python3_11(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_11(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) python_single_target_python3_12? ( dev-python/httplib2[python_targets_python3_12(-)] dev-python/jinja[python_targets_python3_12(-)] dev-python/markupsafe[python_targets_python3_12(-)] dev-python/numpy[python_targets_python3_12(-)] dev-python/owslib[python_targets_python3_12(-)] dev-python/pygments[python_targets_python3_12(-)] dev-python/python-dateutil[python_targets_python3_12(-)] dev-python/pytz[python_targets_python3_12(-)] dev-python/pyyaml[python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[python_targets_python3_12(-)] dev-python/requests[python_targets_python3_12(-)] dev-python/sip:=[python_targets_python3_12(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_12(-)] ) dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,python_targets_python3_12(-)] >=dev-python/qscintilla-python-2.10.1[qt6] ) ) qml? ( dev-qt/qtdeclarative:6 ) webengine? ( dev-qt/qtwebengine:6 ) sci-geosciences/gpsbabel
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) mapserver? ( python )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://qgis.org/downloads/qgis-3.38.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
+_eclasses_=cmake	10a50dfaf728b802fcfd37f8d0da9056	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-single-r1	f7abe75c203a988aa9b5c460b6c7d0f1	python-utils-r1	6881b056477c23167d9a6b33e146374e	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	virtualx	53fb93b5555470a64f14fde25cf1ad2c	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
+_md5_=712bf78fb9d173c13fa3aabb3b776800
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.10 b/metadata/md5-cache/sci-geosciences/viking-1.10
index 17f727d596cb..c86c68aea18d 100644
--- a/metadata/md5-cache/sci-geosciences/viking-1.10
+++ b/metadata/md5-cache/sci-geosciences/viking-1.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/viking-gps/viking/
 INHERIT=autotools xdg-utils
 IUSE=doc +exif libexif geoclue gps +magic nls oauth
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 >=dev-tcltk/expect-5.45.4 dev-db/sqlite:3 dev-libs/expat >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.16 dev-libs/nettle net-misc/curl sys-libs/zlib >=x11-libs/gdk-pixbuf-2.26:2 >=x11-libs/gtk+-3.22:3 geoclue? ( >=app-misc/geoclue-2.4.4:2.0 ) gps? ( >=sci-geosciences/gpsd-3.20 ) exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) magic? ( sys-apps/file ) oauth? ( net-libs/liboauth ) sci-geosciences/gpsbabel
 SLOT=0
 SRC_URI=https://github.com/viking-gps/viking/archive/viking-1.10.tar.gz doc? ( https://github.com/viking-gps/viking/releases/download/viking-1.10/viking.pdf )
 _eclasses_=autotools	61927ff6474f1d141b4ea4a5b9870424	gnuconfig	f8b9cc21e72de8cbedde6ca5108d208b	libtool	f9e6905c12590c1cac06d85371a0819a	multilib	7e1347c006a76bb812f3a9f663b79991	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=2cf5fb21429b7b71e8c582c3a1c2d290
+_md5_=02393faa6b9b1ca5a15a33dc058ebe68
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1488dde9202b..19ca67e5ab2d 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20240610-r3 b/metadata/md5-cache/sys-kernel/linux-firmware-20240610-r3
deleted file mode 100644
index 0d6b885d0b86..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20240610-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=initramfs? ( app-alternatives/cpio ) compress-xz? ( app-arch/xz-utils ) compress-zstd? ( app-arch/zstd ) deduplicate? ( app-misc/rdfind )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
-DESCRIPTION=Linux firmware files
-EAPI=8
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-IDEPEND=dist-kernel? ( initramfs? ( sys-kernel/installkernel ) )
-INHERIT=dist-kernel-utils linux-info mount-boot savedconfig
-IUSE=bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) ) dist-kernel? ( virtual/dist-kernel )
-REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd ) savedconfig? ( !deduplicate )
-RESTRICT=binchecks strip test !bindist? ( bindist ) unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20240610.tar.xz
-_eclasses_=dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	mount-boot	03b0280b48caf6e18472fa7272cfcda8	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	portability	01f478fa22185b3606f2d4adea4675ed	savedconfig	b9131abe556ad2ea96c01b06d658d363	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=732c3d8697b335e324fdb85d637adc0f
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20240909 b/metadata/md5-cache/sys-kernel/linux-firmware-20240909
index 15cfb0094749..c12615e1fc45 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20240909
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20240909
@@ -6,7 +6,7 @@ HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IDEPEND=dist-kernel? ( initramfs? ( sys-kernel/installkernel ) )
 INHERIT=dist-kernel-utils linux-info mount-boot savedconfig
 IUSE=bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) ) dist-kernel? ( virtual/dist-kernel )
 REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd ) savedconfig? ( !deduplicate )
@@ -14,4 +14,4 @@ RESTRICT=binchecks strip test !bindist? ( bindist ) unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20240909.tar.xz
 _eclasses_=dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	mount-boot	03b0280b48caf6e18472fa7272cfcda8	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	portability	01f478fa22185b3606f2d4adea4675ed	savedconfig	b9131abe556ad2ea96c01b06d658d363	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
-_md5_=8d2bef5bbbb0ba451f168d3817bd6a7f
+_md5_=150475e1de0707e28885c6ff4b8b0d9f
diff --git a/metadata/md5-cache/sys-kernel/ugrd-1.19.4 b/metadata/md5-cache/sys-kernel/ugrd-1.20.0
index 0022879c0b2c..2e54d0dc2ed6 100644
--- a/metadata/md5-cache/sys-kernel/ugrd-1.19.4
+++ b/metadata/md5-cache/sys-kernel/ugrd-1.20.0
@@ -11,6 +11,6 @@ RDEPEND=app-misc/pax-utils >=dev-python/zenlib-2.2.3[python_targets_python3_11(-
 REQUIRED_USE=|| ( python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/desultory/ugrd/archive/refs/tags/1.19.4.tar.gz -> ugrd-1.19.4.tar.gz
+SRC_URI=https://github.com/desultory/ugrd/archive/refs/tags/1.20.0.tar.gz -> ugrd-1.20.0.tar.gz
 _eclasses_=bash-completion-r1	3047612be964ffd4a549447fc4289f12	distutils-r1	515591e76fa89a2359ed45d26bf9c774	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multibuild	45df57b1877333d70a9e894f6c8fdb3a	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	a0eb740debe3d472355e8bc52f62e0ac	python-r1	c1fc393cd1e72f093b4838e29d27918c	python-utils-r1	6881b056477c23167d9a6b33e146374e	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9
 _md5_=ff52a9d0a43a2d3b836dfb9b2d8945d8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 7c0d9bd7f159..aebbd21f35f5 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/nextcloud-28.0.10 b/metadata/md5-cache/www-apps/nextcloud-28.0.10
new file mode 100644
index 000000000000..d31c469e0261
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-28.0.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=app-admin/webapp-config
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=8
+HOMEPAGE=https://nextcloud.com/
+INHERIT=webapp
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=28.0.10
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2
+_eclasses_=webapp	ec35e2e7054fc885ca6bba50f7dfc225
+_md5_=208a174b5dfbba0379cdab989ed15648
diff --git a/metadata/md5-cache/www-apps/nextcloud-29.0.7 b/metadata/md5-cache/www-apps/nextcloud-29.0.7
new file mode 100644
index 000000000000..11f9455e45fc
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-29.0.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=app-admin/webapp-config
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=8
+HOMEPAGE=https://nextcloud.com/
+INHERIT=webapp
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=29.0.7
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2
+_eclasses_=webapp	ec35e2e7054fc885ca6bba50f7dfc225
+_md5_=4c687ee6dd507c0183b7479716bdb4a6
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d832b956693e..5ba34a803e62 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/vivaldi-6.9.3447.41 b/metadata/md5-cache/www-client/vivaldi-6.9.3447.41
index be24ba2130c7..595958fba033 100644
--- a/metadata/md5-cache/www-client/vivaldi-6.9.3447.41
+++ b/metadata/md5-cache/www-client/vivaldi-6.9.3447.41
@@ -5,11 +5,11 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info toolchain-funcs unpacker xdg
 IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:127 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.9.3447.41-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.9.3447.41-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.9.3447.41-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	56973babb9c5f19cab0eeb53ece644c6	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=5dd268a65692b04fd772512eaae09e9a
+_md5_=ea9e7060abc702d73a61ae1866c26f47
diff --git a/metadata/md5-cache/www-client/vivaldi-6.8.3381.57 b/metadata/md5-cache/www-client/vivaldi-6.9.3447.44
index eb8f102cd0b2..ab276fb458c0 100644
--- a/metadata/md5-cache/www-client/vivaldi-6.8.3381.57
+++ b/metadata/md5-cache/www-client/vivaldi-6.9.3447.44
@@ -5,11 +5,11 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info toolchain-funcs unpacker xdg
 IUSE=ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:126 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:127 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.8.3381.57-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.8.3381.57-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.8.3381.57-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.9.3447.44-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.9.3447.44-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.9.3447.44-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	56973babb9c5f19cab0eeb53ece644c6	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
-_md5_=3b6d1257e3aa15a10fb235263bea9c87
+_md5_=5dd268a65692b04fd772512eaae09e9a
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-6.9.3447.34 b/metadata/md5-cache/www-client/vivaldi-snapshot-6.10.3466.4
index df32b9775c78..a3ff4c2cc2d7 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-6.9.3447.34
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-6.10.3466.4
@@ -10,6 +10,6 @@ LICENSE=Vivaldi
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) ffmpeg-chromium? ( media-video/ffmpeg-chromium:127 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.9.3447.34-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.9.3447.34-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.9.3447.34-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.10.3466.4-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.10.3466.4-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.10.3466.4-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	56973babb9c5f19cab0eeb53ece644c6	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	xdg	8d7d90c01b1b1c2602dab6fc6b177097	xdg-utils	5465aed08f1dfc2a75f14cbea4272961
 _md5_=5dd268a65692b04fd772512eaae09e9a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 1e71d8eacf42..aa061987622f 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-470.256.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r1
index d77646d8627a..856630a67767 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r1
@@ -13,4 +13,4 @@ RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) to
 SLOT=0/470
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=251e43ad212baebb6869c044347d04f5
+_md5_=1badf12b1ecfbea56a4e2a393b278ddc
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05-r1
index 276b341a4529..cc7548b93c8b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.147.05-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/525
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/525.147.05/NVIDIA-Linux-x86_64-525.147.05.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/525.147.05/NVIDIA-Linux-aarch64-525.147.05.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-525.147.05.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-525.147.05.tar.xz
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=d42d9f7eba02a77c30e2516c85fd33e7
+_md5_=e4cae14c58afb2915fc0da17ec702679
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.183.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.183.01-r1
index 32d5c1018e22..d0ba2bcfa9e6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.183.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.183.01-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/535
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.183.01/NVIDIA-Linux-x86_64-535.183.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.183.01/NVIDIA-Linux-aarch64-535.183.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.183.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.183.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.183.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.183.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.183.01.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.183.01.tar.xz
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=f481604c9aed6f717661085a9c277dc5
+_md5_=be5d0940c8b5587a41b6df7b66035812
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r1
index 18e31005f625..6cee6b406959 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/550
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/550.107.02/NVIDIA-Linux-x86_64-550.107.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/550.107.02/NVIDIA-Linux-aarch64-550.107.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.107.02.tar.xz
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=943d498aff9df7e220fcdc95e69886be
+_md5_=dfcd957891342e4fe9de4fccbfe588bc
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.71 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.71-r1
index 1787d4d287a5..32754dfa9414 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.71
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.40.71-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5504071-linux -> NVIDIA-Linux-x86_64-550.40.71.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.107.02.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/550.40.71.tar.gz -> open-gpu-kernel-modules-550.40.71.tar.gz
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=5649f9421844599ac6dee4f844aaf425
+_md5_=8efb1a7450ca56c5045aaaebde4a753d
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-560.35.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-560.35.03-r1
index 8a227f81b253..bd55707cb8ef 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-560.35.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-560.35.03-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/560
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/560.35.03/NVIDIA-Linux-x86_64-560.35.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/560.35.03/NVIDIA-Linux-aarch64-560.35.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-560.35.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-560.35.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-560.35.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-560.35.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-560.35.03.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-560.35.03.tar.xz
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2aae6989c1a9ebdb50116bd19d4073ad
+_md5_=f6c7471ae11a39679d85e8e894a53f14
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1ebd6b9b2e71..53ded0211de1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18736 BLAKE2B 32194edd42ed78c71607e842316a0b1d71a61c0af957adc4f2069542fddcdf8640012c3e265cf3e9c5dfc551c7dd88108538ad7a3b4dfcacaa4d43da81e99656 SHA512 d0e65421641f63bd83ca69a9d194fcae3903dceb1cc3a9a81a6ab0ebffed848622d555f1b619c5c14fdcd14e0206614299a3824019d3755ad1d5fd168c47bbeb
-TIMESTAMP 2024-09-14T10:40:36Z
+TIMESTAMP 2024-09-15T10:10:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmblaCVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmbmsptfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA2Mg/+Pp6Byjtv8Kr5t2Ah5eT4k58bAgXtdTlSAz25376eVm0w9SqxQqHbfOF2
-0rov9pnxCsAvffqMbAB8jFfZSSD+Bs0XZSPx3B2EZjkl3cOHoi+ykrFPS+AObYA0
-fNkE9JgaE4C2HfKFDvYYAT6j0Yq16paSjoCK1hCPO+uwMyuG6cTn+FDvvNuZyuWv
-FuzxPboqe5P0tG54FnBXiUmGtQLAazlAHWdEFoBUHXaAcIWMZCG0ReS6N0hLoYY8
-0/0HamgayanSWgSHoRtDo8yC4fogRrgBmXD8WOjxK7/BjJdjfzV8Z3g6CLnzPDjb
-k3vhYe3hDPhVKABFgkSSV+DOy6wpLcuMwYi+fteHRps5YFk/hc9aE5z/KY5Lw1fL
-1ATwZBowg5jdwH7OwtZUFUOwCf4rl2BFhNya/EZ5fgUR4Er1zoyBM87X4gEyTgWi
-cRw3slV0zWE7siojh2d/NloBXcyFAFKBZElcQB1IW1DIEaW5WMN8liyAdJTmBuRx
-GCVdRgjgWSVn8uUXNZHIHdnuNByMJXAlLBnFQ9C8AP5VTjPG5NIbztIuFrY7Spkt
-kLRhwGvQgjkS5BBuD8nVmO0PJbmtZr98Dsq5UF7ZHZvsZBUrqXRmnYTFiiFR0lNz
-ngJhrnB7DRiolUjPRx2xmDdFl8cQ/DKQNNdve3M5vVdMbBGyx8s=
-=rKa7
+klAgTA/7BaLcBAuy6taUX7SayMst77CJJJSK3RPFnvphWhBv/txb7BDEuXCyfu/w
+Z354UIkkvb3AUT+A4X1xfLQZFq1zKCPayCCglWEd0QJLFK7lT9soXsJDmld7bfmc
+t2WNqcRVw5A1jSWtQvVCNQYj+IeN71/U3+s+h8++oo2pOECuTUSRg9pGkNVxqcnD
+7k/tWpNUCCCgStZtOibAJ4NSHGK97S8JpbNCm8aTUzLaY2qO7EUdtpGFDE5qVXrG
+5Dr8fPU6+ZHkSZIgQEH7GGR771W9zdM7YFDickkYljQiqnqRcB5AMnIguMTJws+j
+qdUDE/tbSdHeH4sF4i1HUtgM/Ai9HL/ZSJeYDgj3aLUeIDJLv6pI8Nxuzj3bh5AW
+WoKxPrzxRI+XcQEuNvWjb6w6foKsfLbIn+lKQI+Lza1oJW/C24jJzue5EhQUrdkH
+eRdWJJhErV/vAgqoj2UzSb7Tsjrzw6UapsMLL0c1ceZXYV+6Tk9skcRp3BdizIxF
+jQRDWkyOUmM1kt431xZL2lctFNPnRjc2wTH3B4LTgFv5Gbh9dZDQl25+Q3jcWvIy
+GPsR1FyqHwL7DdtYw41+bptYelqjREMfyJ9WVEwssDsSXUYkOHVAwqqmnhrdjs94
+qzv03iT0ukKKBbFapxwW+PaLiuCLCP1V1Jr4RoxDOLcblBAaQWg=
+=5GY/
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b85adf85de94..1cc56e07b69b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Sep 2024 10:40:33 +0000
+Sun, 15 Sep 2024 10:10:30 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1ec1a364bba8..5439866dd1f8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Sep 14 11:12:19 AM UTC 2024
+Sun Sep 15 10:10:29 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1d37f37e7386..82645f12199b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Sep 2024 11:15:00 +0000
+Sun, 15 Sep 2024 11:00:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 168be48699a3..e9821c74996e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3f70b2798af118d13a8ed95f66a437b2732acd0c 1726311745 2024-09-14T11:02:25Z
+b16c2731aa7f71d23e4cf17c00adf688f0459751 1726393851 2024-09-15T09:50:51Z
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 277de4f38fdd..9bad0c17c76f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1726312200 Sat 14 Sep 2024 11:10:00 AM UTC
+1726395000 Sun 15 Sep 2024 10:10:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b85adf85de94..7040f602c54b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 14 Sep 2024 10:40:33 +0000
+Sun, 15 Sep 2024 10:10:29 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a6aa24f2db64..9dbe8c3cfef6 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 107f79e8a674..096698ab89ed 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -9,5 +9,5 @@ DIST notus-scanner-22.6.4.tar.gz 293607 BLAKE2B 75bdbd9d6247a2b9afaf7b049b8b80b2
 EBUILD notus-scanner-22.6.2.ebuild 2131 BLAKE2B d754be7534a460285cddf9387039523f998e5342c71ad0db5780a0766d06e89402f36eee19de6d0621f2b1d94ded87086f66b508741f7a8b0b1e3e25d4f96198 SHA512 6be8b83e4a6a8edeb0511b03b387420c171349921ac4a38d260b72e26f51f71e98e99d930d034ae5177f7e0a917a62afe9b67e5b001a649f67f5dd4f84095531
 EBUILD notus-scanner-22.6.3-r2.ebuild 2172 BLAKE2B 837baebcbefe7fae784369e17da4b1a769bef21af599d029e11075834e093cf3d9cf30fa39ae29cec3e176e14f7249b1f178ff6dc3836ac600278870f2cfd3e4 SHA512 d14c86e099a5e7c6d72489b705984d27a404ebb0a3b6df41a25a6b44017fa76ff7ed416dc5bd30d704a7b0c521f05ed59eefdd85a8635c1c74740a0970d9d2aa
 EBUILD notus-scanner-22.6.3-r3.ebuild 2427 BLAKE2B a011c779de18e74f16e436e667de15900183a53a79ec2e7a69b122600ffa9b1564733ea3152ae6191e79f7c8e76e81acd290aa62153906da2faea1d7226773c0 SHA512 1e88c7733583a16b2a1f6676a19480d27eab5371e4bd1970477ef6e5391866f443c3fa912135ccaa289ed8c2d1f510d8bed60c874105f0686084786a2cfa769c
-EBUILD notus-scanner-22.6.4.ebuild 2392 BLAKE2B d2084c50adc0ad3a35d4d241fa62b932b985a7d573040afcdecf82b6934832f53bd4a5c62510ddf86e3ab3b39d0a5aa0e02c562ed3d991cc73908ecd7781310a SHA512 e4525f98fa3fceedb10e606713cefde8f738bc8c4a568f83636c5424f8dfbe3ccded783f5a559a8fb308db1eb0dc443aeea842d08b83c9b52e2cf95ec899b107
+EBUILD notus-scanner-22.6.4-r1.ebuild 2132 BLAKE2B 631c0b941e151cb805b7b08b2c533b4772115122ee6af3112928c4bac485eca853c8a308dde6a772453cb02a79277e00076c80c013f8857869147e150e51c629 SHA512 385da17160bcfa28f2a6758bb1f071ab13ef3fccc97d4430d7b862760fbd15059989db2bf917842ad86e8ff84ab11f71b3eb174f3f2acfe7de501785a5788938
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.4.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.4-r1.ebuild
index 43056ee11d51..cc3cdd16a286 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.4.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 readme.gentoo-r1 systemd
+inherit distutils-r1 greadme systemd
 
 DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks"
 HOMEPAGE="https://github.com/greenbone/notus-scanner"
@@ -34,58 +34,45 @@ PATCHES=(
 	"${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch
 )
 
-DOC_CONTENTS="
-For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created.
-Please, read here on how to create it:
-https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
-https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
-
-To enable feed validation, edit /etc/gvm/${PN}.toml
-and set
-disable-hashsum-verification = false"
-DISABLE_AUTOFORMATTING=true
+GREADME_DISABLE_AUTOFORMAT=1
 
 distutils_enable_tests unittest
 
-python_compile() {
-	distutils-r1_python_compile
-}
-
 python_install() {
 	distutils-r1_python_install
 
 	insinto /etc/gvm
-	use prefix || fowners -R gvm:gvm /etc/gvm
 	newins "${FILESDIR}/${PN}.toml" "${PN}.toml"
-	use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml"
 
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/notus
 	keepdir /var/lib/notus/products
 	keepdir /var/lib/notus/advisories
+	keepdir /var/log/gvm
 	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
 		fowners -R gvm:gvm /var/lib/notus
+		fowners -R gvm:gvm /var/log/gvm
 	fi
 
 	# Adding notus-scanner.log to logrotate
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
 
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/log/gvm
-	fi
-
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 
 	systemd_dounit config/${PN}.service
 
 	systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \
 			${PN}.service
-	readme.gentoo_create_doc
-}
 
-pkg_postinst() {
-	readme.gentoo_print_elog
+	greadme_stdin <<-EOF
+For validating the feed content, a GnuPG keychain with the Greenbone Community Feed
+integrity key needs to be created. Please, read here on how to create it:
+  - https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
+  - https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
+
+To enable feed validation, edit /etc/gvm/${PN}.toml and set
+  disable-hashsum-verification = false
+EOF
 }
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 069017bb77be..d62e7ce8797e 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 329c1ccbd794..8ed8cefa70e7 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -5,5 +5,5 @@ AUX xl2tpd.conf 14 BLAKE2B ab6ecadf65d4cabd37779ea2de61860f1bced5b59e66cc6e4e960
 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579
 DIST xl2tpd-1.3.18.tar.gz 534937 BLAKE2B ce745855709ac79d5d6aefbe2fb31a4e799f01c6ad31ad2e436c276933e079116daf32bcdc97b7459e4792aa2bd1ddbb600d798d8b28d1432681ffd319fe0829 SHA512 d1114777de5f3895429409fd5474da91fe9e9c218615eb989c9294de3e4e36dea7d8ea880a9b1b1ca18760e5709c8b8156c80d81401db479eaf215c026c3d861
 EBUILD xl2tpd-1.3.18-r1.ebuild 1436 BLAKE2B 400c15c7a9b483df3a28c8ae8f577e79e8f16d8c0b4820bd824724122c7275d34e6f00dfcd3b4dd0d79908dd62967dc0ef2c3ab55aac0ae22a079572ef99df4f SHA512 d2b4db639064978c64519b48c761b5353118b407b4a830cbad7a999ace9a9edb092e8152d5ab85302172cad5c19ce71709bc16d999e531b77a8b105fd3b1000d
-EBUILD xl2tpd-1.3.18-r2.ebuild 1504 BLAKE2B e22dff58f4602328864e8ea8fd325b5971dc4b21582df9e58df6d1dc827c661f00e7be5413c12be50ba0da134dd0ba7054f60f9f35c97e6eb668f1eb097d1733 SHA512 ca7897aec39b930d72524610431c814056343c10b7811ff049db435d6d3257135bab23609efd4f7fd2d70f78d6b97b2dffe01d8ebb197bae1fbdbdfc266c6cd2
+EBUILD xl2tpd-1.3.18-r2.ebuild 1500 BLAKE2B 02f842efd80cdcc59c0fedb8af9f7089475da9d912e365234b5f873b61d352e2e725804c53db6ed00b4f6633e087cab0914cf08d5902302909e12b5bef734064 SHA512 2d07c53fd41d287431cef4ca3f4d3dc836b1570493fdc77bc5a0c4e54619d878589e88e111223009d239f74898657294d25148a83edec0049553fab4c9fe2377
 MISC metadata.xml 879 BLAKE2B 45303811850f78008ae08da56724fd3e9ee5048db230735230504468a2ba03c8c4f19ebbc8b648f0f490504c9df35eb9c667c6dc320802105eaddad1f2098f8c SHA512 287af9f09cf7066768307b7dbb6b570291e4e15592c178e9dad215b1c3229cbfe9bee06994050184525d2636d3c3e87172caab49b084a27fd583461fed334df3
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild
index ece525226f09..ff6f45940c9a 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86"
 IUSE="+kernel"
 
 DEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 10912191550c..84b41a98b4de 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/whatsie/Manifest b/net-im/whatsie/Manifest
index c35482f2224a..8549b597dc03 100644
--- a/net-im/whatsie/Manifest
+++ b/net-im/whatsie/Manifest
@@ -1,5 +1,7 @@
 DIST whatsie-4.15.0.tar.gz 21146977 BLAKE2B fc8d3aba5776681efe761ce495419b793c54abd7bc1aadef2bbddb9356ccadfcd4b3937d5640e363e0fa5580a19fe4ea84e8d1d79ea44de5b1311d176d1b8495 SHA512 7e06a2ed60df8bd7714a2b768b05a2b6ff0038eb9b84b1c98977b99b48b0720837010df9adc37617102787dd86d51d6793bfa2b7c7fd0cc9e481a7585c7e7050
 DIST whatsie-4.15.3.tar.gz 21139889 BLAKE2B 54576dfeeb527f801582ad2d94c24b5d5437ed15eca2b3a2dced73d026725f07eb52d1a837c307ee25cf20ac631a9dd2750f9577da580604da56bc5878462dbb SHA512 6bc493b050b4d092a9e075d399cea169873dba6ca4c8db925e3fab82b8c19074713828619a8f699c7917559f9eb052b13bc4935b7a376fcac3017988269014ec
+DIST whatsie-4.15.5.tar.gz 21405021 BLAKE2B 26151415d0669b011391b187a28f3ac32960c7db4bce05ba44fdee93680367e0cbee44c8087d95cabc92e1bc844c118c0a0d935a0733180d154646f75d62daa2 SHA512 1ede2a1dd95b010505b3a702e3730616cac619b2460b5935d6bf3eaf48183f4b2a8d66930990db0bf6f8aeec9649b66ea2865f7b8a386cc80c22f7cdf6515e5f
 EBUILD whatsie-4.15.0.ebuild 772 BLAKE2B a8473146e82a61ad8c60eedad47f58e6ec9ed3de95c6e68b718f33d27fe49b4680e5fa9db3f8b6626741a1ec6438868926d15d17dddff6bb2f5412dca623f0a9 SHA512 7f9b4c32806b0d2d8e7609db56701854e0f5cf2e5a79961b5b09bd0bde5afe85d0af5344f3b0594f71bb37550d39c92fbe88b4709614b3f2fb372c6f042019c9
 EBUILD whatsie-4.15.3.ebuild 772 BLAKE2B a8473146e82a61ad8c60eedad47f58e6ec9ed3de95c6e68b718f33d27fe49b4680e5fa9db3f8b6626741a1ec6438868926d15d17dddff6bb2f5412dca623f0a9 SHA512 7f9b4c32806b0d2d8e7609db56701854e0f5cf2e5a79961b5b09bd0bde5afe85d0af5344f3b0594f71bb37550d39c92fbe88b4709614b3f2fb372c6f042019c9
+EBUILD whatsie-4.15.5.ebuild 772 BLAKE2B a8473146e82a61ad8c60eedad47f58e6ec9ed3de95c6e68b718f33d27fe49b4680e5fa9db3f8b6626741a1ec6438868926d15d17dddff6bb2f5412dca623f0a9 SHA512 7f9b4c32806b0d2d8e7609db56701854e0f5cf2e5a79961b5b09bd0bde5afe85d0af5344f3b0594f71bb37550d39c92fbe88b4709614b3f2fb372c6f042019c9
 MISC metadata.xml 343 BLAKE2B 94e9a06e3df02122b845cd1ecbbae8d912d521478bdfa7b7934c9e7179a5002be0daba7282e1247315c2ddb5d8f309e75c40833df0bd14ff650fdde878137a76 SHA512 3389c1a46efb8e42aa2762bc9e504456685ccdbf36e716576e6fcb1ae4a5cc2ea0f9f3b9dce594a5813fc79a0b39e29e29852efdf449e0a14078a9c3f48e8239
diff --git a/net-im/whatsie/whatsie-4.15.5.ebuild b/net-im/whatsie/whatsie-4.15.5.ebuild
new file mode 100644
index 000000000000..8919b85b6d47
--- /dev/null
+++ b/net-im/whatsie/whatsie-4.15.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Qt Based WhatsApp Client"
+HOMEPAGE="https://github.com/keshavbhatt/whatsie"
+SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QT_MIN="5.15"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	>=dev-qt/qtcore-${QT_MIN}:5
+	>=dev-qt/qtgui-${QT_MIN}:5
+	>=dev-qt/qtnetwork-${QT_MIN}:5
+	>=dev-qt/qtpositioning-${QT_MIN}:5
+	>=dev-qt/qtwebengine-${QT_MIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QT_MIN}:5
+"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	einstalldocs
+	INSTALL_ROOT="${ED}" emake install
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 864ec2991bfa..6268ab53458c 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index edb6561923ce..268b65b37da4 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -2,5 +2,4 @@ DIST irssi-xmpp-0.54-irssi.patch.xz 4060 BLAKE2B 305120bed1e05fc144ca4bbade4894f
 DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45
 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
 EBUILD irssi-xmpp-0.54-r1.ebuild 1011 BLAKE2B 3ddae921941660d9557dd36530bfda272224f1d8be0c6ddbe3e77237f6b6655b6832a4b7d59be0f7948c9f6a67326ff8dd1b4505bd1d5d3f78d2676f7e20df63 SHA512 98a4461ae0544c21ec247a328f8d4f3b004f9bc0307996ec71b02901c4b6cfd23b06f703fa5f51e61fdc1ce366fa2c1e9698d963297afb33da7ed8f3673bbf01
-EBUILD irssi-xmpp-0.54.ebuild 893 BLAKE2B 9e32091f16e129cb8be6790bbec6561d279feacb2987ecae3daf151614a5423ed72c2f3e9a4dcee96da011e992bca6f11a5a650b0d2efc1574f2a5f5c970d72d SHA512 311154784ec6a7b5d47d57b6a354721d304c27385e16f628796aa26ed1c4e1eeadbaafa16b4bb8fdcacb573a3a9906cb510a138f7b5c3b83d8d3a0325b73d95c
 MISC metadata.xml 251 BLAKE2B 2747d36e680d3c177857330b264b7b16b27bf86f1929fdd93cf853c7662a243aeadb2a1f15b6de252095db9a082c3f9c53976cd9e12230dc0c1778adcc337aa6 SHA512 8ce0ede4ca516beb3ef33975a869dbe02a6ef330f759d38357ffbc5a0d22d87e2d489be7aaa1145cefd6a4ab34253c1b1c0b7676da2e21a4ab58c13ac354d640
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
deleted file mode 100644
index 785cfd482a3e..000000000000
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Irssi plugin providing Jabber/XMPP support"
-HOMEPAGE="https://github.com/cdidier/irssi-xmpp"
-SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	net-irc/irssi
-	net-libs/loudmouth
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${DISTDIR}/${PN}-0.54-musl-build.patch"
-
-	sed -e "s/{MAKE} doc-install/{MAKE}/" \
-		-i Makefile || die #322355
-}
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
-	dodoc README.md NEWS TODO docs/*
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 44b20dcfa85e..a4b0bd20b004 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
index ecd54fddae6d..b92d50b67589 100644
--- a/net-libs/libgssglue/Manifest
+++ b/net-libs/libgssglue/Manifest
@@ -1,11 +1,7 @@
-AUX libgssglue-0.3-protos.patch 471 BLAKE2B 2b60d3786c74fc104f7bd329560ba348b087653f2f5f23acaf942fd8301f25286d558f0dbcda23fa04b3baecbd170d34dbeff8a3f62cbe832ecd39b43142512d SHA512 920d0cce943f62b3e826b6d6b56c4629a3bb11f1d0835b2eea6607ba98a3d30f544617b2de06c1fb4d879e0fa0a6d3e4aa0079f6d2b26c1017df54b8d36d505f
-AUX libgssglue-0.4-implicit-declarations.patch 530 BLAKE2B ee86f8cc22ec18834944c459340fb7b8e9114efb02f3f1b402b4fcb7d21260b4f4ad97d43783ab0dcf0a8a627f4348ca17420bcc2497d0e847c6d8e8d458f82b SHA512 c49ae441600d6f7971778bccbf20b26cc8f37c07d6f73f9f1fb95560d25772f6847322eff9a3e8c89369b11bb3540db1f61645d4fd37db1cb6c7f763c4753dc6
-DIST libgssglue-0.4.tar.gz 346984 BLAKE2B 5815db41ff3f65b014e713b68667bb49d3aecab943e891de881af2a2d157cceddc5173e7eff9ed2eac714b2e1341429694f1051ad98a3c4b728a61eaceeaddfb SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29
 DIST libgssglue-libgssglue-0.7.tar.bz2 31415 BLAKE2B 4017ff17b876b00d93d5120ca8fe2a1f472b61c7b73dec0194d0ebaa244176b5d6f85fbfe5ce52cd77bcce9e1718f979b36e8926577640bbad38208fcea78f5a SHA512 04ea9af9f56afeca40b1dd22708dfa2e844d587106f370820a8976a22e8b95c646cdc5c5ef4256e34780cdb34c5617c45187fe3866670662f15ac579ef22dcca
 DIST libgssglue-libgssglue-0.8.tar.bz2 34586 BLAKE2B 4dcd39f53904c2d5e559b15329bd6c1b8931dda426ef156d65e21d68cce85bc12d20338254a0d9fffb6acc7cec074a56e355f4bc95c065e4dafe787d4b8c077b SHA512 7866875d7394fd8c6eeb9621a88ab0393c0d30606c407fa5d5b25a30579642d37bdafb81b748bb84cf026f47716e4c4f68da6e6eb2d5afeedfb37270f1749aa1
 DIST libgssglue-libgssglue-0.9.tar.bz2 35115 BLAKE2B 365e872c0e730e5a04d2c9b0be4796ca9c6667f4a9713d51b820d0b7c89ca675052b4fe09073a4bdd9b4f57e336f51d4eee46d049550730a3adf2a93c37fd05b SHA512 fc452883e1ce0f22c1dae80f948b4f4fd581a025cad66d3f1a8c701657a01f537c327d8e0ec5c7840650e99b6012a47de8b269e279df2aaf007045273356ca48
-EBUILD libgssglue-0.4-r1.ebuild 897 BLAKE2B 365fcbfeef49e423541b409f180d401200f21bae33e205dbb6802003d14f4c4aeac3df1d9fe4c7daa9d450047bff6b98f5ec32c41e1961c97823a98bac1d818f SHA512 81b3c379b9e772bf3085dc309c8edf9e780c1015ef6f00b66c7ed1c325b52f8f171156013dfa8d7998145d35fc607e19e72b2e13a3948ef5a147228ecc948d1a
 EBUILD libgssglue-0.7.ebuild 1148 BLAKE2B 1316c73948290c43031b36db99d16fc49cd07717c58f06951273f878bfac34a2a95e089f267141dcaf9a13de6fa04e3f025d967ce6cd9c49dc9cf2ccc0846abd SHA512 e319bb7b2dbacb6095df12eb5bba36b344852ffb6faea1f8b093571922b1296efa4c4041406ea3ce44578ce82bd054c45ec77b62c777ec3357fe427f7a162e6a
 EBUILD libgssglue-0.8.ebuild 1157 BLAKE2B 1f6a3ebb6cdfa170db6cfce838d15e39036d06846862b22a2b6c032abfc7ac1455d8c73df2ec27b2565d79dca466f62c39c58c81497f4efff73de21dc4c8bfcf SHA512 1e6bcd4bcf0f75b20dff47467afc61f23daa08597dddbfeac834cb77e3b2d5eb28379c1bbe3eb5c1883b963284ad80e119ceeb4184603f4e3341d71777e6a770
-EBUILD libgssglue-0.9.ebuild 1157 BLAKE2B 12ad7d7febab4a617ec431ae5901fdd082a7e028ab0653c56228267cce5e325f1ae14b468e92ca1394e70abbc7a276b46a9ae03d259f99b591b2cdb25b6b5db5 SHA512 0c549b36ba3b4456b2f22aed947eaf4ea8fb772c65795a82cf7a3d0efee421766ec16e9beb2ff96542f7d59c45731d1eb3d1db8fbaa6b8695d2521ecd9dab345
+EBUILD libgssglue-0.9.ebuild 1162 BLAKE2B 2dc72dc2e01ae7e1f4ea558bff405d69585230c3c5e3f2748b9f58d4b9a96d8057236c14134cd2fb35130876500aa0fd93203d8ab5df0711a4913a7727e2500d SHA512 10e4d990feab3a5222b5ee1e9064c59ac18366eb75ec1b80aacfd5ef437572576e32c31fce5a47e6049ad002974a3217ce5aa1e3849269f02e99cddf7dda8526
 MISC metadata.xml 249 BLAKE2B 83b0c3cbb109f3a5fe471176078244f62b6db5cd38cc72a2a4ca3d7accc1bf39c12bf0e3e902cd8ecf4f80b72159f658e31cd55065893da3882c7b471551ec5a SHA512 235a0cd45a87d913d5f64cb14acad34258055a7f7cac2808aec35cc022fdfb5c76780016dc22131281235634424d23a6ddaafdaa4ee62a577ac5e3ef40cce843
diff --git a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch b/net-libs/libgssglue/files/libgssglue-0.3-protos.patch
deleted file mode 100644
index 8c15108d32e7..000000000000
--- a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.com/gsasl/libgssglue/-/merge_requests/1
-
-add missing prototype to header
-
---- a/src/mglueP.h
-+++ b/src/mglueP.h
-@@ -477,6 +477,10 @@ OM_uint32 generic_gss_str_to_oid
- 	    gss_OID *		/* oid */
- 	   );
- 
-+OM_uint32
-+generic_gss_copy_oid_set(OM_uint32 *minor_status,
-+                         const gss_OID_set_desc * const oidset,
-+                         gss_OID_set *new_oidset);
- 
- gss_OID gss_find_mechanism_from_name_type (gss_OID); /* name_type */
- 
diff --git a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
deleted file mode 100644
index 92a96305b406..000000000000
--- a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.com/gsasl/libgssglue/-/merge_requests/1
-
-* g_initialize.c:275:5: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration]
-* g_initialize.c:275:5: warning: implicit declaration of function 'geteuid' [-Wimplicit-function-declaration]
-
---- a/src/g_initialize.c
-+++ b/src/g_initialize.c
-@@ -29,6 +29,9 @@
- #include "mglueP.h"
- #include <stdlib.h>
- 
-+#include <unistd.h> /* getuid, geteuid */
-+#include <sys/types.h> /* ditto */
-+
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
deleted file mode 100644
index 585714049450..000000000000
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="!app-crypt/libgssapi"
-DEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3-protos.patch
-	"${FILESDIR}"/${PN}-0.4-implicit-declarations.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s,/lib/,/$(get_libdir)/," doc/gssapi_mech.conf #646126
-}
-
-src_configure() {
-	# No need to install static libraries, as it uses libdl
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	insinto /etc
-	doins doc/gssapi_mech.conf
-}
diff --git a/net-libs/libgssglue/libgssglue-0.9.ebuild b/net-libs/libgssglue/libgssglue-0.9.ebuild
index 7574054feb34..77599822a95e 100644
--- a/net-libs/libgssglue/libgssglue-0.9.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.9.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit autotools readme.gentoo-r1
 
 DESCRIPTION="Exports a gssapi interface which calls other random gssapi libraries"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux https://gitlab.com/gsasl/libgssglue"
+HOMEPAGE="
+	http://www.citi.umich.edu/projects/nfsv4/linux/
+	https://gitlab.com/gsasl/libgssglue
+"
 SRC_URI="https://gitlab.com/gsasl/libgssglue/-/archive/${P}/${PN}-${P}.tar.bz2"
 S="${WORKDIR}"/${PN}-${P}
 
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index bc32b7d2acc9..399a0b47f4a8 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,6 +1,4 @@
 AUX libnatpmp-20150609-gentoo.patch 2811 BLAKE2B 2125f030a90a20845616d28ecbf0554953408856b8e78d61a020d7ce95c357397f50263e7838c034510221dd6627e066bed19b1c75cb468a97f2517bee79b744 SHA512 ef3717dcc5b0f83522f45d7799fdec539f6148c24ea6d2800c601a5d0847c9c26f848b9654464d23e140426b32ed3aeed0030e7ade600e974129aef729786436
-DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
 DIST libnatpmp-20230423.tar.gz 26506 BLAKE2B 01386509e410312d5063038a4a929e2c838d8e6061f693cd43144f98dc4725deff459cb476842e6fab78323fb87ac0ce0f74efe3837031d89ea846932dc4fdcf SHA512 1697a414f0ff73876c177d8e09242c8da6fd4bc9b1c3a893bfb082420bfdac30f455507b81937042caaf6b30756d2055c073ee1de1ac73f7ef31e4c68e5c4ed7
-EBUILD libnatpmp-20150609.ebuild 792 BLAKE2B fe8fcd8cd2c9339db176c34681f32482a83e990b922d7c17ce2803a4cc8cdf4f5cd5f626e63a480957e5c1a014857705d4064fccbe0428146d5b478a2bd3e87d SHA512 d67291394514570e29fa50e1ab690c511cfcdcb599a1813a4ae4d008613574d39679545815c64d89993bf0c2d9438cf8215dda3febab55e319b1f25a2014217f
 EBUILD libnatpmp-20230423-r1.ebuild 799 BLAKE2B 128ab6b98be69d779000ed546cda7d9848c5fd9e56434ae856d4a804fedc1ef38a419d46675e629e47af9da3780af60fe7da27dfdd3a690395405e51aa7f6426 SHA512 4e51afd809d1f681d8522d8274067fd9e3ed472ec587241ab4e607aaa159dcffdde76d903ce459e7c03497b9efaee741ec9d76b0e0660543e10feef4fc416d10
 MISC metadata.xml 251 BLAKE2B aff27f0414b759d8b480b5ff7510ad6b4c7247587e98da4e5110a1b20067eede21609515f370ecd8ece32e7a6667bb9b3e38718e4be4d3f584858db7459d030b SHA512 0afc6591b2d966f15fd3fbece3fc4c74f3c36ac26b51884c8a21f63ce26cacae12e8b7d8b90967818c6ec3d110d33282f5635bb0b606b8a08f7a573fc9f1f8fb
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
deleted file mode 100644
index e52252b93031..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An alternative protocol to UPnP IGD specification"
-HOMEPAGE="
-	http://miniupnp.free.fr/libnatpmp.html
-	https://miniupnp.tuxfamily.org/libnatpmp.html
-	https://github.com/miniupnp/libnatpmp/
-"
-SRC_URI="https://miniupnp.tuxfamily.org/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	# Override HEADERS for missing declspec.h wrt #506832
-	emake HEADERS='declspec.h natpmp.h' PREFIX="${ED}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index fc7dc46c488a..73b5bc6022a3 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,10 @@
 DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a
 DIST nghttp2-1.62.0.tar.xz 1646596 BLAKE2B 156fe3cd401e89cb9416c3281318f955abe86909d249108781f8eaeb0ff3df791f083ae6fc7bfe04350b91ffeaf8d8799d138d9d7cc9f5121a344f69f7473915 SHA512 1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88
 DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c
+DIST nghttp2-1.63.0.tar.xz 1606480 BLAKE2B 8c4158b8855b3b4b0a576f5cc894f77f88bab35bbb995809c7494bd73030d50d0189153ef5434a3071267bc6f198ea3ff5d7e3bd8bac4299fb8fbf3be91e11c7 SHA512 ac5005f33664981e194730223881f4207c9570cb8d9bba51b5592a3e7eb59455ebe25bf190211811513c64497a1b42ec7a82cc7f810059f46c99a83dd2d6cef9
 EBUILD nghttp2-1.61.0.ebuild 1816 BLAKE2B 53ee685bca4dd3040979ecae97195b30caec91d09ddd91b0235de955b7848192bdc3c26c6d8d4efd3e5011ff5f0d669c5a7e403925432393c926d976aea6ee05 SHA512 8683d54a28e42d8f5d5b2e25ee360d4a7f2e9ada858afac520c943ec93934971108edf2e3051ee48dd2fa603fe00e95411ab84bc4cfdd8d9ceea9ba30c1320cb
 EBUILD nghttp2-1.62.0.ebuild 1824 BLAKE2B fb8c4290e0ab6644f18a426939b7cd7414df5485e1a0a5266ad738c9a9e850f93112c3b02c468a851b6cb6dd037ab7b181f932f40df5105fe52037b95fd1e7b4 SHA512 d4000103a106b619f1dddc9d8e0327e856219254bbf5a12c985ebc1c3b78d5895720eedbaa511cb108a8479698ba45a89973ef0c12bf3edeb59f82757fff35c3
 EBUILD nghttp2-1.62.1.ebuild 1817 BLAKE2B df18472dafebfd0ca64a248b7927e3c47cd1f8e1f743a7c30ed599ed5ade98ed8c43eec5d129225416e308d87f80eccf79b705fa2ed59f4099404eeb035cb9b5 SHA512 97fbe7b545dfafc6e6fafbacee1cd4f82fe3e17b895a5fb052062b009de59073f0291489ffec7a0776d6c7c88ed402ceb4a0d7adec13c8a48ce1ec72c34402ec
+EBUILD nghttp2-1.63.0.ebuild 1824 BLAKE2B fb8c4290e0ab6644f18a426939b7cd7414df5485e1a0a5266ad738c9a9e850f93112c3b02c468a851b6cb6dd037ab7b181f932f40df5105fe52037b95fd1e7b4 SHA512 d4000103a106b619f1dddc9d8e0327e856219254bbf5a12c985ebc1c3b78d5895720eedbaa511cb108a8479698ba45a89973ef0c12bf3edeb59f82757fff35c3
 EBUILD nghttp2-9999.ebuild 1607 BLAKE2B 86247f2c6086da22f6d506e8e31c63d558aa45276d2deb202ca515c35034419829be8b6fef0be10b15367b6880ee35f7b62cae6424ecf6c7ae2cac90b090f3bb SHA512 e30a674093644da312f76a7ce8c25ae468c95bbf2e3b69c8618cb21b3852799dfeb674007ae5694d77de46c093228f97c517fcc23e9791fd42c708e55431114e
 MISC metadata.xml 553 BLAKE2B 694d0da32dab7f6eebd3b83a12b490b62d262de96e2bbb5c5822befbac792bc560cfe21c194d83d1afabf725967e0508c65057c8382904353abb0219d5ff3338 SHA512 4bce2e01c0b64eee279fc8a425393acf63e859a8b63346ddb2c5486d913bc58d0485d4c7fd6663bec88b070f21b6c9bbfd28e5775dbcbee02248e631610becd0
diff --git a/net-libs/nghttp2/nghttp2-1.63.0.ebuild b/net-libs/nghttp2/nghttp2-1.63.0.ebuild
new file mode 100644
index 000000000000..040b77645d76
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.63.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/1.14" # 1.<SONAME>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
+
+REQUIRED_USE="test? ( static-libs )"
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	systemd? ( >=sys-apps/systemd-209 )
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	#TODO: enable HTTP3
+	#requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_FAILMALLOC=OFF
+		-DENABLE_HTTP3=OFF
+		-DENABLE_WERROR=OFF
+		-DENABLE_THREADS=ON
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
+		$(cmake_use_find_package hpack-tools Jansson)
+		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		$(cmake_use_find_package systemd Systemd)
+		-DENABLE_APP=$(multilib_native_usex utils)
+		-DWITH_LIBXML2=$(multilib_native_usex xml)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	eninja check
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 46674f59c5cc..461535e1405b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-base/Manifest b/net-misc/asterisk-base/Manifest
index 0d69dba4ae33..56d77a8587af 100644
--- a/net-misc/asterisk-base/Manifest
+++ b/net-misc/asterisk-base/Manifest
@@ -9,5 +9,5 @@ AUX tmpfiles-1.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d
 DIST asterisk-base-3.tar.gz 14589 BLAKE2B 854df19a0aa6cbd6c452ec03f8766f166824580f30edbf158f9e23baa451b092388b5f653999cab63d3232d7ff2c1efb7784c8e69d9ea1f2855dd446613ade87 SHA512 e2b53a3db6cb38fcc8456c3c69806452ecdd748f7d5833c6fdc426f436f92b651d69a902f6f588ffc371903c5a1374a9fc0695a74f9b4e47e75df3b1ce50764e
 EBUILD asterisk-base-1.ebuild 1009 BLAKE2B fee1b726a36acff9a1ec4c56a157bf5d03363bc869aa82f6ca3bb9e0e68ca0a240248fcdafb1e0280ce9dc564dbeea5b06648b73d7bc43f38f818091012fdbd2 SHA512 c73fdf5eca5afe8fb53e52d76bdb6274fe05e9a1d2b0ec57fb29c91916b7c56b2c36b2895e095a5a8d960da478c81fec024f340ade1269f311fc86b104bb2033
 EBUILD asterisk-base-2.ebuild 1021 BLAKE2B 57408ea752cc26cd7f72a7e8f32de9268ea1b66d3eaacb17fb6220133abb519736a336f905789fba1cfd7d9f1c9b59ad88388c2fe720264d030892089864468a SHA512 dfd90fa5c5688c1723d8a95107a68fb319cede39fad9d4a8354d7cda10381348f1232bef945fea70c23a48c09d4843daf47172551c30c8913a75b692c70dbce3
-EBUILD asterisk-base-3.ebuild 883 BLAKE2B b398640cb5161e6cc346814f71c96d3b7b54fd58dc6272e5577c0d392674435870ac4c800de9cabbc0e97b992547c299e48ceceba72a2892e8d25eadf27d264d SHA512 7e9e8820d35d09da1a3d59a12b3ea29d2f9087b16832f795e548a45eb48314d81e319b6fe2594b7251ad55ccf656ec1c87868518feeb788d0649a305ecbb3d3e
+EBUILD asterisk-base-3.ebuild 881 BLAKE2B 6962ee8df0b936851d7fe7b46e2ed87706d6c1cb813475c8a8af3c36f59000d764f34f468a7cbd16c1618ea7f10f0bcb416dd26a85507d425c3c73d6852870a7 SHA512 8e1bc6732bbe06ae031758cdee776a4f1acaddeff71d406e8ce5afe1dd8a21fcbb1d8eb93d92d19ac0d24cd20ec79051b48f5be462ef55e0b2de4acfaf240af3
 MISC metadata.xml 475 BLAKE2B cd7c9c6474cecd6aeda2b62144f3db03156ba2a5cfeda845d36d2fd24b16dce5bd05b5d425a559409c36806b4d3242ee0746aec44afb2645024166b94fc22d6e SHA512 fb5795745d56526501ade0894424c7558019283ab07faa6a64daebeadf813aa565afaa11a2215c106cf0d3c99c79e10f820b57fac6981e32cc0091a75046ab86
diff --git a/net-misc/asterisk-base/asterisk-base-3.ebuild b/net-misc/asterisk-base/asterisk-base-3.ebuild
index 3d9e4d044130..5be15bd8601b 100644
--- a/net-misc/asterisk-base/asterisk-base-3.ebuild
+++ b/net-misc/asterisk-base/asterisk-base-3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jkroonza/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	net-misc/asterisk
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 58ad88bf7f8f..3c9c09c39034 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,7 +1,7 @@
-DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
 DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
 DIST axel-2.17.13.tar.xz 224788 BLAKE2B 07b3918277fa2a4b0cda5e989c3c001058cc0c8da52e479d56bd88956362cb1bbfa927b85ed870c5b0ddc599839fadb25aa5733bd295f060879d31c211913e16 SHA512 e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2
-EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
+DIST axel-2.17.14.tar.xz 226132 BLAKE2B e9b89222f1d03897904b6db24716263173d94e000646db3561f23701b87d7894ebce09e309354d86e47c5c7f502eefc7a68b34c5fe1d1a7288dc61856fb7e0a9 SHA512 73ea499f581d9411197269fc96d7eeed83dcdb7470aba2ef93db0a1032689bfb66e03a194e9ae5191477ca86cc772d204c6672233009cf210b9ebb3ae29bc9c0
 EBUILD axel-2.17.11.ebuild 994 BLAKE2B 0459b09b2345c5d1f7a05dddd348bf6495fdcd307a4d96385988456b1adeb3a52d42314449643d67cc691b6523ad08896bef625fbd1d42608c7587190c6dcba5 SHA512 db17d0680199b4dcb64fb641834b85154c707560220d8a87cb8bf97193eb06990ba0b206a84274481f99e05015cb9c61a3fb09ef877da798f4b4b915e54810fa
-EBUILD axel-2.17.13.ebuild 987 BLAKE2B 71b5e3d438d47804650ffd7691e471ae1fc3384298ab595f95f5eac0e9b5c51bdb2da9874d8fef4e3426d8292333c380ca503e85e7417a6d7960ecb8da3f1e39 SHA512 83da7b1928c7aa4137a5782b37079a91322c56cc49c0245e5fadfff8c23c01eb7f41c60e00862f2cfe3c52baa4bd9f0335e4fa8760606167bd309676a8dc0de6
+EBUILD axel-2.17.13.ebuild 987 BLAKE2B e08fefafb91a5ca23b4b9e171b0627bd9f0fd954309210aa4fa20f4c06c72ea3a1633d035bfd672cb31c8bea05674d163e814eedc8c14e24c33b3100d65d6795 SHA512 2a6a3ec4bf09b7655d49126479f3f9fc6de6c293d94e4d03064c9639d8c4e8d319bf82564f3d533ec25118ab803c6cd449ff53291f6c56a1863c7bb6ebbee83b
+EBUILD axel-2.17.14.ebuild 1045 BLAKE2B 2096fc41dd0617937739e5a564d9a1c3507ebefe174697bee800474c2a6d6e47750b5f46b6c4a7df0c7c6afaf7aeaad7c3da12862d5163afa058434975246229 SHA512 28513e84eb6da188bbbf54acd91959fce0005762b3cc9476b0042edb018ee7250e2384ea9629df4759bffbdefefc044286303deb8e644fb76d7b2d3f5cc9f6ce
 MISC metadata.xml 263 BLAKE2B 7f3d07ed49d8af3f586e46467ca42c96ce16f07efa052e5434dad8486f3af7d458ec03af4131ae649df1ee1be71041f8bfd87e6d19326787210c3aef070302c5 SHA512 fdec3d4ab843b1c07c7bab771f38caca1392bd7f09f8d043355b95015b91b22b327a50d3d37f6438ac985b754cf896ae1a73a3f13ad003573f7debf077bd985e
diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild
deleted file mode 100644
index 9ec3f17398db..000000000000
--- a/net-misc/axel/axel-2.17.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug nls ssl"
-
-CDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with Portage, one can configure make.conf with:'
-	einfo
-	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-}
diff --git a/net-misc/axel/axel-2.17.13.ebuild b/net-misc/axel/axel-2.17.13.ebuild
index d2b41dac25da..b93851ca667c 100644
--- a/net-misc/axel/axel-2.17.13.ebuild
+++ b/net-misc/axel/axel-2.17.13.ebuild
@@ -22,7 +22,7 @@ DOCS=( doc/. )
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with ssl ssl=openssl)
+		$(use_with ssl ssl openssl)
 }
 
 pkg_postinst() {
diff --git a/net-misc/axel/axel-2.17.14.ebuild b/net-misc/axel/axel-2.17.14.ebuild
new file mode 100644
index 000000000000..c53db4796073
--- /dev/null
+++ b/net-misc/axel/axel-2.17.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="nls ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="
+	${DEPEND}
+	nls? (
+		virtual/libintl
+		virtual/libiconv
+	)
+"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( doc/. )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl ssl openssl)
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo 'To use axel with Portage, one can configure make.conf with:'
+		einfo
+		einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+		einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+	fi
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 506c8b9e9165..fe1a1a4174b4 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,4 @@
+AUX curl-8.10.0-sendrecv-poll.patch 2113 BLAKE2B 8f00179a27b3f544c8cf9c8f1adfc087011eb2c84792f64847052fe34fdf0a39c953a677aaf8a77f27634ec619101562203d0105c415664952b036f791083db9 SHA512 2e00a8004bcc50f184c5768ab30d0daaa0b845c5d5d2368ee8d35971da4832dd6bb7f30733e4ecb9fb3dd6547facfbc8d152fc59a40bf2858a8564130f83b308
 AUX curl-8.7.1-chunked-post.patch 2389 BLAKE2B d283816be5dca19ab0058db1937d686b4f9056caf3c46a8dcd731bc69ae91df1b01d10f643ce127eeec7aac0e9282f8b5c5109fe1cea82b30d2cf3270e93ae24 SHA512 3b1a67010704f4863f973e79d6a695e6e13b938fbaa695a05bc92b1a577fa5852c310b38f9c88518275f82c7d088474f5e4c585ac5ff790043e6ca969b0dc1d9
 AUX curl-8.7.1-fix-compress-option.patch 6222 BLAKE2B 7ff5c096fa6cc5cc039f47188a85c49364cdfe6cfeae3a9c58b38939eb59896bcf204c682f36e89ace37a0753236593307e1af45bc2d0f099ff685af8e366713 SHA512 1622adf015a016a205d4bf621715ed06fd345cd45f032ad44b6d9324d398c0e2004f04fe734401b12007c3eb145dac84aa3ce90bdaa9b16e09b5908da75f902f
 AUX curl-8.7.1-http2-git-clone.patch 14120 BLAKE2B 5bc2c0765ebd400f2e79d0552621c98640c757f189ae0fa029d8fb6d9fa74ac0e4fd93948fed6bc7f93b329e30948a585be1f20dde18423acf162cd36b4fb166 SHA512 278720daae7d4d3288502e0dd2b591ada66a559040eb341b0cf5673094e9d214eb166772279378487da96f43912313e04d3b174fdcb2b2cbfa766f241df62f34
@@ -17,7 +18,7 @@ DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692
 DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359
 DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
 DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
-EBUILD curl-8.10.0.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6
+EBUILD curl-8.10.0-r1.ebuild 11432 BLAKE2B a82ade1d3f05e25126629574f824cb4140f69802c481f3fc6d5acbfdf7551b018bbb254bcc9671f7dcbb0cc0680ebf84917d50930f6cc33768c278d1ec66f6b0 SHA512 094010c501d5a5ba0a3cf13b3b4e5e9fc0d54bae5763c141064f54c2b05feca89aecf256622045703eca47cea696619ae69b8c4fa16169480cfa785156c093d2
 EBUILD curl-8.7.1-r4.ebuild 11261 BLAKE2B 0d1acdce1b58e97d83ee0e67ac0e145894a1bd19e23635649bec06bcd6a45e6487954b497992a7039243ca6860393d2b5115caf2d9edab1a3fbefc46451e2c6f SHA512 687aa43ec10a118f2d53d8532423bf3ffc6eb1ee60f509c3677cc4afcfe1f871b87e18fa5bd045fa86570ae4285432da59adb5f0b548e7da6ed46c9d8a9ad3e5
 EBUILD curl-8.8.0-r1.ebuild 11487 BLAKE2B e97f24d529bd6d41556d0584f3bc296754d9ec04b9080bd8ca1dfdce1e12ddf7c50683f2a9c6249b85392f9fd988a3707c04e2ef2bf4a7956390a394cbca6831 SHA512 8c8b3b2ffc3a4c2bb8d83f0da258e3bb664a365c9fc29af387b33df079658c0ec6cd148a93fc36c34c990bf98637125db1826415d3c34887e60f9a6458e2bba4
 EBUILD curl-8.9.1-r1.ebuild 11442 BLAKE2B 314ab850c3dd3128e7e9168a019dc5088f4f1d4cb4a78fc19b09c15fe13d2384053c576f54cba0c728f8f2ac5b42d32b3013ae0ff954fb3dbb60e517ff09aa25 SHA512 a446c2d115798704cbf41d06904089bd3429d88ae203b7a77e86a87aa592696f85ae2a2d844575ece18f3f8291af9eaa2652d44baf707144468d3ada94cdb89a
diff --git a/net-misc/curl/curl-8.10.0.ebuild b/net-misc/curl/curl-8.10.0-r1.ebuild
index 8aa5f19b3d9c..335c3c36a022 100644
--- a/net-misc/curl/curl-8.10.0.ebuild
+++ b/net-misc/curl/curl-8.10.0-r1.ebuild
@@ -158,6 +158,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-prefix-2.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+	"${FILESDIR}"/${P}-sendrecv-poll.patch
 )
 
 src_prepare() {
diff --git a/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch b/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch
new file mode 100644
index 000000000000..44654377008a
--- /dev/null
+++ b/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch
@@ -0,0 +1,51 @@
+https://github.com/curl/curl/commit/a33bcc9b53b9d6ea9f879624e8abea0b012b008e
+From: Stefan Eissing <stefan@eissing.org>
+Date: Fri, 13 Sep 2024 18:36:53 +0200
+Subject: [PATCH] transfer: fix sendrecv() without interim poll
+
+There was a "clever" optimization that skipped sendrecv() handling when
+the transfer's pollset was empty. This happens for paused transfers, for
+example.
+
+Unforunately, if the libcurl application never calls curl_multi_poll(),
+the pollset is and will aways remain empty, prevent the transfer from
+progressing.
+
+Remove this "optimization" and always try send/receive where applicable.
+
+Fixes #14898
+Reported-by: Victor Kislov
+Closes #14901
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -431,8 +431,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
+     if(select_bits_paused(data, data->state.select_bits)) {
+       /* leave the bits unchanged, so they'll tell us what to do when
+        * this transfer gets unpaused. */
+-      /* DEBUGF(infof(data, "sendrecv, select_bits, early return on PAUSED"));
+-      */
+       result = CURLE_OK;
+       goto out;
+     }
+@@ -440,16 +438,13 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
+     /* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */
+     select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
+   }
+-  else if(data->last_poll.num) {
+-    /* The transfer wanted something polled. Let's run all available
+-     * send/receives. Worst case we EAGAIN on some. */
+-    /* DEBUGF(infof(data, "sendrecv, had poll sockets, RUN")); */
++  else {
++    /* try both directions if the transfer wants it. We used to poll
++     * the socket here and on ran send/recv depending on POLLIN/OUT, but
++     * that does not when connections are multiplexed or handshake,
++     * or other direction reversals are happening. */
+     select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
+   }
+-  else if(data->req.keepon & KEEP_SEND_TIMED) {
+-    /* DEBUGF(infof(data, "sendrecv, KEEP_SEND_TIMED, RUN ul")); */
+-    select_bits = CURL_CSELECT_OUT;
+-  }
+ 
+ #ifdef USE_HYPER
+   if(data->conn->datastream) {
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index df8f731e9873..229569b00996 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,5 +1,3 @@
-DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4
 DIST dhcpcd-ui-0.7.9.tar.xz 104100 BLAKE2B 7e2bbbb9ad657deccc16296a0c7191f35fa15dbc84f1f8ac4f8ac5de4c56e5948da457398409527774ffc62e58659cac2dd37aa66842179f710db04a9791ab9e SHA512 fe0c9ff2f777e7b97438eb50507fce765b8e18b1a71883d76e9b6570a18e6f13414f8e64d8034f9c3352496775c283a0540e331ec449d6fbe48ddc8d64e14691
-EBUILD dhcpcd-ui-0.7.8.ebuild 1317 BLAKE2B 9184c0a56b1163f7ddf4a2de6f84bf6a3ee3b0d25029686aa55c1a8f4ed00a318ca586bde1b5798ca2c42afbe5979d098a997eb0e9e9ea517384f97aab0036f8 SHA512 d19ab69d655ae6886654cc69fb49a2ec5b8bd2c07d66fc62f92806e6ce437f5425783ed365dac7f91c05a6dd8fbf7b1780f8b65ed9a8171523f088fe57c7dee8
 EBUILD dhcpcd-ui-0.7.9.ebuild 1670 BLAKE2B 892634b4a79064d3ba090f859e9b455a9391c4f6e0273d396b52b46eb090a45b33e3ed99f6af74525e89fdba3d9e22a655e40bfbe9ded0b3385691d96e2860d8 SHA512 26ba1e59dc89b85a70c8484962038076799dc332dfcf650ed69acafd86e0acd1e4c2070bfc91474eb0bd34c95be730e69ef860a5dfbafed5eb7fa3153f21e242
 MISC metadata.xml 263 BLAKE2B b158e1cc9bc26face8e3b7b4d791a998a637db216ab41d8b809061c1652df0028ff4ffdd67ca515be38304b2a6c53d366fcf05b3e06e816e67e9689b1aadb46b SHA512 2b6c4b4581d1103715b80c20f9d0c5afe2899935f9d18157b8336e72fa5cbf646d38ebd90692af3c8727b1f8484aab162dceb280b0aa331f68bf9fd20a95d26d
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
deleted file mode 100644
index fbb1017029b5..000000000000
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd xdg
-
-DESCRIPTION="Desktop notification and configuration for dhcpcd"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd-ui https://roy.marples.name/projects/dhcpcd-ui/"
-SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gtk libnotify ncurses qt5"
-
-REQUIRED_USE="libnotify? ( gtk )
-	qt5? ( !libnotify )"
-
-BDEPEND="
-	virtual/libintl
-"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-	)
-	libnotify? ( x11-libs/libnotify )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		media-libs/mesa
-	)
-"
-RDEPEND="${DEPEND}
-	>=net-misc/dhcpcd-6.4.4
-"
-
-src_configure() {
-	local myeconfargs=(
-		--without-qt
-		$(use_enable debug)
-		$(use_enable libnotify notification)
-		$(use_with gtk gtk 'gtk+-3.0')
-		$(use_with ncurses curses)
-		$(use_with qt5 qt)
-	)
-	QMAKE="$(qt5_get_bindir)/qmake" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 4ed54f0d5666..835a93993064 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,9 +1,12 @@
 AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6
 AUX dropbear-2022.82-tests.patch 820 BLAKE2B 8b8d7bbc80962fd4be56078d54c12097bd6cedf8cf11ca1b07a3fb39ebd795e3be9f2183482e7e3b06d1be644a2b9afcde372362c6cd4a2baf8f3254cc63b00a SHA512 4ddc65f2e1e86f50fff732d3141b18a3a5260755715e46bcfb5c5e4a261f9c22dff48c19797de972f61b9bb526d0b93f067832c38229c2c1a7e630d30dfcba01
 AUX dropbear-2024.84-dbscp.patch 440 BLAKE2B e0fd05c59a289e605c6b50e740b1f714bb14fd3c5ec3fb1c9a3d003d52ea28494bb26898e5771aab9af23c686b26601641d1333c5636bcb752e119a0b4af1a17 SHA512 8850dc3fc9e7a36970a9388d06dae1789fccc3b564a33efc75d328d875fff67ecb7f8d4e2b200710137ffcd333f22aa457723b843b1bfe81c613012583a58cd1
+AUX dropbear-2024.84-fix-aslr-test-no-venv.patch 489 BLAKE2B 8fe5d284b11c5ebfb3474877278550adb0813e8e8a776b900ce83a8a61c9ce0f2633beb20766c916c5544dd5db44cf92db660b37307bea2a1423db48e221b1bd SHA512 dba51eba70c08b29ee01bf0303e432531bfd0c9d44c19866ee894042bf67471e9fd3c09142d972ddfcc2bac6c0d7aa68219b0019527250bd4eea17dd364772cb
 AUX dropbear-2024.84-fix-channels-tests.patch 1233 BLAKE2B e06ebd5b9b6ef3efa2d2c103bb5a54eb9748aeb7ec16a741abac67f232ad6e9a8a9e84ff6dd4cb1818903dbbafdbbc0c3969a24aa5e00b5ecd3c927d669525c3 SHA512 db07cb4dbf504192b53c4f89b7b52def06dc08536f6d00bff5c015e87676890938a44aabfeff518cb4db0517a2464af57f8339b3bfdfb2d9f037c389dc88007b
+AUX dropbear-2024.84-non-interactive-tests-no-syslog.patch 294 BLAKE2B 66658bb831c2a555bf3b40e5e6ab0e93534db67bfef57285bb2fa59282390170085c096dd8624201c4200c3e4da938c665ab4d7a5e6b26726bfff6d19d861d08 SHA512 79d702d79cac7c12e224e85653fb1bb2b7a08017cbad8ed13e25c7b14bcfe39bfa05a31a2532dab550947868972bcfaf79bf4ab09e87f6a60d8a1734bbbda962
 AUX dropbear-2024.84-non-interactive-tests.patch 300 BLAKE2B 5055d8abee9234cd9a5325bc6fcd4cea2794a8ebe7660afb30727ca893f8caedf3c73e8d0f9a90f0348d58f6569e0f68d18887c2f6b2ab5b3fcde9566c47f16d SHA512 68949b92339e2421e518595aada28ca4c7eec8f7734087e4753da4f7794a038f1fceae61b505ee8f7ac22890ef0ffebac8b773c7e53a5704d584a89670886127
 AUX dropbear-2024.84-test-bg-sleep.patch 530 BLAKE2B 96836fae965d463eab7fba7f5cf3a358e7fac0281739f9911441d5afdb986495caa0ebb7f6e05978fa1740ae6aa6a009f674e8c071718a64e4cb305b4532ddba SHA512 b5758b3f21b1ddf127d2d95363708c67bbe2b584850c7b693a825093222046ffb6682b700a2ef71245d28d147d1ee4fe6dbc96a0e8132aa85fcbc4229d54db4b
+AUX dropbear-2024.84-tests.patch 2296 BLAKE2B c00997667892049c14e877f503843628f9074bb7b99488eb4b6ce98b9b42d20cde375a8158c8a25104c04a6e6404cc0053491780d7c933ad69987ac380647c7b SHA512 1ff5b8dd16fc7f6918b7413bd1b1881d254a0c79340658eef2cd3ab32d95c6a8869cc12d156de54dc9834ebc021c845a90f7a5b19914d21de7c88598f6b72877
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 735 BLAKE2B e3d3c388033934da2e8ea684b9f380cb92147ae359434fd9a03523f683ab553a50dbb8cb879f4bdd12d59b40ddc8d8bede19be7fe9904298a1e273a14a4603ca SHA512 5b8dd52125360967c43d0a3a4ae8748eb33be2fe23b4d54d81cddfb0ef7e6a78b011e3028f41adab7706f83a292bbc8f07711a02c29e6a89488db72aa3ff259d
 DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
@@ -12,4 +15,5 @@ DIST dropbear-2024.85.tar.bz2 2304594 BLAKE2B 631b71733437a256267057a1c4846afa4d
 DIST dropbear-2024.85.tar.bz2.asc 833 BLAKE2B 1d0cc37fb1c528c6f7f6e064d3ec3d7c63617b568d8889592ca162171a325a46e84a23f24c16069b5396c806b2270434552833138ba95c7f34c8b5e6e425fcc7 SHA512 d2ad10b60f53d8d598a7a57337fe890c26c60bea115fb919f6135a01fe3f8f7e5863b0a7ed6c7eacbd5a3b810169b600c0004251a8d748d4b40584933c2c7383
 EBUILD dropbear-2022.83-r1.ebuild 4433 BLAKE2B 6cd0edb8789dcabbfaaed58db535ee6bca645ea687eb2e2d5f15d0fd16b370cdd1075d99960315492182065219b11823101db489233b8ea26392f0c4e9e41776 SHA512 61ab7e9ea1856586e8e15e4089be296a2d2730fe236ea3d07ddf2652ec3cf123d07ec782d0d7bb51e96ef537c09b4421f83a6ef04fa5253e4536740aa66f3854
 EBUILD dropbear-2024.85-r1.ebuild 5062 BLAKE2B d6c63a168ef0e040794cca2cdbc4b77ad386bf34f3c6d3073d5d7fd30ebec8af213f709958e0832fc626e2c18bd38f5fcf1bca4b7573ffe28fa2c79555720af5 SHA512 033e4d740310b0ab6efd00ab1df08239058b613f31843aa679015755c25c75c8dfa248efe46ced583eb52fbe6f9c9d817936a9f4cbfb2f4de4e1ad6cfbd49ab3
+EBUILD dropbear-2024.85-r2.ebuild 5408 BLAKE2B 3eedb9e3f8b436fc7d132d263f4aa7e92466c8b7a4899b4ef7fb045bda7819306ec3284399336d71daccf9b5f11884bb24849d45a2660ad0c165ec5dab4202c1 SHA512 100994259d94fc1d47a514aa475988aabb45a2a528daa7684e4b044ff1b7b16baf57d60443f74c063e51d57cdc6687fe3c847593f42a80a534d11dade7529c49
 MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4
diff --git a/net-misc/dropbear/dropbear-2024.85-r2.ebuild b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
new file mode 100644
index 000000000000..609bbb453aa4
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
+inherit pam python-any-r1 savedconfig verify-sig
+
+DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+SRC_URI+=" verify-sig? (
+		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
+		https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
+	)"
+
+LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	virtual/libcrypt[static-libs(+)]
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? (
+		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
+		>=dev-libs/libtommath-1.2.0
+		${LIB_DEPEND//\[static-libs(+)]}
+	)
+	pam? ( sys-libs/pam )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+BDEPEND="
+	test? (
+		sys-libs/nss_wrapper
+		$(python_gen_any_dep '
+			dev-python/attrs[${PYTHON_USEDEP}]
+			dev-python/iniconfig[${PYTHON_USEDEP}]
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/pluggy[${PYTHON_USEDEP}]
+			dev-python/py[${PYTHON_USEDEP}]
+			dev-python/pyparsing[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/psutil[${PYTHON_USEDEP}]
+		')
+	)
+	verify-sig? ( sec-keys/openpgp-keys-dropbear )
+"
+
+REQUIRED_USE="pam? ( !static )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2024.84-dbscp.patch
+	"${FILESDIR}"/${PN}-2024.84-tests.patch
+	"${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch
+	"${FILESDIR}"/${PN}-2024.84-fix-aslr-test-no-venv.patch
+)
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usev !minimal "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+	)
+}
+
+python_check_deps() {
+	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+		python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+
+	if use static ; then
+		ewarn "Using bundled copies of libtommath and libtomcrypt"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# dropbear does not accept -E if built w/o syslog support and fails the tests
+	if use syslog; then
+		eapply "${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
+	else
+		eapply "${FILESDIR}"/${PN}-2024.84-non-interactive-tests-no-syslog.patch
+	fi
+
+	sed \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		-e '/DROPBEAR_X11FWD/s:0:1:' \
+		src/default_options.h > localoptions.h || die
+	sed \
+		-e '/pam_start/s:sshd:dropbear:' \
+		-i src/svr-authpam.c || die
+	restore_config localoptions.h
+
+	use test && python_fix_shebang test/parent_dropbear_map.py
+
+	# dropbearconver is not built with USE minimal
+	if use minimal; then
+		rm test/test_dropbearconvert.py || die
+	fi
+
+	# bsdpty requires CONFIG_LEGACY_PTYS in kernel; disable tests.
+	# bug #939601
+	if use bsdpty; then
+		rm test/test_channels.py || die
+	fi
+}
+
+src_configure() {
+	# Notes:
+	# 1) We use bundled libtom* when static build is enabled because
+	#    libtomcrypt lacks it and we don't particularly want to add it.
+	# 2) We disable the hardening flags as our compiler already enables them
+	#    by default as is appropriate for the target.
+	local myeconfargs=(
+		--disable-harden
+
+		# bug #836900
+		$(use_enable !elibc_musl lastlog)
+		$(use_enable !elibc_musl wtmp)
+
+		$(use_enable static bundled-libtom)
+		$(use_enable zlib)
+		$(use_enable pam)
+		$(use_enable !bsdpty openpty)
+		$(use_enable shadow)
+		$(use_enable static)
+		$(use_enable syslog)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+
+	# need symlinks for tests
+	if use multicall && use test; then
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+	fi
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman manpages/*.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README.md SMALL.md MULTI.md
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		pushd "${ED}"/usr/bin &> /dev/null || die
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear
+		popd &> /dev/null || die
+	fi
+	save_config localoptions.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
+}
diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch
new file mode 100644
index 000000000000..62e87f230974
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch
@@ -0,0 +1,15 @@
+We don't use a venv for this test, remove it.
+
+--- a/test/test_aslr.py
++++ b/test/test_aslr.py
+@@ -9,9 +9,7 @@
+ 	This indicates that re-exec makes ASLR work
+ 	"""
+ 	map_script = (Path(request.node.fspath).parent / "parent_dropbear_map.py").resolve()
+-	# run within the same venv, for python deps
+-	activate = own_venv_command()
+-	cmd = f"{activate}; {map_script}"
++	cmd = f"{map_script}"
+ 	print(cmd)
+ 	r = dbclient(request, cmd, capture_output=True, text=True)
+ 	map1 = r.stdout.rstrip()
diff --git a/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests-no-syslog.patch b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests-no-syslog.patch
new file mode 100644
index 000000000000..b5a464884d20
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests-no-syslog.patch
@@ -0,0 +1,13 @@
+Force tests to be non-interactive
+
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -23,7 +23,7 @@
+ 	args = opt.dropbear.split() + [
+ 		"-p", LOCALADDR + ":" + opt.port, # bind locally only
+ 		"-r", opt.hostkey,
+-		"-F", "-E",
++		"-F", "-s",
+ 		]
+ 	print("subprocess args: ", args)
+ 
diff --git a/net-misc/dropbear/files/dropbear-2024.84-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-tests.patch
new file mode 100644
index 000000000000..a7c53a42884e
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-tests.patch
@@ -0,0 +1,57 @@
+Create all the keys needed for the tests.
+Enable testing server auth.
+
+dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam.
+Use sys-libs/nss_wrapper to fake it during tests.
+
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -4,18 +4,24 @@
+ 
+ all: test
+ 
+-test: venv/bin/pytest fakekey
+-	(source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) )
++uid:=$(shell id -u)
++gid:=$(shell id -g)
++test: fakekey
++	mkdir -p ~/.ssh
++	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear
++	../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys
++	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear_key2 | grep ^ecdsa | sed 's/[^ ]*$$/key2 extra/' >> ~/.ssh/authorized_keys
++	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear_key3 | grep ^ecdsa | sed 's/[^ ]*$$/key3%char/' >> ~/.ssh/authorized_keys
++	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear_key4 | grep ^ecdsa | sed 's/[^ ]*$$/key4,char/' >> ~/.ssh/authorized_keys
++	echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd
++	echo "$(LOGNAME)::$(gid):" >> ~/group
++	chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group
++	DBTEST_IN_ACTION=y pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
+ 
+-one: venv/bin/pytest fakekey
+-	(source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit)
++one: fakekey
++	pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit
+ 
+ fakekey:
+ 	../dropbearkey -t ecdsa -f $@
+ 
+-venv/bin/pytest: $(srcdir)/requirements.txt
+-	python3 -m venv init venv
+-	./venv/bin/pip install --upgrade pip
+-	./venv/bin/pip install -r $(srcdir)/requirements.txt
+-
+ .PHONY: test
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -27,7 +27,11 @@ def dropbear(request):
+ 		]
+ 	print("subprocess args: ", args)
+ 
+-	p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True)
++	env = os.environ
++	env['LD_PRELOAD'] = 'libnss_wrapper.so'
++	env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd'
++	env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group'
++	p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env)
+ 	# Wait until it has started listening
+ 	for l in p.stderr:
+ 		if "Not backgrounding" in l:
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 86975b71108d..f56ac690d876 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,8 +1,4 @@
-DIST libteam-1.23.tar.gz 173445 BLAKE2B 143e43cb092ac9aab8b152101c4c91c995436a6b02cf85fb710fa095a0bbd46fe70666149cfa9d86135b5496dd0287296e55d68f511aa5965c1d4f22f61ded57 SHA512 f78ceca4606b93e75fafdd97aa3cc44153fc42d31209f216c3da9c71abf38a2e4a690c71b8631ae09e02d7285d6bbd8292983fdc69eb921b0537a75558bc89f5
-DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
 DIST libteam-1.32.tar.gz 177184 BLAKE2B dd3e988d52a373c3c006e749ffee35b12f7b26f0cd154479769b4426d97a23509a52d0b50430ef4220bce4ef6ee73c827b3eeb3fe28537f40f65c45fcacb18b6 SHA512 38a0926f22733000dedb5669e8ba29bd9bce61b00dbdc713220eee520e10ce6eb979b02408f785463cd7b61ff3e57a78b43ed6baffb305e63a0fab0883493507
-EBUILD libteam-1.23.ebuild 1385 BLAKE2B b2e0d1cc1a2462590bddaf1f596ffe2ec5809b3fb0ce93cd5cf061888262d61f2774df44c2bd9f1e4aa1622f1444482ee64744b651a96261235c703be10a0e54 SHA512 5800a8bfd4f8e22bc13b3ebec6001b32893fedf2ecb83a1f4b83d7b216159b176e319ed9148ef9de4e1d75a64507dc6cea5be8da602e1be7645488a9120be579
-EBUILD libteam-1.31-r1.ebuild 1385 BLAKE2B b612417a4cb5696808efa9a1875f80a36109fbd9d40b95a2391779f27561a9f26e662fdea9fe2e7ba2034e8efbb2c138abe4b2b3fd42ffc972f91284b3e39a6f SHA512 b1038ba0dd24b60cb8094da49a54f5cf5e503bd7b73d9c7999b658601a5d4f8ab4a249cd1b4dc596155b6e69dce13b69f349b86352b928b3d52129545b2f58d9
-EBUILD libteam-1.32.ebuild 1439 BLAKE2B 32f33ffe89e0c85c4f327e82ec54e80d583d18ef8f487dd1928668673c1689e76210b9c1ca831fa6597d4372dd4275e16f97f3ed69509019b335ea50f3bcb7c3 SHA512 726788d0c1913a90042ef8b9a2c0f8bb60d175fe32348af32f7a853ff815cd7d543c3310c3ab166ff0ce86f63e025840b06ff5e99fbd18ef67adc1b871605931
-EBUILD libteam-9999.ebuild 1439 BLAKE2B 32f33ffe89e0c85c4f327e82ec54e80d583d18ef8f487dd1928668673c1689e76210b9c1ca831fa6597d4372dd4275e16f97f3ed69509019b335ea50f3bcb7c3 SHA512 726788d0c1913a90042ef8b9a2c0f8bb60d175fe32348af32f7a853ff815cd7d543c3310c3ab166ff0ce86f63e025840b06ff5e99fbd18ef67adc1b871605931
+EBUILD libteam-1.32-r1.ebuild 1531 BLAKE2B bbc6151a01b4c2ccad1e725e3ca5d7f172ed5eb9b9f8cd654b7b1954bccaf4307b39c8b5566001589799334c5be599f41293ca7fc7c35203c618a7d165c39f6d SHA512 1281f32015bd56724987966de78d9d92ded92f0a5f59c4261d7f4707e5348726054601f59a72146086a2d0e3265d3e8d70889c892eda886d22c2f204398d4002
+EBUILD libteam-9999.ebuild 1536 BLAKE2B 530700358726ff283cf4aca7ce976d78f893fcf0ba5e1f751b954066e0c26a9c190cfc5deb10f58c54017cb39a24074cd5f6a53bd69185a3b3a1bf015ecdef71 SHA512 2ab3e5081c9a19f3bab18668f3e7f68193dde789483b468b2a18e064bad8019d25fd96b38a6f27dbaf7e654045cb86141abaf53c05eb59a9751260f826bd695d
 MISC metadata.xml 335 BLAKE2B 481d37450ef0da0cd8a77fd8b73d67fee888f13bd984d52764c8e1694f5e128ad0dafa76c2851780ebc14a72d32a31cf0e598dee6960e9b10bfeca443dbb58ed SHA512 a6cb9893ad138246b783e91995b343d5b99d2becf776917bd413e64946373bfab7389fd958e8096061e1a8f2c52bb35ad69538bbddc6a0a9cba42ccfc1703c00
diff --git a/net-misc/libteam/libteam-1.23.ebuild b/net-misc/libteam/libteam-1.23.ebuild
deleted file mode 100644
index 1b9b1ec0290c..000000000000
--- a/net-misc/libteam/libteam-1.23.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4:=
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
-		$(use_enable zmq)
-}
-
-src_install() {
-	default
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-1.31-r1.ebuild b/net-misc/libteam/libteam-1.31-r1.ebuild
deleted file mode 100644
index 553f8a920da5..000000000000
--- a/net-misc/libteam/libteam-1.31-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4:=
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
-		$(use_enable zmq)
-}
-
-src_install() {
-	default
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-1.32.ebuild b/net-misc/libteam/libteam-1.32-r1.ebuild
index 23c3186d0a44..c2da265182f1 100644
--- a/net-misc/libteam/libteam-1.32.ebuild
+++ b/net-misc/libteam/libteam-1.32-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-inherit autotools linux-info
+inherit autotools linux-info systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jpirko/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library and tools set for controlling team network device"
@@ -20,15 +20,16 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="dbus debug examples static-libs +syslog zmq"
 
-DEPEND=">=dev-libs/jansson-2.4:=
+DEPEND="
+	>=dev-libs/jansson-2.4:=
 	dev-libs/libdaemon
 	>=dev-libs/libnl-3.2.19[utils]
 	dbus? ( sys-apps/dbus )
 	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
+"
 RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
+	syslog? ( virtual/logger )
+"
 
 CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
 ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
@@ -40,11 +41,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable syslog logging)
+		$(use_enable dbus)
 		$(use_enable zmq)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -54,6 +57,7 @@ src_install() {
 
 	insinto /etc/dbus-1/system.d
 	doins teamd/dbus/teamd.conf
+	systemd_dounit teamd/redhat/systemd/teamd@.service
 
 	if use examples; then
 		docinto examples
diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild
index 23c3186d0a44..bd9779d7355e 100644
--- a/net-misc/libteam/libteam-9999.ebuild
+++ b/net-misc/libteam/libteam-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools linux-info
+inherit autotools linux-info systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jpirko/${PN}.git"
@@ -20,15 +20,16 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="dbus debug examples static-libs +syslog zmq"
 
-DEPEND=">=dev-libs/jansson-2.4:=
+DEPEND="
+	>=dev-libs/jansson-2.4:=
 	dev-libs/libdaemon
 	>=dev-libs/libnl-3.2.19[utils]
 	dbus? ( sys-apps/dbus )
 	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
+"
 RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
+	syslog? ( virtual/logger )
+"
 
 CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
 ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
@@ -40,11 +41,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable syslog logging)
+		$(use_enable dbus)
 		$(use_enable zmq)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -54,6 +57,7 @@ src_install() {
 
 	insinto /etc/dbus-1/system.d
 	doins teamd/dbus/teamd.conf
+	systemd_dounit teamd/redhat/systemd/teamd@.service
 
 	if use examples; then
 		docinto examples
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index 318ea3894802..f448b7c66ec0 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -1,5 +1,3 @@
-DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec
 DIST tipcutils_3.0.6.tgz 84464860 BLAKE2B ff1422a651b74eb74351691510ef9f71453f48c713fae3da5239c4775e3d9c9c65621210827fc4fad6bdd1b794b8f20f550aeb3c600652de2c9e288312bfcc47 SHA512 b17f9d8ebd9a7b1134aacde3a2d8d99247c07dd1cab1be51ad7ba354e7384e50ec1bde02e338cb600746226209f0398ee9b2375fcd73191bdb75723bc66af606
-EBUILD tipcutils-2.0.3.ebuild 412 BLAKE2B 2b98ab0fef308984a0813a42d81ce04928d95d04c16702b0eca17d8e9bf1f65feed4c9723995ddf1f589433f433918aa5dd22df49988d63d9e579022f8b12fd3 SHA512 35a2cc33c8593c0b066483055d8169c80c5c48ab93cf2718ab88ca9c9eb040f78c9b1cadf957f3892a267b592341bc2caaeb18438d7cf7690a55e97e75a38877
 EBUILD tipcutils-3.0.6.ebuild 585 BLAKE2B e16d014c531df444a9a552de2624aab38ef8c29c35e79b034a1a67a7fcc67f3a5088fcf488ddbed9871c8fb6fdc10d3b5234f32c2c969a7e34e2e0d66b8c3639 SHA512 49293f7c63834918e695bfaf3155027258c8c26c303aa619b20c5780ac3a94228e6c5d07cc430f0309b2c49b2315a32c52d63dc08167afa3a968bf85a5f0504a
 MISC metadata.xml 242 BLAKE2B 2463df74d3a1b2a051fe5b0c4c8c451201c383a6fc0d1620cf1af24a00e6b19b746ce44129c03b8c148887792afe1631c76150da5090cbd177ddbba2116bb3c7 SHA512 623c82cb794dff9f0dcca67cb95845c3b571272e31495fbb81008866aad59e56567fe937e64991fc486856b85a24fc77c0877cb1e4d2e5a7532ca3b71affe813
diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild b/net-misc/tipcutils/tipcutils-2.0.3.ebuild
deleted file mode 100644
index 02ececd6a08d..000000000000
--- a/net-misc/tipcutils/tipcutils-2.0.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
-HOMEPAGE="https://tipc.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/tipc/${P}.tar.gz"
-
-LICENSE="|| ( BSD-2 GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=sys-kernel/linux-headers-2.6.39"
-
-DOCS=( README )
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index c8ef7a92ce10..a0e77381819a 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1,7 +1,5 @@
-DIST Tuba-0.8.2.gh.tar.gz 1751598 BLAKE2B 9fb0a32d7731ca406a6f79223c862fbe0b75493ace5dc2d83cdab111e955ded2f1b42c31542e38b027245df29ba6a84d88014cafdba0214bdb22910c933989bd SHA512 5d00843ae54c7f32adf5bdbecf0798730f797f778aea55bdc6fff1bf7fdb3b386544a209bd621a92774dcbe25d26503ca9da73211355866452069b6fa4542360
 DIST Tuba-0.8.3.gh.tar.gz 1783840 BLAKE2B 11f98de167107bdc53f42aa6e33af14d946b7745e530623b174832bc7ce363ca7b63f83ed2d58f9b179144ebf0499d6773f5be54c2f8fa0f8897b6a2ae020fe8 SHA512 29082a84e0b5149f8a8610575965d252826d564f28eb128a9db3c215a2c1edda23a3b6316f8b62c22a37ab9d340f94e571ea8be96719a3ff714a6b26da90a314
 DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
-EBUILD tuba-0.8.2.ebuild 1485 BLAKE2B 086983f0f203ccd28029a0e7f9f7181bbcc9400f1f32f08c877f3a138da74bfa14d969e6006e9540bf8a3ea73f1091e4d5c11bd7620d29539cf2c023d2af0049 SHA512 7e2e5f094c2922ad9cab185df380d492ac833e55fc0d058685eef197e8a08a76dfa589b97df5dcc9bf4729add269b9816add99fba68a26b6bcb462a41f54d14b
-EBUILD tuba-0.8.3.ebuild 1487 BLAKE2B b0d2e08a400365b2fc2c6a29f91e16276b971af0e346eb28498cbe57db6810fe73efc24bacdc4f6a96aba79441ace01fae498966741c7fc37c88f15a7edc2161 SHA512 058fd60ea34ee787967cfbb667475a6e8d904489a50eac361fc9a75f31c74edd60b9804c168539ef097f16f311133b0148728c242512c7eba82fbade8b21716d
+EBUILD tuba-0.8.3.ebuild 1485 BLAKE2B 086983f0f203ccd28029a0e7f9f7181bbcc9400f1f32f08c877f3a138da74bfa14d969e6006e9540bf8a3ea73f1091e4d5c11bd7620d29539cf2c023d2af0049 SHA512 7e2e5f094c2922ad9cab185df380d492ac833e55fc0d058685eef197e8a08a76dfa589b97df5dcc9bf4729add269b9816add99fba68a26b6bcb462a41f54d14b
 EBUILD tuba-0.8.4.ebuild 1487 BLAKE2B b0d2e08a400365b2fc2c6a29f91e16276b971af0e346eb28498cbe57db6810fe73efc24bacdc4f6a96aba79441ace01fae498966741c7fc37c88f15a7edc2161 SHA512 058fd60ea34ee787967cfbb667475a6e8d904489a50eac361fc9a75f31c74edd60b9804c168539ef097f16f311133b0148728c242512c7eba82fbade8b21716d
 MISC metadata.xml 324 BLAKE2B b9364b6c365bfaeda33ec6e0600582271501e80f0af0c075545a9d577e823bc4ce35ec37903f2f7f1f22c016b6bb0e7c40ef7d9ba8882fb924a865491bbb8dc7 SHA512 867574ad6665a12cb09aa75c525de101955dabdea5b744e688ab0b7214482ca5d151ed2007c5b050fbc69c48205fdbe5784aea0cb7ebce455d785200048b0a41
diff --git a/net-misc/tuba/tuba-0.8.2.ebuild b/net-misc/tuba/tuba-0.8.2.ebuild
deleted file mode 100644
index 9d6611efb92d..000000000000
--- a/net-misc/tuba/tuba-0.8.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson optfeature vala
-
-MY_P=${P^}
-DESCRIPTION="Browse the Fediverse (GTK client)"
-HOMEPAGE="
-	https://tuba.geopjr.dev/
-	https://github.com/GeopJr/Tuba/
-"
-SRC_URI="
-	https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-# TODO: optional dep on libspelling-1
-DEPEND="
-	app-crypt/libsecret[introspection,vala]
-	>=dev-libs/glib-2.76.0:2
-	dev-libs/icu:=
-	>=dev-libs/json-glib-1.4.4[introspection]
-	>=dev-libs/libgee-0.8.5:0.8[introspection]
-	dev-libs/libxml2
-	>=gui-libs/gtk-4.13.4:4[gstreamer,introspection]
-	>=gui-libs/libadwaita-1.5:1[introspection,vala]
-	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
-	net-libs/libsoup:3.0[introspection,vala]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	$(vala_depend)
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		# disable calling updaters (see pkg_post*)
-		-Ddistro=true
-		# not packaged
-		-Dclapper=false
-	)
-
-	vala_setup
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dosym dev.geopjr.Tuba /usr/bin/tuba
-}
-
-pkg_postinst() {
-	optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
-
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-misc/tuba/tuba-0.8.3.ebuild b/net-misc/tuba/tuba-0.8.3.ebuild
index e75bb85f2c86..9d6611efb92d 100644
--- a/net-misc/tuba/tuba-0.8.3.ebuild
+++ b/net-misc/tuba/tuba-0.8.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 # TODO: optional dep on libspelling-1
 DEPEND="
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index b24c47c6ec3f..561310c61ffb 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,14 +1,7 @@
-AUX wput-0.6-respectldflags.patch 290 BLAKE2B e2880dc839b0eb2052f6f71e32bcb7f37e7ea57b162b661e0a0da216f35cc878f564d05bac1e209a9e0d0851d81f53781002a6237ae8ca2fcf133edd5d79d017 SHA512 48d7f547b5d386f0d80cc3dd96293f112144416b3c59f69ce7827c6f96b303a26cbcd17094b8988ed816113a70e3181846c415de6939034ed5c5c69baab91113
-AUX wput-0.6.2-fno-common.patch 559 BLAKE2B 47937469ca44f74bdbfede40b43fe2900153747ba3fc3735e70b4f6949cb80adb4cb878a7cd9c046d19e05f68921f125b8dd1fdc41459227b5fdd30062e92536 SHA512 4c48dd943e9551d54a70b5c0e289f85af5f4b1518c238a2184e75e62f2fcc1869f681edc48dc40a1249acf98c228c7e79595bc70930b22c1720d82b3e39dc123
-AUX wput-0.6.2-respect-destdir.patch 694 BLAKE2B 4c4466c56b8ecd1e36036c3d33901b76dfe53f918f40f7b3bb34f5e58dc02b701ea7a1969b71d2fdf788b9478d4c5fcaecc7136848fcf2f9e06da09761e58b88 SHA512 a92ef8c35a94b4ff624cb9f1b548cba656151ae88708ed6da889c297e6d09cf161282de9f5324f41ac3d02f2aa0817e86b663637577ff519d780d587cb214c15
 AUX wput-0.6.2_p20130413_p11-exit-not-found-musl.patch 187 BLAKE2B c82a7a26714e725b126dd44ecd8552c3ed4d7741231ff0e916b6b52efbd6753c1a1a95cab654bba16f5674d09166a0a86641b3fd2535ec5969671c0d3b8522b0 SHA512 ea1a376af8dabec687ae55cdb1ed4885df145596ab86aeed71bb109afe1e83661e5f33f2830b26cde9e0a3b369ef827bf5c4b7de8457f46482a192f261221574
 AUX wput-0.6.2_p20130413_p11-no-compress-manpages.patch 1166 BLAKE2B 47443b5de554c9e90dc248168a633c04b39cc06a1b732e57fb7aed20b00541896eeab65068a5397fc883151f4f4e955972e695b88ecb20cdc506e798712c8bf1 SHA512 1337a86ad4dc749bcd774e6cd17db70fb4624166e003c7ca28265b256b39e88f863db3b0e9ccf2e963bbc451fd0dc7a45f155b6f92ba2c81221264d5ba4c1f6f
 AUX wput-0.6.2_p20130413_p11-xopen_source-strdup.patch 607 BLAKE2B 22d150b7ed3d880eb73427fa5847b4892cd772b9de6569d0727afa472043d6d4b6f6795d1ad16964a4a7742cbab0f9f52a158c616893c0efc164b566851cee45 SHA512 06c460f4ec14ba8844330d33c51d75e23f4e023cf468226b23f51b5456bb3bc84940c1baf038f9f1003a0a27a8742b9afab43c5bc04653bcc422a35be0facff7
-AUX wput-fix-crash.patch 1974 BLAKE2B 229d5afe628682831d28ce1ccad0856883061749d863073dbcf58bd0a0cc435d84434d26068309154154e3c15922a0432ecc3fe01127d18767aea5b8d01a83b2 SHA512 2fa1e6793b9cda2695255196f30a5e615a013883efa5b10983c5bd38debf616bfb36ad2e61675700b32f32c0b4057ef7ec0c33c502fc3ead37e1547ecd944783
-DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
 DIST wput_0.6.2+git20130413-11.debian.tar.xz 15976 BLAKE2B 4f1facab61d22544855ce49875357c8d67d6eab013cf73cb8507a334c07b1f9e9391e342347eeafdb26b62a4156d4a0a4e2967198662ad66ef8ebb35ed2c9bf8 SHA512 d80e727edee34bd0f9b40b14c0ed1bfd2ec456542445fd38c487f06d47ca210d785e911a71d455d335b9e3940a5cfc19cc7202d93501b0b0f4f3a1e6f6a5fc0a
 DIST wput_0.6.2+git20130413.orig.tar.bz2 257503 BLAKE2B a5386f5de3e8df23d814b3a7ebba1725bcb75f0a61bd26ea402053bd11d717ae5bdd1c1bc9e43d4f4a61f55a91d9222fffe62988b869b68c206c46bfd89cf28b SHA512 f8bb23f60ae008ecd18ec7f891fc17fe8d2b3550d7788c591067e48af00c934f2c3b2e5d07234fc25bcf6cb94464710ff0309151e9ad6dd734f5a30c3fdab06f
-EBUILD wput-0.6.2.ebuild 854 BLAKE2B 70a81f3e2a7c1f6a52f2683d28196866045de2824ab24fdee12d098e879d9824a81e05b147de4bab2a155ec6206389ab81ccdd563f190e4bf70fc8d392fce17c SHA512 3ed6b3251e1b2528b4064a4955c64f631cac382b9a16ba2d7e48b74e6a9f969478b9e9e034d31d2201e54bc693db2142734d17fc49654e72c93cb2be70c601a0
 EBUILD wput-0.6.2_p20130413_p11-r1.ebuild 1455 BLAKE2B 7674c453b541b2dbcf5b6438c0398e920e549541cd7d729632b2492c1aae9db1c781962a71da2bdb8115557a1e0b2d0d523e3e10b135fa62da700d502e184ace SHA512 4868861b57a5ac2e8804bba9b80b588bc959f3e9259d31fae179e9f4e8312e823641c9d06a8603d4e7a1356d32c0cc958b198549c54c9d7febac4da7f38d2654
-EBUILD wput-0.6.2_p20130413_p11.ebuild 1388 BLAKE2B 613e496f6ab833f507f9d636684d31912aeebe06aa4c5531feca705241f5bf0090a0588a0d9f2c349a8dc14e0904e30e2af1ad0c4bcbac15f0e6f2c6b718ae90 SHA512 240d337044a757d32dbc66346c038092da126c73dd5fbabbeb09e35a2768515cc273996d1f83d9d7ca0cee525455cbfc62c3ce6bd31c5830850591e9f4124633
 MISC metadata.xml 240 BLAKE2B cc04007e3c26bf6c24277f885ef462ee5ee707f8e9d71d897736c9e82cd8ca5f1429139335c3f11c77006d8e087d5e5cf33adcc6737ce0c83811814dbc78847d SHA512 135b84e7440cd922b51279e0b3f661c881c49437ba05e185b9f003dbb2b7a5160e9dd0599d2af40ae3149f057d4f8e18a36092ed0d490219199fc0df344042e3
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
deleted file mode 100644
index 9f0e09c4a78d..000000000000
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wput/src/Makefile.in
-+++ wput/src/Makefile.in
-@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
- ftp-ls.o: ftp.h wget.h url.h
- 
- wput:   $(OBJ)
--	$(CC) -o $(EXE) $(OBJ) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(EXE) $(OBJ) $(LIBS)
- clean:
- 	rm -f *.o *~ *.bak ../wput getopt/*.o
- win-clean: clean
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
deleted file mode 100644
index f188141aa87b..000000000000
--- a/net-misc/wput/files/wput-0.6.2-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
-https://bugs.gentoo.org/706954
---- a/src/wput.h
-+++ b/src/wput.h
-@@ -140,7 +140,9 @@
- 
-   unsigned short int retry_interval;
-   unsigned       int speed_limit;
--} opt;
-+};
-+
-+extern struct global_options opt;
- 
- extern _fsession * fsession_queue_entry_point;
- extern char * email_address;
---- a/src/wput.c
-+++ b/src/wput.c
-@@ -55,6 +55,7 @@
- #include "utils.h"
- 
- extern char *optarg;
-+struct global_options opt;
- 
- #ifdef WIN32
- const static char * version = "0.6.2-w32";
diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
deleted file mode 100644
index 9cece1f388f8..000000000000
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,12 +16,12 @@ win-clean:
- 
- install: all
- 	cd po && $(MAKE) $(MAKEDEFS) $@
--	mkdir -p $(bindir) 
--	mkdir -p $(mandir) 
--	install -m0755 wput $(bindir)
--	install -m0644 doc/wput.1.gz $(mandir)
--	ln -s $(bindir)/wput $(bindir)/wdel
--	install -m0644 doc/wdel.1.gz $(mandir)
-+	install -d $(DESTDIR)/$(bindir)
-+	install -d $(DESTDIR)/$(mandir)
-+	install -m0755 wput $(DESTDIR)/$(bindir)
-+	install -m0644 doc/wput.1 $(DESTDIR)/$(mandir)
-+	ln -s wput $(DESTDIR)/$(bindir)/wdel
-+	install -m0644 doc/wdel.1 $(DESTDIR)/$(mandir)
- 	@echo "----------------"
- 	@echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for"
- 	@echo "usage information."
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch
deleted file mode 100644
index 3d0efc9fd37f..000000000000
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/progress.c
-+++ b/src/progress.c
-@@ -181,7 +181,7 @@
-   static char output[15];
-   time_t secs = time (NULL);
-   struct tm *ptm = localtime (&secs);
--  sprintf (output, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-+  snprintf (output, sizeof(output), "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-   return output;
- }
- 
-@@ -261,11 +261,11 @@
- 		unit = 3, trate = trate / (1024 * 1024 * 1024);
- 	
-     if(trate < 100) 
--		sprintf(buf, "%s%.2f%s", (trate < 10) ? " " : "", trate, units[sp][unit]);
-+		snprintf(buf, sizeof(buf), "%s%.2f%s", (trate < 10) ? " " : "", trate, units[sp][unit]);
- 	else if(trate < 1000)
--		sprintf(buf, "%.1f%s", trate, units[sp][unit]);
-+		snprintf(buf, sizeof(buf), "%.1f%s", trate, units[sp][unit]);
- 	else
--		sprintf(buf, " %d%s", (int) trate, units[sp][unit]);
-+		snprintf(buf, sizeof(buf), " %d%s", (int) trate, units[sp][unit]);
-     return buf;
- }
- /* wrapper for our progress_bar */
-@@ -303,13 +303,15 @@
- 	remain = (int) (WINCONV (fsession->local_fsize - transfered) * ((double) time_diff * 1000)
- 	    / (double) WINCONV tbytes / 1000);
-     if(remain < 60)
--		sprintf(buf, "ETA    %02ds", remain);
-+		snprintf(buf, sizeof(buf), "ETA    %02ds", remain);
- 	else if(remain < 3600)
--		sprintf(buf, "ETA %2d:%02dm", remain / 60, remain % 60);
-+		snprintf(buf, sizeof(buf), "ETA %2d:%02dm", remain / 60, remain % 60);
- 	else if(remain < 3600 * 24)
--		sprintf(buf, "ETA %2d:%02dh", remain / 3600, (remain % 3600) / 60);
-+		snprintf(buf, sizeof(buf), "ETA %2d:%02dh", remain / 3600, (remain % 3600) / 60);
-+	else if(remain < 3600 * 24 * 100)
-+		snprintf(buf, sizeof(buf), "ETA %2d:%02dd", remain / (3600 * 24), (remain % (24 * 3600)) / 3600);
- 	else
--		sprintf(buf, "ETA %2d:%02dd", remain / (3600 * 24), (remain % (24 * 3600)) / 3600);
-+		snprintf(buf, sizeof(buf), "ETA **:** ");
-     /* NO, there won't be an eta of weeks or years! 14.4modem times are gone ;). god bless all gprs-users */
- 	
- 	return buf;
diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild
deleted file mode 100644
index b721e93da415..000000000000
--- a/net-misc/wput/wput-0.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="https://wput.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.2-respect-destdir.patch"
-	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
-	"${FILESDIR}/${PN}-fix-crash.patch"
-	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
-)
-
-DOCS=( ChangeLog INSTALL TODO )
-
-src_configure() {
-	local myconf="--enable-g-switch=no"
-	use debug && myconf="--enable-memdbg=yes"
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl) \
-		"${myconf}"
-}
diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
deleted file mode 100644
index 44e3ab8667a5..000000000000
--- a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="https://wput.sourceforge.net/"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_PV=$(ver_cut 1-3)
-	SRC_URI=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5).orig.tar.bz2"
-	SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5)
-else
-	SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls:= )"
-DEPEND="${RDEPEND}"
-# Debian's patches to fix spelling means need gettext to regenerate
-# It's so common that it's not really worth the 'touch' dance to avoid it
-# or conditional patching.
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.2_p20130413_p11-xopen_source-strdup.patch
-	"${FILESDIR}"/${PN}-0.6.2_p20130413_p11-no-compress-manpages.patch
-)
-
-src_prepare() {
-	eapply $(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series)
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--enable-g-switch=no
-		--enable-nls
-
-		$(usev debug '--enable-memdbg=yes')
-		$(use_with ssl)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 308d0d4ef27d..af9c6fddccb9 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 559a3173cfc5..3f5f6a666a74 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,12 +1,5 @@
-AUX gpsbabel-1.7.0-use_system_shapelib.patch 5998 BLAKE2B 7e1228aae03a7ceab05754ff5f1f5c7f346001a7f0533c9d66744b11d8a748de57783a01ec970e246823f97342283f429a0707939e7ddfd4de429ead6b212de0 SHA512 e73e28becd2c9953501f552a30540511422265647a6d9798499d6558927a5b4d36d019f6c4fd1901d2338ea897ea5fc831e827af4c8a18ffdc7bb38d161b50ad
-AUX gpsbabel-1.7.0-xmldoc.patch 498 BLAKE2B a080771489891b16edb2888a6925b3a37b609fb960cd6a2fbff64707eca040199aae36c93272d27d9b955815d47aa190d4481fc96b4d9d80e0b2b3469f8c136b SHA512 5a8bbaecd5975db4e1be8a1df50ff37937cd537e5fe51d4269a16d8cb8b6a390c05d5ff81925ab4ac7d7055b3822d328287d717a141adbc3534954b75e5f6965
 AUX gpsbabel-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86ef51db7e2962cbd05a33e1b5e5bc5b57845bb3e9e885b85b7ec81cef7c26e424ff3aed81818edb5c749c0b1fc0d1275f545962f1373 SHA512 4b82fdaea637d2bec322b085b3df33e7c493aeec93e145a3f6b1493884c3dd891e0252f9d4a5ec4f75b482178a65de050062fa18f078523426aee60cae002efd
-DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
-DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
-DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
 DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d
-EBUILD gpsbabel-1.7.0-r1.ebuild 1919 BLAKE2B 83c144e9ca5ba4649378e1857694eb87549344d340c2e09d35ace00eb7359b0b0a63b365e9b29b82c61bc973c1a460522c181a110cb5f58f04bda66c8f475a36 SHA512 551fdfb9e4e7382e1f6b6769673b73768feed8085b40ff46e6c45e98d5799d1d9301ca8d88d1fa4b695c57802e3579fe54381f499a39e6c4fd35149f768c80db
-EBUILD gpsbabel-1.8.0-r1.ebuild 2331 BLAKE2B 28d4e039ecbef3466494e32acf5d24069adfc2c420dfb7546e58280e3f791d1095d16aa250ca89ea0db31fe3279119b1765f53aa8197cc4381d4770547816c8b SHA512 e624342624bfd333cfcaa41a55e99eaeb766e1ed8b7739dbcb1948a50fb97fe2a14e78d9b19da520ad1b1f008549b1d96b2dabf75d149643d9676ff065c01782
 EBUILD gpsbabel-1.9.0.ebuild 2158 BLAKE2B 7ad368350a5d1df38b7432ec397118e6b40af0f0e277de0de166f4a0b3a4a1455eb6151e51b421a0a27b4a832cdff1d95dd893754b1b18e07c9caae286e4cb88 SHA512 f2e87c57bb5462e53b6d1950faa3db5d2150eb5892b80a2bd874301c45d9556021fa357fb92858cef8714657ab5a9e0d29235bc68408fdaab79c30406bf38117
 EBUILD gpsbabel-9999.ebuild 1896 BLAKE2B 69c0e2ac096587bebb9054a83315d8e7337d9cd2f01ba2626564839677beb485fdb931f7800ce6d81bb0a7442433698bee045c538b30999fde7747961e6dca39 SHA512 da7a6632c367847347392c0b769a6e35be97462274d14bdb5a60dbfa15368e5b92c1e596f12b69f63571982b778e8cfd28368038eb7dfb0603503ea6f66fc2b2
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch
deleted file mode 100644
index 744400906963..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 5ace8da1..1acadf3e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -104,7 +104,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
- # Extra modules in Jeeps that we don't use
- # 	jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
- 
--SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
-+SHAPE=-lshp
- 
- ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
- 	zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
-@@ -120,7 +120,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
-     src/core/textstream.o \
- 	  src/core/usasciicodec.o \
- 	  src/core/xmlstreamwriter.o \
--	  $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
-+	  $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
- 
- DEPFILES = $(OBJS:.o=.d)
-@@ -153,10 +153,10 @@ toolinfo
- all: gpsbabel$(EXEEXT)
- 
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
- 
- gpsbabel-debug: $(OBJS) @USB_DEPS@
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
- 
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- 	  gbversion.h.in gui/setup.iss.in
-@@ -513,7 +513,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-   ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \
-   src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \
-   mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \
--  shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \
-+  subrip.h unicsv.h src/core/textstream.h xcsv.h \
-   garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-@@ -538,7 +538,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
-   globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \
-   kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
--  qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
-+  qstarz_bl_1000.h random.h shape.h subrip.h \
-   unicsv.h src/core/textstream.h xcsv.h yahoo.h
- garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \
-   zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-@@ -825,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-   dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
-   globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \
-   kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
--  qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
-+  qstarz_bl_1000.h random.h shape.h subrip.h \
-   unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \
-   jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
-   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
-@@ -841,7 +841,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \
-   src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \
-   legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \
--  random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \
-+  random.h shape.h subrip.h unicsv.h \
-   src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-@@ -961,10 +961,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
- shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
--  shape.h format.h shapelib/shapefil.h
--shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
--shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
--shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
-+  shape.h format.h
- skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
-@@ -1059,7 +1056,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \
-   src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \
-   legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \
--  random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \
-+  random.h shape.h subrip.h unicsv.h \
-   src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-diff --git a/shape.cc b/shape.cc
-index 933eb95a..f2ec5365 100644
---- a/shape.cc
-+++ b/shape.cc
-@@ -32,7 +32,7 @@
- 
- #include "defs.h"
- #include "shape.h"
--#include "shapelib/shapefil.h"
-+#include <libshp/shapefil.h>
- 
- 
- #if SHAPELIB_ENABLED
-diff --git a/shape.h b/shape.h
-index 0ce05af7..09931eff 100644
---- a/shape.h
-+++ b/shape.h
-@@ -27,7 +27,7 @@
- 
- #include "defs.h"               // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
- #include "format.h"             // for Format
--#include "shapelib/shapefil.h"  // for DBFHandle, SHPAPI_CALL, SHPHandle
-+#include <libshp/shapefil.h>  // for DBFHandle, SHPAPI_CALL, SHPHandle
- 
- 
- #if SHAPELIB_ENABLED
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch
deleted file mode 100644
index 56c60a553485..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in	2017-01-21 00:32:50.921546762 +0100
-+++ b/Makefile.in	2017-01-21 00:55:45.362728521 +0100
-@@ -278,8 +278,8 @@
- 	  --stringparam html.cleanup "1" \
- 	  --stringparam make.clean.html "1" \
- 	  --stringparam html.valid.html "1" \
--	  --stringparam html.stylesheet \
--	  "https://www.gpsbabel.org/style3.css" \
-+	  --nonet \
-+	  --stringparam html.stylesheet "gpsbabel.org-style3.css" \
- 	  http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
- 	xmldoc/readme.xml
- 
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
deleted file mode 100644
index 36dfe7b2188f..000000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-MY_PV="${PV//./_}"
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
-	SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
-else
-	SRC_URI="
-		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
-		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
-	"
-	KEYWORDS="amd64 ~ppc ~x86"
-	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="
-	dev-qt/qtcore:5
-	sci-libs/shapelib:=
-	sys-libs/zlib
-	virtual/libusb:1
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-xmldoc.patch
-	"${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-
-	# ensure bundled libs are not used
-	rm -r shapelib zlib || die
-	# remove prerequisite zlib/zlib.h
-	sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
-	# remove failing test (fixed by f91d28bf)
-	rm testo.d/arc-project.test || die
-
-	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862576
-	# Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824
-	filter-lto
-
-	econf \
-		$(use_with doc doc "${S}"/doc/manual) \
-		QMAKE=$(qt5_get_bindir)/qmake \
-		--with-zlib=system
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		perl xmldoc/makedoc || die
-		emake gpsbabel.html
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
-
-	default
-}
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
deleted file mode 100644
index 878957ca68bc..000000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake desktop flag-o-matic xdg
-
-MY_PV="${PV//./_}"
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
-else
-	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc qt6"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-
-RDEPEND="
-	dev-libs/expat
-	sci-libs/shapelib:=
-	sys-libs/zlib:=[minizip]
-	virtual/libusb:1
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtserialport:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets,xml]
-		dev-qt/qtserialport:6
-		dev-qt/qtwebchannel:6
-		dev-qt/qtwebengine:6[widgets]
-		dev-qt/qt5compat:6
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# ensure bundled libs are not used
-	rm -r shapelib zlib || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/862576
-	# Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824
-	filter-lto
-
-	local mycmakeargs=(
-		-DGPSBABEL_WITH_LIBUSB=pkgconfig
-		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
-		-DGPSBABEL_WITH_ZLIB=pkgconfig
-		-DGPSBABEL_MAPPREVIEW=ON
-		-DGPSBABEL_EMBED_MAP=ON
-		-DGPSBABEL_EMBED_TRANSLATIONS=ON
-		-DUSE_QT6="$(usex qt6)"
-	)
-
-	cmake_src_configure
-}
-
-cmake_src_compile() {
-	cmake_build gpsbabel
-	cmake_build gpsbabelfe
-	use doc && cmake_build gpsbabel.html
-}
-
-src_install() {
-	use doc && dodoc gpsbabel.html
-	einstalldocs
-
-	dobin gpsbabel
-	dobin gui/GPSBabelFE/gpsbabelfe
-	insinto /usr/share/${PN}/translations/
-	doins gui/gpsbabel*_*.qm
-	newicon gui/images/appicon.png ${PN}.png
-	domenu gui/gpsbabel.desktop
-}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index fc6228944d4f..e3565da5a63b 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,11 +4,11 @@ AUX qgis-3.36.3-qt6-Fix-broken-test.patch 1091 BLAKE2B 5fc073355b71e4cc932c3a3f7
 AUX qgis-3.36.3-qt6.patch 1523 BLAKE2B 2a79e10ea3cbccb75e2af8b59c717668c379159897c508ce5b9a471df0f4ff45a9f9e5511b5fbd7655c0e9137339ebbada1fcba18b65ce2998f3338eecbd55d5 SHA512 f108a26274acb8c7e871aa6dd214897873f31e521f9bc0811404b13d7025a8414c0f50e066afa281d23c085bf8bd846e60e75919f859b4e0456b330ea7728645
 AUX qgis-3.36.3-testReportDir.patch 651 BLAKE2B 04dcbad99cfd7156f284284cd165b39231de5ee29d45cd132d5afef7ceaa6197920385ffaf2f339c0ab943e2af2ceb5d5a232d3c5f9f753df7621d4d9ef9e18b SHA512 faf701cd2f83c966826933fbb9f8abbfdd3cce4278a6c9ace55641ce31fc7e8d282872aff7e7ea5a8e31f7590d94b53b608b0344daff3107f095914ebbcb0fe8
 DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
-DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a
 DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff
+DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.28.10.ebuild 11506 BLAKE2B c97b36829915ca90307b1881ae39945684ad6445bc7bef95c5e64215e9430fea6b6dc4aa286dd36b769fd92ed1d6fa657b335442c1e5fb44fad2ff76fb77cfc5 SHA512 40de0aa4183f1155081e1bf23fecb8e25c200eeb308a4a0b954899e0241ae01395142ccd501dea42bbd3b45255790dbcecc0bce384d909e457ce4ef1886f878d
-EBUILD qgis-3.36.3-r1.ebuild 13296 BLAKE2B e497ec73b97ebe75fb3af133e346afb7cbba032058b0c1f9c76ee8eb2c73004da8df1bcf148154d4b5786770d897ac3d515f512f12e7ea23d17050e026964be7 SHA512 cd9e4548a8bec164d4160fd67044f75fb0554e6113c5a87fa332a19356f5e1247a81d431dab78d5b85e41bf7e48d86bbf0312ebeb9d8ac5fd6636f1cbf9c82cb
+EBUILD qgis-3.28.10.ebuild 11501 BLAKE2B de9db2760f0c4527f6dfd668b0b52006820b0a128ef6b0e3f5c0feee06152e831c54f4d8e271a4741280950e5b1da075fa687b6996593c9e1656c1b6090f8d5c SHA512 a42e3e061ee52f7433d70e37bbfe0a13753090e2630bdf68fa7d4bc8bbfb21ec2e5a7f2b1ea0d8f05a6ae22a5b2ed87b81747266f6f2a249a5f5d81cfe119727
 EBUILD qgis-3.38.0-r1.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e
+EBUILD qgis-3.38.3.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e
 EBUILD qgis-9999.ebuild 12331 BLAKE2B 3191c84a4f704522ab6db96f900df19930f76d846376be249c4cb1fd243c4afe3c40298da4ec6479a64847c6b1778f640da00bbcce657584445e16878ed34f38 SHA512 49a063764e29a164f7d107b365120982389cc0d575335ef9f861a5affa50002e894e8ec631c3cb6946db4e4426f665ea414646b7385f888531d21200397cac8e
 MISC metadata.xml 1696 BLAKE2B 21bdfb035c471861aea5ab8c4ce2e632bcb6dafa0bd3cd0733a3533288c4a6a8f2e5e313a39db8757f11f204d15ca73b3d9b779f3156e7682293db58d24ec20b SHA512 189003c5dec06dd14c57bff372b656dfa5e5febc942ef418782d31f80eeab0d93c7e44bc850719543f5de6b1e08a3e2b2c1596b964d58c942e35441f913b43c3
diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
index 6b2233260c1e..bff6a620ed00 100644
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
diff --git a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.38.3.ebuild
index 43309edb502c..0284f8d105e8 100644
--- a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.38.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 inherit cmake flag-o-matic python-single-r1 virtualx xdg
 
@@ -25,23 +25,30 @@ HOMEPAGE="https://www.qgis.org/"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	mapserver? ( python )
-	qt6? ( polar )
-	test? ( postgres )
 "
+# 	test? ( postgres )
 
 # Disabling test suite because upstream disallow running from install path
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
+	app-crypt/qca:2[qt6,ssl]
 	>=dev-db/spatialite-4.2.0
 	dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/libzip:=
 	dev-libs/protobuf:=
+	dev-libs/qtkeychain[qt6]
+	dev-qt/qttools:6[designer]
+	dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
+	dev-qt/qtmultimedia:6
+	dev-qt/qtpositioning:6
+	dev-qt/qtserialport:6
+	dev-qt/qtsvg:6
 	dev-vcs/git
 	media-gfx/exiv2:=
 	>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
@@ -49,6 +56,9 @@ COMMON_DEPEND="
 	sci-libs/libspatialindex:=
 	>=sci-libs/proj-4.9.3:=
 	sys-libs/zlib
+	>=x11-libs/qscintilla-2.10.1:=[qt6]
+	>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6,svg(+)]
+	3d? ( dev-qt/qt3d:6 )
 	georeferencer? ( sci-libs/gsl:= )
 	grass? ( sci-geosciences/grass:= )
 	hdf5? ( sci-libs/hdf5:= )
@@ -77,73 +87,15 @@ COMMON_DEPEND="
 			>=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sip:=[${PYTHON_USEDEP}]
-			postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] )
-			!qt6? (
-				dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt5]
-			)
-			qt6? (
-				dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
-				>=dev-python/qscintilla-python-2.10.1[qt6]
-			)
+			postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+			dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt6]
 		')
 	)
-	!qt6? (
-		app-crypt/qca:2[qt5,ssl]
-		dev-libs/qtkeychain[qt5]
-		x11-libs/qwt:=[qt5(+),svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt5]
-		dev-qt/designer:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtserialport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		3d? ( dev-qt/qt3d:5 )
-		polar? (
-			|| (
-				(
-					x11-libs/qwt:5
-					x11-libs/qwtpolar
-				)
-				(
-					x11-libs/qwt:6/1.5
-					x11-libs/qwtpolar
-				)
-				(
-					>=x11-libs/qwt-6.2[polar(+)]
-				)
-			)
-		)
-		qml? ( dev-qt/qtdeclarative:5 )
-	)
-	qt6? (
-		app-crypt/qca:2[qt6,ssl]
-		dev-libs/qtkeychain[qt6]
-		>=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)]
-		>=x11-libs/qscintilla-2.10.1:=[qt6]
-		dev-qt/qttools:6[designer]
-		dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
-		dev-qt/qtmultimedia:6
-		dev-qt/qtpositioning:6
-		dev-qt/qtserialport:6
-		dev-qt/qtsvg:6
-		3d? ( dev-qt/qt3d:6 )
-		polar? ( x11-libs/qwt:=[polar(+)] )
-		qml? ( dev-qt/qtdeclarative:6 )
-	)
+	qml? ( dev-qt/qtdeclarative:6 )
+	webengine? ( dev-qt/qtwebengine:6 )
 "
 DEPEND="${COMMON_DEPEND}
-	!qt6? (
-		dev-qt/qttest:5
-	)
 	test? (
 		python? (
 			app-text/qpdf
@@ -155,20 +107,14 @@ RDEPEND="${COMMON_DEPEND}
 	sci-geosciences/gpsbabel
 "
 BDEPEND="${PYTHON_DEPS}
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
+	dev-qt/qttools:6[linguist]
 	app-alternatives/yacc
 	app-alternatives/lex
 	doc? ( app-text/doxygen )
 	test? (
 		python? (
 			$(python_gen_cond_dep '
-				!qt6? (
-					dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-				)
-				qt6? (
-					dev-python/PyQt6[${PYTHON_USEDEP},testlib]
-				)
+				dev-python/PyQt6[${PYTHON_USEDEP},testlib]
 				dev-python/nose2[${PYTHON_USEDEP}]
 				dev-python/mock[${PYTHON_USEDEP}]
 			')
@@ -177,7 +123,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
+	# "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch"
 	"${FILESDIR}/${PN}-3.36.3-qt6.patch"
 	"${FILESDIR}/${PN}-3.36.3-testReportDir.patch"
 )
@@ -219,7 +165,7 @@ src_configure() {
 
 		-DPEDANTIC=OFF
 		-DUSE_CCACHE=OFF
-		-DBUILD_WITH_QT6="$(usex qt6)"
+		-DBUILD_WITH_QT6=ON
 		-DWITH_ANALYSIS=ON
 		-DWITH_APIDOC=$(usex doc)
 		-DWITH_GUI=ON
@@ -233,7 +179,8 @@ src_configure() {
 		$(cmake_use_find_package netcdf NetCDF)
 		-DUSE_OPENCL=$(usex opencl)
 		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_QWTPOLAR=ON
+		-DWITH_QTWEBENGINE=$(usex webengine)
 		-DWITH_PDAL=$(usex pdal)
 		-DWITH_POSTGRESQL=$(usex postgres)
 		-DWITH_BINDINGS=$(usex python)
@@ -298,6 +245,10 @@ src_configure() {
 }
 
 src_test() {
+	addwrite "/proc/self/mem"
+	addwrite "/proc/self/task/"
+	addwrite "/dev/fuse"
+
 	local -x CMAKE_SKIP_TESTS=(
 		PyQgsAFSProvider$
 		PyQgsAnnotation$
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index c0fcf1756d9c..d242befbba15 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,5 +1,5 @@
 AUX viking-1.10-terraserver.patch 1286 BLAKE2B a10fb99632db730a03b1e34d2f3021ff5ab02905676052b409b25577b7f7e03f90572ddf201b0b6345b80c3704cc30582b266a613144cfb21e30afd7b9a78a88 SHA512 82a868cdd85b1d1886fa4b8e86fef5bf67b283453e5bb160b9fc9b15685727cab558f2b73f61c1a8e63e8bb366cfc0c22abca68865aba9fbc45bb6fc5153ec36
 DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.10.ebuild 2100 BLAKE2B 4346b9649e6252d5f69a809d44437237f9382b1ce58289468e3e09d4558a996db763ae30d79c8fabf01d00490357f3b8debeb362a4ef887060dcc313dbff3e80 SHA512 96b280af85f57f1ca63e9e05f38aaf7739fe42d95137859fbd64e1b19c879f2d8f0fe8200b0c8f7e06e0dbc6bc3b4d0d1e25eed00c6990ec3afd1d7f5f4494b6
+EBUILD viking-1.10.ebuild 2095 BLAKE2B 416d6bb44575e987b9503b66afc8ed294f189511abdfd1488f258bc2f3892de61e0d25aca65a4db833e7f2683fd566ecc1b1e66f9bc9167fbd13b43f7fbaf923 SHA512 a20f3bcbec9687fdba4c83282464c444f6798a85753177fde114bbdb125219fcb07774eda054c3c7eef927f4378d8a9937b28e6c2249087f1abdcc12ae4c009f
 MISC metadata.xml 793 BLAKE2B 21b6c3d0751f98fd8d90b260b54b9a3ef004b35f9fbb088dd664f60a72a1618df90464288075043d30754d95ebea1aa6e261ce3a280fda005a029c4dd4dac971 SHA512 9e436dedcc783f3c0c1c678905ec1381f7fe56f50480680448401b4ce06ccaffbc954debd52bb98af8008df468220482f155ee53db071e6b8b5adf1a6d600da5
diff --git a/sci-geosciences/viking/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild
index f3cde20cb986..67a1e9561987 100644
--- a/sci-geosciences/viking/viking-1.10.ebuild
+++ b/sci-geosciences/viking/viking-1.10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="doc +exif libexif geoclue gps +magic nls oauth"
 
 COMMONDEPEND="
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 08106bdd7810..0a4245100f4d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 609806f2ae2a..0390a1871e16 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,13 +2,11 @@ AUX 35-amd-microcode-systemd.install 1276 BLAKE2B 02931b234a85400824d61e815e6f65
 AUX 35-amd-microcode.install 1321 BLAKE2B 4205a10d0224869245b62707ae830dd290dfd198dacd2db9702ea4a7e48408e18c398940d15066bf9cd88217b4d35fbd2b63578d2354bc138072f17a0b5cfcc9 SHA512 037c10c4be658022cab76fda45a41bcf4e49d31470444c719bf2eba04a73b24d6a3eab7404c5f194f812f136e8503336768090b82f027717df4712e4725f0cf5
 AUX linux-firmware-copy-firmware-r4.patch 1538 BLAKE2B 65712bb1b6ba0d4c2a04f2e202a4a9ee272aca364813825f568a6544b7b63537fc44a4304269fd323c9299f8dce4744414f8fe859958d5f9b52d57c9822615b4 SHA512 56694eb4ae6ec13093f1e3f86df9f5494109693f6456ed6d3ad2b2041deae0ce36e2919d256025f7442fcf0e966c0954ce4634c717e4e7cb68fc6d34ae5554f3
 AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655ebb517c71e3ac73ca636df3c534d4bd5de4ab175b5aa3d40bffe5c126e292a08cff677542df276660380d3b1f474326c9e456b2ee1 SHA512 21465fe141d5c58bb9a50653788f1084833b0a698aaca4b2dc589bd9129c9f3ee87f179791ef5dd8fda4182a48e378e0f83abbb452422b3462b8e81b57ca43a0
-DIST linux-firmware-20240610.tar.xz 375519640 BLAKE2B 242dbd9d85eabeb8eeebbba86ae80633c412553f0eaac393b2792b99b0f0a8567db68d9c18e92be35809af9a3bf2cebd620c30d6fc518a312b19e8c8756316f9 SHA512 608d8fc12172e8461b66e9917f61ecb86e1c6b6fc260382e7382d61bbf08c1b0cc819207e93ac979a336b463b740c5ad7a7577b823caadb1c61606b7e070ddaf
 DIST linux-firmware-20240709.tar.xz 376713860 BLAKE2B 33ea1ca0ffafa37b72604386954f05d9eab09dba29c7d28a8b34dabd2c3133b6d4727998b5dad27a8e629877fc63555ee96359a84eb1d133603c3098bac49e72 SHA512 705d092b0ec5002300a91b679e806137e92bf3d4e1edd998e885e8da88297d8791048ee8ad9727546b13fa08aeadab54254eaed8f6f5a9663429eb54746dfb63
 DIST linux-firmware-20240811.tar.xz 379287388 BLAKE2B abcd5eff8e7bd7200079a691e4c09dcc7f349e09eb35c3eae594a7b27eef714767f0eaa92e259b32f4d347f7b6a2ee710332b728546305a01558d732dd947ac6 SHA512 4ea6c24f4bf60eb7ae4cd2993ce4e9dadb03ca7e92f8ccb4778fcebd5c32e16ba8c6095e74b9ed6a111f1b44b983177b52f35a9ad8be7d1dfec2de29a296b8d1
 DIST linux-firmware-20240909.tar.xz 383099276 BLAKE2B 3769ca5501db43a6d1ca54ac11d6857087c51d064ee58f3da543ab713ce8280dbe4206a2d3d00431518e509b260fe9be0f1eb15fe2e737647468f76f2e7282ac SHA512 d1918364f9925291da722075cf2d038082a6b6b5c6d7e5ab8b0888c5e87563718934f493fe172db21608d6eace92ade5c519b5f50b1fc7f25a328e45be059142
-EBUILD linux-firmware-20240610-r3.ebuild 10986 BLAKE2B 17df850a9cafd4d502efed1967f6368dea3ddf3c7043c37db4f3010ceb2d1651fda239bf94e474e5c46a7ae172d1740ebb44d51c2e8f1d8c9fc3e6f7af6e17b0 SHA512 5b3844d8b23ca2805e312842f173ee4c0239bc7a7ab2d385d76e2915ce6c21fbe666848cdc399b5d1a04d9bcfcbc8afc47b16f8aece94c061bf4058da8a7c97c
 EBUILD linux-firmware-20240709-r1.ebuild 10978 BLAKE2B cdbaeb7deeccaea846352c1eae37853692241ab632882307c1050506f42fa0195f675b0a507e2f1003439b6a5b4b939bc1c1f887a70f8d80d4dddaf7baac83f9 SHA512 c86dbe06d73d56dba9b22d5eb950125aeb761df85c3b9b5d48bf61e3ee7ccd683c705a30e96d6621859da5baeba01af3f52a60d8b460b5fdcdf092ff0a412bd5
 EBUILD linux-firmware-20240811.ebuild 10978 BLAKE2B cdbaeb7deeccaea846352c1eae37853692241ab632882307c1050506f42fa0195f675b0a507e2f1003439b6a5b4b939bc1c1f887a70f8d80d4dddaf7baac83f9 SHA512 c86dbe06d73d56dba9b22d5eb950125aeb761df85c3b9b5d48bf61e3ee7ccd683c705a30e96d6621859da5baeba01af3f52a60d8b460b5fdcdf092ff0a412bd5
-EBUILD linux-firmware-20240909.ebuild 10986 BLAKE2B 1fc9a347d0e456aaa361b012bbe95a60bb4867e4a0ef912c00f171ea8138e3a8ebcb9304ee28dfaf3a4ab41d3b35ae98ed72a86e6aeae30ae1cb72d536749a33 SHA512 725d3e5e7d8c31c1ad6229255d1d1c5402e60f7ac0e4b89c5eb65b1841e3c5cd378e93b539fa02c2f592b6e423a4e02d9a7c93355316d99d35511871a3c0d580
+EBUILD linux-firmware-20240909.ebuild 10978 BLAKE2B cdbaeb7deeccaea846352c1eae37853692241ab632882307c1050506f42fa0195f675b0a507e2f1003439b6a5b4b939bc1c1f887a70f8d80d4dddaf7baac83f9 SHA512 c86dbe06d73d56dba9b22d5eb950125aeb761df85c3b9b5d48bf61e3ee7ccd683c705a30e96d6621859da5baeba01af3f52a60d8b460b5fdcdf092ff0a412bd5
 EBUILD linux-firmware-99999999.ebuild 11274 BLAKE2B fc37e14dcae60baf7c45191874f6276b3e2b7956dba364d1b36b62eb952554699d3104662ea7031a41cce45e9231cb5218d7412ca76c60a28eb3ad975da6124e SHA512 80c6cbb24a3bba0e4b87b22d8741d8d2571ab808ba32b46ce9f9b7b19ab4bfc805aabb765b57d37f8b6b086e904fc2cafcde5e277deafd4e133b9181408e4a04
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240610-r3.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240610-r3.ebuild
deleted file mode 100644
index 93c3c087f203..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20240610-r3.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit dist-kernel-utils linux-info mount-boot savedconfig
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT=""
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )
-	?? ( compress-xz compress-zstd )
-	savedconfig? ( !deduplicate )"
-
-RESTRICT="binchecks strip test
-	!bindist? ( bindist )
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-alternatives/cpio )
-	compress-xz? ( app-arch/xz-utils )
-	compress-zstd? ( app-arch/zstd )
-	deduplicate? ( app-misc/rdfind )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)
-	dist-kernel? ( virtual/dist-kernel )
-"
-IDEPEND="
-	dist-kernel? (
-		initramfs? ( sys-kernel/installkernel )
-	)
-"
-
-QA_PREBUILT="*"
-PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch )
-
-pkg_pretend() {
-	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			# Check, but don't die because we can fix the problem and then
-			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
-		else
-			mount-boot_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use compress-xz || use compress-zstd ; then
-		local CONFIG_CHECK
-
-		if kernel_is -ge 5 19; then
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
-			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
-		else
-			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
-			if use compress-zstd; then
-				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
-			fi
-		fi
-	fi
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	find . -type f -not -perm 0644 -print0 \
-		| xargs --null --no-run-if-empty chmod 0644 \
-		|| die
-
-	chmod +x copy-firmware.sh || die
-	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
-	chmod +x "${T}/make-amd-ucode-img" || die
-
-	if use initramfs && ! use dist-kernel; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			"${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		copy-firmware.sh
-		README.md
-		WHENCE
-		LICEN[CS]E.*
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-
-	local FW_OPTIONS=( "-v" )
-	local files_to_keep=
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
-		fi
-	fi
-
-	if use compress-xz; then
-		FW_OPTIONS+=( "--xz" )
-	elif use compress-zstd; then
-		FW_OPTIONS+=( "--zstd" )
-	fi
-	! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" )
-	FW_OPTIONS+=( "${ED}/lib/firmware" )
-	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	popd &>/dev/null || die
-
-	# Instruct Dracut on whether or not we want the microcode in initramfs
-	(
-		insinto /usr/lib/dracut/dracut.conf.d
-		newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)"
-	)
-	if use initramfs; then
-		# Install installkernel/kernel-install hooks for non-dracut initramfs
-		# generators that don't bundled the microcode
-		dobin "${T}/make-amd-ucode-img"
-		(
-			exeinto /usr/lib/kernel/preinst.d
-			doexe "${FILESDIR}/35-amd-microcode.install"
-			exeinto /usr/lib/kernel/install.d
-			doexe "${FILESDIR}/35-amd-microcode-systemd.install"
-		)
-	fi
-
-	if use initramfs && ! use dist-kernel; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-
-	dodoc README.md
-	# some licenses require copyright and permission notice to be included
-	use bindist && dodoc WHENCE LICEN[CS]E.*
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Fix 'symlink is blocked by a directory' Bug #871315
-	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
-		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-		else
-			# Don't forget to umount /boot if it was previously mounted by us.
-			mount-boot_pkg_postinst
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild
index 7668fa9db735..1e3b95400045 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240909.ebuild
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index ef8d2bc62915..81376d75f69a 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,8 +1,8 @@
 DIST ugrd-1.13.0.tar.gz 63781 BLAKE2B 3f2d3095c6303b16947121071dabdbef81baaea5a7e208d53250e57edf136618497710ce3cca2906b87fbdc529b8a9ef119659365bba8c795594774cf8d096f6 SHA512 a745685668e981accfd32d1c47c6cf506ae63304ef5b3fdad200731db75b76fe56a4339876465bb1857c2fed35c273f95bbce390224fa0d01aebd67adbc31aa6
 DIST ugrd-1.17.0.tar.gz 69517 BLAKE2B 2acadac8ab3830791146522ccfff6f8c5e98eff4cea355dafd5f5498bedf5d0f200ec2bc2ee4a20c62e3920590c70b2c788c776c148e7291cd3391eb2e0018df SHA512 5caeebadb579536a60cecd6c9fd9036c178ab5c5700418b95841e7102ac0c3c5fa14ceebc9994a86f65bd0623ca819ed7cb7a986f412e0358c9597c0e579f90c
-DIST ugrd-1.19.4.tar.gz 63998 BLAKE2B b6a0f7db7e962f84d695e478f79116329b622505393d17c94d3501ab461dafd3047c25f7ad14b8c4ceea9177b4fdb6e3536952a440096af6619fdf4154252254 SHA512 8504d1f673ed1c1510729376e4419166f88357ef655106c20783071b3dc6c442e9b9ae166781de55f60572ce24f8f31eb3079750d523d99340aafed822073729
+DIST ugrd-1.20.0.tar.gz 64541 BLAKE2B d85241e6c0822d3df0d65cc07cb17014b4d66554476caf4d37ebc77943c57ef3004e1e01b4eb504974b2ab9d1a03015812e8b0cb19ebf03667a9f6c7a1bded03 SHA512 88f137fa5fc4cb61418cda03c0c58ff7632c1e61b7688ad9e8cce538842d817e973c1d2293b8bb92b9697a29511cb535059ca060793ba6353d95d5ddad417f3a
 EBUILD ugrd-1.13.0.ebuild 1462 BLAKE2B 52d73a0564a64c31a1fa9cb02377f6735e883ee3f7c68f1fbdf404ebedf12faad5641e815cd09b9797e52378a462a56036d7a3106d5c35f9c15f1fe074712fd8 SHA512 6568990c8bf6f20fc49f8ae8d1080cfff04593b8255b361efe18e0e5a09fe8eeb1160cdbff2b1b2276f12860f5b3e0a7dd08302cc2d6f073f2759d72a35467b0
 EBUILD ugrd-1.17.0.ebuild 1462 BLAKE2B c57694a328f9ee661569bac819216461fa9545f3ff00f2514994f8bc7ca0b5137dcda1d4e8ddf880fddb2fb7a515fa3c49dd62b99aa82349c46e57529d951ea0 SHA512 c7216215e70de33ee35007c89a717ac9c175e47c18bdfd70663a62b25f3e9bf79297679c05a030b8be913387498c6101d3a60da56f748345c467d8c4fa7dd1d6
-EBUILD ugrd-1.19.4.ebuild 1991 BLAKE2B 0db47c00e898694c37b7f0ae4d626b81d941d8014d88187b02652ce137dccf4cdc51ebac7999ff2da70e63b2e714b89c0d464727dbfe6055a92ab5e881adac1d SHA512 a856a599f75758fd6afb9d3027aeb351d572601c553b631ad778fd8dde642a81f6fa24496eba16f7c7f83f9d433a41f44e2aa2937b6bfb657e1f599ef06b4154
+EBUILD ugrd-1.20.0.ebuild 1991 BLAKE2B 0db47c00e898694c37b7f0ae4d626b81d941d8014d88187b02652ce137dccf4cdc51ebac7999ff2da70e63b2e714b89c0d464727dbfe6055a92ab5e881adac1d SHA512 a856a599f75758fd6afb9d3027aeb351d572601c553b631ad778fd8dde642a81f6fa24496eba16f7c7f83f9d433a41f44e2aa2937b6bfb657e1f599ef06b4154
 EBUILD ugrd-9999.ebuild 1931 BLAKE2B d768579786527265b6a221631aa3fdd1c25823dfe407949e5653e36b2e7f6aaaeab2c09d1467e751f095032cce86663470d73c3e6d0b7edc1aa443f596553e79 SHA512 be266b431abdb0ca0b0854e14023dfd20b17441399900ec64757b435c12f8781b57ed95d32290001b916c2687e7ee22f0c04005d4c8ec734b4ec87a7b8662a7b
 MISC metadata.xml 459 BLAKE2B 4b2afaf098699bd77c60b089a853528c9f8c054623c8c317ec99090572dc5d2e686150303fa69b739f0e654e35e6fe2f43f71df8920cfdb83b17393a67425c22 SHA512 78b8572050924ef651f833821bc1b15ce6e989311a30f0970d966fae78287263f14d67db59b4fc93dd0d8d1c07b89b9b05c42f325b61337f497589b769fdf103
diff --git a/sys-kernel/ugrd/ugrd-1.19.4.ebuild b/sys-kernel/ugrd/ugrd-1.20.0.ebuild
index 6869d9c50265..6869d9c50265 100644
--- a/sys-kernel/ugrd/ugrd-1.19.4.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.20.0.ebuild
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 96990580bb65..4ec62d2a6874 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 087e47d23892..2809c68544ec 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -4,19 +4,23 @@ DIST nextcloud-27.1.11.tar.bz2 186141164 BLAKE2B 290fd62730bd8e65519de26f32f2bd7
 DIST nextcloud-27.1.5.tar.bz2 183045696 BLAKE2B 36e04d45481b9ac4af863610fa8e58409d58a8ef235dea98e6c970209d5c2e2f085a955b30b46289fda41db07d844e819330083daf6e2f07d72f4a2c72eda71c SHA512 7f0d6ddc954b9964a590abb6385f69976c3087b923e4e7870a6a86618e3c142112a3a2b55e59514efe8d9e522a28c811117c70fd86280740368e86b3d8c0c53d
 DIST nextcloud-27.1.9.tar.bz2 188979224 BLAKE2B f944c480c9fa61e21f233a9ba4c9f7238242e7061952eadf7c586568691d4a66c89e0c83dc44e0fb851ec7693da9795779fa4879c84f6349734d652c15de2615 SHA512 8be7648842aecfdb0d490cbcc0590acbca7ad4456be4e180490c17763b9cb48a1aed945839919fc706b7eae861cd66946b41f73c11de5ae8abdcf9ec3e84d404
 DIST nextcloud-28.0.1.tar.bz2 183887041 BLAKE2B 137cf74cb356b5b339e49b74b618bb38aed3268c1af90734f5b54b3da257fe384c93dbb26419b88ede71562ea76704f8c84b5dd05d0b579f606e5816430805c1 SHA512 32f2ecaa24017907088a6163a393a91d7df5e6a5dee03ee6b62a73c376869f46505b5560a1ac9704755aecdfa2acae637be60c5df747db0c0d82b3987c0d2f4f
+DIST nextcloud-28.0.10.tar.bz2 187483870 BLAKE2B df0fecf5adfebbc6f1b28e6e51e6c09604550b8c1bbb6407f08840c57855bad2e6e1d4ae3bd03d5345d59e3eaad4bc6ae41ad130a2b562a7ccca0a2649757e20 SHA512 53c91d0cdda4cfb9be1b2903ec8ad4ee06a4164abdb959d86d9c9622761f1b1e1ca4b70d51e56391c38d669ac8fc2283971638de2a5994fa330c947182f066a9
 DIST nextcloud-28.0.6.tar.bz2 188259629 BLAKE2B 304d98076d02a190143d0e9846405a029a16b268eec2dfddde8746deae7ef02e0acd5f7a9a7303e454fbc4d828496cfc101c59e8664834e8a9691ae0c586c8f0 SHA512 f34c895602bd63f2e61492e91b9949852f9d2422c3b8740e851107efe5d46de72d8ec06a15c808fa27503546067d62d3166b55ff9979b18f36546845791941c2
 DIST nextcloud-28.0.7.tar.bz2 188700312 BLAKE2B c408b052562ce717fc41226df3ae6ffd6202de213ecf9074572133ba4d30a1c0be44a289d80577c4f663943a43dbf2bf71d60055c602eef569eba3ce174a8298 SHA512 6a8172f05ce58e594a66e2918583e05b97365217b1d2977aeee85e10e77bd869a7ddebceddef9070e0ac40d5e8e2e2348c1e0a9cdf56094bd6b8ca679696d9f2
 DIST nextcloud-29.0.2.tar.bz2 205723162 BLAKE2B c33cc2a13e797cb2777bed7d1c17d4559a83195b186bb62025d7f0c32e75a739979556eb842773fee2bb6c6af24e9f0adf1740b6896814d706f4e8d1c730a0fc SHA512 1d595e4f7c0159cf62120f786c1b4a1d6221bdd000d3c7f45990c287319ee8b87ba70d036eb740073752bc9f80403f939c576fe5398bb37e2063483840d9fc67
 DIST nextcloud-29.0.4.tar.bz2 204867575 BLAKE2B ac91ecb560631762000cf0c6ef69a5262aa67591837e36373550201e075df629f64d63329925671af08f05f987da35046cdaf4b44d48f2e30d5d7fdb026a16a9 SHA512 65508d9610d4b459f11bceadd61d19eb8165e6804c658c4492fb97843c86107bfc75d080156d1afcf5a029ad143b77277cc4e63890444c089e1047f17db1e085
 DIST nextcloud-29.0.5.tar.bz2 204001633 BLAKE2B 00ff6d5fbb758feb0587145726cfa4bffeaa8946ae19ad93aa85dcd47cab6f9ba4c7264d1949d86839ce8053a251c264bb40a37b0bb2248dc617e3b7079b84cc SHA512 65576b4dbb865bd05378cbbe9040d78c3c8e212f0f259451a00b724af821374d8157cdcdd1db8a4eb0a52afa8d307a856e3a0e76883be116cf5c44e239b7fa05
+DIST nextcloud-29.0.7.tar.bz2 204453544 BLAKE2B 8affb8c2c6faf82df014e06fb9df3226e1ea6a0c9922a01a1b0f1e1120925b755163ee15d3a95f5fd4635dcc2d472290de29fc97b52c5e669122b32c7d64a28e SHA512 9a87ea11870aec4b26499e85c9ef91e38644d947c810c619f22f617307014b58adc24ebd19841af8aa3b5185427610f278951e48bb7ae242fa4de1eb3e6abb63
 EBUILD nextcloud-27.1.10.ebuild 1073 BLAKE2B ef3f21eb27f7e15344ccbe0a2c82c096890bed105305bf9501790c7267c74f55ad96bb13ba9f1f8996f4df93619b7186fccd78dd1671163fd701da980198bf91 SHA512 0390ae53f04f50b03d0841d0eb5c426743146fc4d8730b96ab90b8b950be07ad2261ff6e7a8b2055d0319ea5d6959144db29bba430a00a26f7faa207d4e2f8a7
 EBUILD nextcloud-27.1.11.ebuild 1073 BLAKE2B ef3f21eb27f7e15344ccbe0a2c82c096890bed105305bf9501790c7267c74f55ad96bb13ba9f1f8996f4df93619b7186fccd78dd1671163fd701da980198bf91 SHA512 0390ae53f04f50b03d0841d0eb5c426743146fc4d8730b96ab90b8b950be07ad2261ff6e7a8b2055d0319ea5d6959144db29bba430a00a26f7faa207d4e2f8a7
 EBUILD nextcloud-27.1.5.ebuild 1081 BLAKE2B 9de7eba7a07b0731af59f66fed8081fe18e43479df29b2d9fa93fd50c059b9955d6374e0ce94be9f3ab06ee6aa992cfa5e1e3161864a4da29889b0c549e8a094 SHA512 fdc3a214852f8bcf151d579de62c5785030f9233b1a765185b4d74b7f0ba08871d1bb9b41fd7161557e52cd85af6f765ad94589cbb9ab613df60ed11ed11ab38
 EBUILD nextcloud-27.1.9.ebuild 1071 BLAKE2B 12209eb47b35367b8516d8225fe4d36b372d46f5f6059737e78b027e136e37133b9e5686a1c3c89017af8b7c6b07e8e7ee8abeb86d33f6081f3baaed0990c454 SHA512 c1c9f16fbc328c8841ea70115f1d55bb46733cabbfbdf74f4bcbc782513567c3ad7332a3065615aea0ecffdee343a1764f116292a449eb9b7f89b22ce216f663
 EBUILD nextcloud-28.0.1.ebuild 1081 BLAKE2B 9de7eba7a07b0731af59f66fed8081fe18e43479df29b2d9fa93fd50c059b9955d6374e0ce94be9f3ab06ee6aa992cfa5e1e3161864a4da29889b0c549e8a094 SHA512 fdc3a214852f8bcf151d579de62c5785030f9233b1a765185b4d74b7f0ba08871d1bb9b41fd7161557e52cd85af6f765ad94589cbb9ab613df60ed11ed11ab38
+EBUILD nextcloud-28.0.10.ebuild 1073 BLAKE2B ef3f21eb27f7e15344ccbe0a2c82c096890bed105305bf9501790c7267c74f55ad96bb13ba9f1f8996f4df93619b7186fccd78dd1671163fd701da980198bf91 SHA512 0390ae53f04f50b03d0841d0eb5c426743146fc4d8730b96ab90b8b950be07ad2261ff6e7a8b2055d0319ea5d6959144db29bba430a00a26f7faa207d4e2f8a7
 EBUILD nextcloud-28.0.6.ebuild 1072 BLAKE2B f21a6c9bdd864e47f1033b25c893d2d549b20d62fd9357912a30bfe0e2a2214f15f53f0dabdba95c5013f5858625be45c3b5031f8cd560bfb242118d5dd18d8b SHA512 6c6bcb3a3dcbbbdceff0ea05e12f1a4a7009312f4db784178ff2da6f3cb17fc5571c7e72cd43e8c0d3f969a80fc3fbdc6f152ff66ee6efd0de3ce7bc6bd8ce38
 EBUILD nextcloud-28.0.7.ebuild 1073 BLAKE2B ef3f21eb27f7e15344ccbe0a2c82c096890bed105305bf9501790c7267c74f55ad96bb13ba9f1f8996f4df93619b7186fccd78dd1671163fd701da980198bf91 SHA512 0390ae53f04f50b03d0841d0eb5c426743146fc4d8730b96ab90b8b950be07ad2261ff6e7a8b2055d0319ea5d6959144db29bba430a00a26f7faa207d4e2f8a7
 EBUILD nextcloud-29.0.2.ebuild 1081 BLAKE2B 7a72c41a4e25f8ade0109e6214f2aaa1dec44ceb1b7788c947fe5f7b7079c8ceb821a5185197dee1f869bff39c115ffe62812e977c43695415c47933c6b8c0d0 SHA512 309706de499ed38b48dab07de8a632d93915917a92e86f2ee84e2a0309bd71100f5ba205642a055b77e1e22a0a2d1b265f053fc5bd7eb5527b1a5ee2de18146e
 EBUILD nextcloud-29.0.4.ebuild 1073 BLAKE2B cce494b396fa946ae9f3060781cca436a864731f98573630ddd0235c9961dfc133fd13293c2cab3538ee9d910a41685b4830c4712fcf12547e04926c87d83a0c SHA512 b524b50ca4a11be04dc261e30826ab0f57b3490ee0054047fba68366f633fac46598378c167fc9becc3b33a876571dc409a8c91e241f15aeba44f47795ada9e8
 EBUILD nextcloud-29.0.5.ebuild 1074 BLAKE2B 22290506efc4568cc1544ff2d43268156ee0c660fb56fe6002fce43a511789963bb2ef0c7c176402d5494da12ff3db68d7aae5efdd4a17799847c1440849d5b4 SHA512 d4fe14818f3ed910b80971c26562ec3a5c1f8b6710fdc6213526fff8b2d61d8c35f57006ac85a9ec6f5440226ed2c75b145ae83b313b0dea31fd0cfc704f1a0c
+EBUILD nextcloud-29.0.7.ebuild 1074 BLAKE2B 22290506efc4568cc1544ff2d43268156ee0c660fb56fe6002fce43a511789963bb2ef0c7c176402d5494da12ff3db68d7aae5efdd4a17799847c1440849d5b4 SHA512 d4fe14818f3ed910b80971c26562ec3a5c1f8b6710fdc6213526fff8b2d61d8c35f57006ac85a9ec6f5440226ed2c75b145ae83b313b0dea31fd0cfc704f1a0c
 MISC metadata.xml 640 BLAKE2B 4ce4ae51dac409d3c717970c85af4af8a76be4dde1c5df1fd3bd0e2ef6226ac3bee01bea7e906cfffe9b62cee9c357bfde892d350ce5514c84e3c7def3df0082 SHA512 517bfb2880eb61dc3ce00fecfb7512d69166806a6e2b330e659681ef49f84d9445646105194ebf07b1d1f6a915e1e4a6696dbd01a987150fc7a631fb8f65ac98
diff --git a/www-apps/nextcloud/nextcloud-28.0.10.ebuild b/www-apps/nextcloud/nextcloud-28.0.10.ebuild
new file mode 100644
index 000000000000..c4a46ad7ae66
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-28.0.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-29.0.7.ebuild b/www-apps/nextcloud/nextcloud-29.0.7.ebuild
new file mode 100644
index 000000000000..cdae29e997d4
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-29.0.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+
+S=${WORKDIR}/${PN}
+
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 4fb7c53ccd76..936e3ed31cd2 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 72e80cb07f09..9ac4038cc3f8 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
 DIST vivaldi-snapshot_6.10.3458.19-1_amd64.deb 113655044 BLAKE2B a55be731840d832d14841e8c403dff12a480a7a2b92d48efefcb67badfe13158628cb0be30c85455792e909887d6bc41b96e3792c86f67b5ac0b4600b22825c7 SHA512 4d215e05d18fe15dda68e000513bc11dde16e2cee9e516bbcecf12c301a1504988438939aa15019d669d3df4047e184dbb13c2216f2573c9bfbf2085e0061a97
 DIST vivaldi-snapshot_6.10.3458.19-1_arm64.deb 105094044 BLAKE2B d81edc0fb39fc19dfbe226100914ac0c17a0576ca6b0f2ffcd5001cd6029bba67aeebca9aa6f962bc6cce7eec0fb7c9feabd552a2c5585086d6631680aab33b2 SHA512 60800ba6f1e71c197b043f4b91262ce2724ee458ebae82d6c53e52e4417fb3766d2103a5dde1042843e0b9502146ead767f45290d608e6747c1ceb606014177c
 DIST vivaldi-snapshot_6.10.3458.19-1_armhf.deb 106125976 BLAKE2B 99cf0abee90da4c8d197481e686e7e5a83b75e5561cda7b54dfe57ca242d79f617b185d2b69a336f7ac9850874985749489f4325793fc24945962e67baf9034c SHA512 47f261670abdac8c92a5878f8c64a57616ce88f0bdaa45e4c9333a4d9972bf8334481075da08eb422b84cde345343087b7d0964e0b451fbb51d366d4f4588704
-DIST vivaldi-snapshot_6.9.3447.34-1_amd64.deb 113573288 BLAKE2B b5ded230f01bd0e61a56f6ea59fe4e2f056890cc26b2f4c6b9dccf05a7a252a62c41c577c79c115d1945faeff49c3e6fb8f1d01952338fd5afd6bc4f624cac7d SHA512 3bcfd34039ba5b488a399a36df5219a97a5c31fb37df09b718fb9dac5b14d444261382693634681ca56a80699922a391f96fd80bf1be1bbba34a9190581c86fa
-DIST vivaldi-snapshot_6.9.3447.34-1_arm64.deb 105046428 BLAKE2B 3bc6bb289565756d8954f1255e7754cba13632b85ccbfb4be0bacb96b2537b120e88fe5e2f3d879431a6daa2c8a152f219190a6d288c3d7bb1fc10d656fa529d SHA512 0c2ebe6aaf71ac37443c7bf6e8cfab3da9c14c04cdd2b183e2e9da60e8680943493b998b439e074d852a65cb5afdc769812fd68c965b6e4fa9842dd3e257bfee
-DIST vivaldi-snapshot_6.9.3447.34-1_armhf.deb 106125084 BLAKE2B 8e77edffdd7f2f68abed1c701c3c893d361e2be2865251054f6e8e629854fbdc42b6a025a246ea136708a50d68b1fea85cf38cc8627380acbba22d4066043f0e SHA512 57204fb9a1891d8dba7adecab2f8bc6d30e55fedd5f960be96fed1d803e1879c01e590c6c518c37fc65d6511940f197f7a9111c3a1f742ef46ee4ed7d55e8b20
+DIST vivaldi-snapshot_6.10.3466.4-1_amd64.deb 113506924 BLAKE2B 7a1efe71a55423346e9beb2b0f35ab301cf41e791b87a908654da340e3062b913b306fd6353120edc257e0829b5f33082221a8cb36e6aa9cdbf507bbb27ce236 SHA512 6a03a340afa0120309cd0d3018f69bd128c602d50aa24bfeb2da665a7e42da8a65c026b8a2fe625c3a90cb29403c1a235d2a576c2a4b734f08190657f3a1b3c9
+DIST vivaldi-snapshot_6.10.3466.4-1_arm64.deb 105089696 BLAKE2B 0d06e5fcf8f7a08661844c0d2e24b31f1f116b532279768b38618debdb187899a964d200d1ce3326fbc401d28a19908b4474f9817b2d63a6e45d69a5e7c96df9 SHA512 ac939b0cda4fdcd0704ba3c133627a74ffee07c6370e811e472e34b8a1f93a22188f8e45f64033ed0796b3bfa8acc89e7ebf4ffcb4ca12ccec17df8393c1404f
+DIST vivaldi-snapshot_6.10.3466.4-1_armhf.deb 106166736 BLAKE2B c0d6187e039389e50afe1794235136c6fcc7073662047f1ef23feb5cbb5d2a3b19847f89fa69cf9200bbf8a1e69077ca2abd45b6fe017ce6e9d970d2288e49e0 SHA512 d2bcbdf1b3ad7092dcfb7778264b1e75cce831245f68799e30c76c3408c9363e734a54c680345fdc24dbe00d18e0a96c8a463e7cc1b449d7782a568a54544ab6
 EBUILD vivaldi-snapshot-6.10.3458.19.ebuild 4027 BLAKE2B 9753451b184cd9f1ae09040a5c463bb0cb28d67ff0c276bdfb23b5e39ce7f0c727c89ea5290327afe134542ca6e470b4e9b946963650dc9f4a6e498fa73204c0 SHA512 f6a407e6db94a42396c7e05050b7491ff41112e9967a079e71f5524644d26cfad67ad4e4bbd9df01e18afe819d48e88f3583768cbf0827831cbb7acf88083d9e
-EBUILD vivaldi-snapshot-6.9.3447.34.ebuild 4027 BLAKE2B 9753451b184cd9f1ae09040a5c463bb0cb28d67ff0c276bdfb23b5e39ce7f0c727c89ea5290327afe134542ca6e470b4e9b946963650dc9f4a6e498fa73204c0 SHA512 f6a407e6db94a42396c7e05050b7491ff41112e9967a079e71f5524644d26cfad67ad4e4bbd9df01e18afe819d48e88f3583768cbf0827831cbb7acf88083d9e
+EBUILD vivaldi-snapshot-6.10.3466.4.ebuild 4027 BLAKE2B 9753451b184cd9f1ae09040a5c463bb0cb28d67ff0c276bdfb23b5e39ce7f0c727c89ea5290327afe134542ca6e470b4e9b946963650dc9f4a6e498fa73204c0 SHA512 f6a407e6db94a42396c7e05050b7491ff41112e9967a079e71f5524644d26cfad67ad4e4bbd9df01e18afe819d48e88f3583768cbf0827831cbb7acf88083d9e
 MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3447.34.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.10.3466.4.ebuild
index a0fd66eb84bd..a0fd66eb84bd 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.9.3447.34.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.10.3466.4.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 1cf25a26cc39..e52a4f5a2d40 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_6.8.3381.57-1_amd64.deb 108200056 BLAKE2B 48d59945b70d07e315c2d258a4dbcee0786700d0fa4c491bf7c5d1f81f76c5b15a067ad801328f1453cac5bca0abe9c907714b0197ee6c2cf394c46118914e80 SHA512 c0f373c6e83d662852e4aefd2aff3b23396f3b15bec9af7893c171e08a51b7147825a3dacbe1b56ac754e0d66f1a3e39280ba0099708db0dc0d3b77f0a1765d3
-DIST vivaldi-stable_6.8.3381.57-1_arm64.deb 100833760 BLAKE2B cfc2c3c7d83646384a6eb63ae146411377e1b85fa11f42fe9779454c3aa31df69abb6928923fa5bba8865f8babaca365851d750d5bed445a857496cbaa9b4fbf SHA512 c8262b9e87e8d3ba58f7897f97b8d6e5f283711727f427f58a47a7d7bf9ec5dbb35a347c7a1d910d3b2f0db5f7c11d579eb058f6f437369aef932d0dd95e4512
-DIST vivaldi-stable_6.8.3381.57-1_armhf.deb 102067572 BLAKE2B 50d928bc3afefece7e7912bfb85080923f80bb188300f8e780145a188c08030aa8d30d9d747e96346b1425e07680ae363bd6ebaf475bf3b61222ed8cf217aae3 SHA512 7408595e1a426630268309e88b11d0eda8f9c44bf1732e92a5e47842c3630f55b691cb570aa52fbe41735198ce35d778f026d397db79cef133b5c409d47b5a41
 DIST vivaldi-stable_6.9.3447.41-1_amd64.deb 113637436 BLAKE2B 9a588d94b66326c32b658001941da711de9a130ffa3ae0e2d404b623f5cd9c78a0d63dbd06429596329ce90a999691f0b47783eddda21a65f647e87ba17a4b64 SHA512 401670fc70bad9a1f8fd55db189c458f571b950cf0efbaf6275c8cf95fed907c16a717b8654e56f97903bfa85f587fe8922968bee080d0c11e87476faaa71ba6
 DIST vivaldi-stable_6.9.3447.41-1_arm64.deb 105092716 BLAKE2B 3067fb7931e258c404e35cbf3562e235d1061de13155a70e2d86cccc599e2b61afe3c7d04e52f51a4aa38f5a5ac1c7e0ca4271d88d03fcf1ea1edbce09f99e9e SHA512 c7a5c06095d5138539753e094f844371b082f551b7132fe0ccdf40fe333513a1f4bc1e4cac0a8be2d0732bd08674ce49f4b7bdbfc49eb22fa951a9fd16706858
 DIST vivaldi-stable_6.9.3447.41-1_armhf.deb 106139084 BLAKE2B 73e58ca552a403f7f2ff15b63ee4b9ec1707d78653225dafd58b9c5aaa8fcbe1b19eccd82ae1c1dd5fc77b27d3e8d273bd6d2ebe0ff6151a41c8cef322c956be SHA512 347b7b0ba9d35d270fb7a621cf85f36576be44afeede1ce35f4104a1aaeade22594a9c8f7ab07f374d0e6675409ff68d68ca9962a5da0e3b58cb6ce6af215dff
-EBUILD vivaldi-6.8.3381.57.ebuild 4026 BLAKE2B 8f1b3b1d456948c599e9256fb3a9c9aa143781c925346b659d9952f0ff2400f9da71ffd4577ddb64555e0b05f39b83170043995c40709e7da73490fbcebe69f7 SHA512 17d9b4621aece9b48b54a5b6ba34082a391ca8fde2b454bc8cd7d5c334f83e7de809088d294f52bc1ab038fb7d9e1818712f5a1e233ed3097ad0b868969a6f62
-EBUILD vivaldi-6.9.3447.41.ebuild 4027 BLAKE2B 9753451b184cd9f1ae09040a5c463bb0cb28d67ff0c276bdfb23b5e39ce7f0c727c89ea5290327afe134542ca6e470b4e9b946963650dc9f4a6e498fa73204c0 SHA512 f6a407e6db94a42396c7e05050b7491ff41112e9967a079e71f5524644d26cfad67ad4e4bbd9df01e18afe819d48e88f3583768cbf0827831cbb7acf88083d9e
+DIST vivaldi-stable_6.9.3447.44-1_amd64.deb 113482544 BLAKE2B 2dd42b6912bb19557931a04ed2ca31cf6ce93337843ddaa5c37e14cbeb199ca1b9bdccc1a55a022afc321e8d5c475d36070fb438df7d797e507ade549a1c7152 SHA512 94da9b5090b1fb1e32625ccc7cacec33d5492b3255fc25538592bd807129a476900bdcdb463a6f49fa93a68f42b2b917e60eca659954941b52671dd6df7e3c2a
+DIST vivaldi-stable_6.9.3447.44-1_arm64.deb 105102392 BLAKE2B 2e7e945276282530b36845b359a0f85770b2d2f8c0cc14037fbd58a391056a3885fac2aa38a00e212ff45500a1a30449db561e4d277c200ce0832ab0be065199 SHA512 6355f1c7ffedde42d578af1a74d237cbf6aef542df5c0da82e363911bbf06ff3bb67836ce6f885a213f83361840558cbc7ff0312a8b5a70527719e6e543723d0
+DIST vivaldi-stable_6.9.3447.44-1_armhf.deb 106147656 BLAKE2B cc72f9b139a3ccdd34e2422943830bb3566f4a86024c6dde1e5191fae732198128293328ca22dfe6f82f0161bbdfbcb9d74f8cc2027b46ecba345eef55240f60 SHA512 225aab7de66be73614343cd65460dfcfbd00c16f9bbfb075ad6d1d6022d5f05a231e4898c55d87dd7a37e6f0c7ceb868479a33aeac8aa259c8764c1904ed7ba8
+EBUILD vivaldi-6.9.3447.41.ebuild 4026 BLAKE2B 15663cec98c834b117adee46eecb97d5d8dea6a7338b48e304b095450525b25bd9a0109fc31e3089bdc26f4ae4433e45c8065a3a224c23a65e8d2bf3588cc138 SHA512 950a490bab077b69eb78d76fff7fed8ff35816a8b30a1965004c98900d2562edf35cc793ca3651a1a38eca42852b823196dcddee028649bfd57fa19edb21a6cc
+EBUILD vivaldi-6.9.3447.44.ebuild 4027 BLAKE2B 9753451b184cd9f1ae09040a5c463bb0cb28d67ff0c276bdfb23b5e39ce7f0c727c89ea5290327afe134542ca6e470b4e9b946963650dc9f4a6e498fa73204c0 SHA512 f6a407e6db94a42396c7e05050b7491ff41112e9967a079e71f5524644d26cfad67ad4e4bbd9df01e18afe819d48e88f3583768cbf0827831cbb7acf88083d9e
 MISC metadata.xml 634 BLAKE2B fa3f150ffb5f5da3780098747f71d304c9ceb9828cd4dc7c586ba7032a7ba0b3065c25e5dd84fdab7b4302db8b4c848f116eb5b329f440f8a38837dca005a570 SHA512 f226a355a39cec36b5d6f3f88e7f2132693b5dcf51bdec4676d17f608f16ced52d6b9c5dfac2d38f2245cdf6ff7279286034e77ea119cfb4b7240500f612968e
diff --git a/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild b/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild
index a0fd66eb84bd..4408358736ba 100644
--- a/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild
+++ b/www-client/vivaldi/vivaldi-6.9.3447.41.ebuild
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
diff --git a/www-client/vivaldi/vivaldi-6.8.3381.57.ebuild b/www-client/vivaldi/vivaldi-6.9.3447.44.ebuild
index ffe6e8c54085..a0fd66eb84bd 100644
--- a/www-client/vivaldi/vivaldi-6.8.3381.57.ebuild
+++ b/www-client/vivaldi/vivaldi-6.9.3447.44.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="126"
+CHROMIUM_VERSION="127"
 CHROMIUM_LANGS="
 	af
 	am
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index a17d9abed47f..516059d4309e 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 af8567d940c0..7e569a00d2a0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,8 +1,8 @@
 AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131c47510d3350511b918cd47fcf44f1ccd4746e4a41f2f8aa36511f20c2c6f313010e89a79b7869771b9ee6 SHA512 de9edf678c64ca3d10c912397800b2cb651ef9108b33ece97a4cc1e86dad0a9e81986cca6b96cfe80740d9cb433de7ef93f29be45178db714ee408c7f6570ac7
 AUX nvidia-390.conf 797 BLAKE2B 7cb7dc58841d2e7cf28f677939031a20ff820e2d46f799177c6004d94e73c308d2a9ee81fca476ff7ab4846a275cce996f68a53a7a9f819c3d57b5dace1d40e2 SHA512 17cabfcaa4b7323c635d1491e46710624d13396c019591499993662a20df39c8e3fa843387594aeb66d70cf38ab9fde7bee85dd1ab37eaa637a315fd52328222
-AUX nvidia-470.conf 1219 BLAKE2B 334975e048d2cafbbf5fc9d0a74ce9cea4af82103be4d02539d91bb3da4fb39fbb24f64dd6240a526259306c5b971323c00104e2254893fd433f3ef56c9ba8f2 SHA512 6e218dd8da6cfd2d13a259a461348221b65d8475e018c0a6ef5856fd177748306569751545171237c84ccbe3ac526231184bcbe286507f18b32a3518c40bdcb7
-AUX nvidia-545.conf 1449 BLAKE2B 128abdb32edafac6e81bd056e3174daf21905ee553ff4f65e25af211f5610f92d02ff25e32060e6a7832e3b25902ab748a5491df560e84e44ab9db6c3c7edb72 SHA512 c01e2c19537d9fd6a766d459b0f0e8affefb881141f5d5a897d02860cd23e3365c76ae0f6fc89108d4c9263ebd672e34b6fb78b8e6efbc11cb81ba5bf631c46e
-AUX nvidia-555.conf 1755 BLAKE2B 65c2c0daeac96d03550abf5d2ef99e785a06f3810a490f4d67c18f7c07b10e8482598feeffb9cb8ce7ce15f5ec6313ba784c4be23d747616634673fd89e0b9fd SHA512 8f1bc3189a8819a566cb57fa3e8f6a2eee124b3eefd7469f821cee7d4f424ed5dd96e8c112bbc1bf554ed8bfa7b33c3457710467459313b05d37141a7e6602ee
+AUX nvidia-470.conf 1316 BLAKE2B b7ebe612ba932592b7b280042cd635486f0f2ce65a70d6213d796b46904b2151cdd6bd9ac531149ae1274207b5e18435d03fd44b5e8d54d659cd2e5e20356243 SHA512 c84ce3668ff80357c789de305ba40b31e55208204afd3a155f280aaa836b233d56e6543832e0d5735874a4e8ef0688c0e6ddd31b6d85dd2a19c454b592abab52
+AUX nvidia-545.conf 1546 BLAKE2B 29ec9b17749bfc23483726adbe69ea2ef7c0edd98276be3ac0af15039b97b9fa937b5bf1766ed7e04bd9182dd0739dfd06260e99c977c9106048e8530bb8bdbe SHA512 bf8a37e57caf762d316ba6ce4e75af65ca81065c9c4e2345809ca804991cb23a804e1524e9497be4be59cd8201d4108d4a1c015e21b32c74dc922cf2545ce1b5
+AUX nvidia-555.conf 1852 BLAKE2B 8a21c6cf9607575d4a9b6feef8b57718071505d65e5c78842322bdf5995f55a2d7f997535b4afa23b8db84116dd6c0d732a23c338cdd2b9605d296281db9c4d8 SHA512 8ed7c6775b6b22b28cd3c60c5964f9648887ebff8add09dd03ed02daa2495c5a0871ec31fc679a235e6713d25428dae866af2170b25fbb26bef4a51dd188c18a
 AUX nvidia-drivers-390.154-clang15-x86.patch 1085 BLAKE2B 5bb221407b280f2dde69ef2b37317606bec1c108dbc56653898cfa9318de6e47df21e5b38943212caf13bc6412f2427fad7c534491d868d03399091e2146daaa SHA512 1349c1c715b2f09e64a5e91412aceabc80041d070a6bbacfdf7038872f1f4a798bbc63277d47a25d1a5b28b573b3d5bd6295dadbbdbf245f5cfb0241879a3bc4
 AUX nvidia-drivers-390.154-clang15.patch 2915 BLAKE2B e9799aee3c6b814ecdc40e83d2e495acad046f18c88fe8c1b5fead1c9cd0fab3d0a0a2924730dadec5eb8ea1e2d2132c495298d6ab108c015721bab911a4da79 SHA512 6e1c99ae8efb06aa4fc3accb4cee55f43a6498f94fca064fd4b9b007a3555913a5cef042d4e74b6f24a3eb6f14988f810d0c848d34ae81835fbae8ec32cf0cf0
 AUX nvidia-drivers-470.141.03-clang15.patch 3757 BLAKE2B 9cec15b57c82c8e24f89a025a73bf78e3d7ea5df681cf803888ca4ad8b96976b433717d01c9fdad5036cb06376345bef64dd05287791ed0ce7dc2a06c8a79aab SHA512 10ed0fa6b1fdf24fbc18432a9b94b1c1b9d7d6003926272d3c924d72a298c1d3a8875b43a42472d701864fe9dda35d75f9cf7c51ca841d20b989ed46ed994311
@@ -21,6 +21,7 @@ AUX nvidia-settings-390.144-desktop.patch 433 BLAKE2B 5f2eacf1cb1d8ad1ba2cd7163f
 AUX nvidia-settings-390.144-no-gtk2.patch 367 BLAKE2B 59a60b103df6b187009417dca22caaf45292b94005d92df9e513804e5137959ffeda1d9abd5506cbb5c7be604023d2c59f0841190b03502542ad0c2d3f084a10 SHA512 421558442a2228f6ffdb82b2bd6862cbc286b8ba259c4970f54dcc445a988575864404f2c3933d2436d8d40de1bf0e34ee7ed855742c5d677094c260e32a1e66
 AUX nvidia-settings-390.144-raw-ldflags.patch 468 BLAKE2B bf4c00a76351e6c3d1587b4f71be61fac8cc516fa22da0a47538fede92b619eb77b1cc09222cd403175a2015eb2ca745e8cdca90c9dca1b938ca13a2e59810ba SHA512 1fc568bfd1faba1f7af4f4b07715912b7f1d8103626ec0c9fcbb465ded606059ca264f386fe415105ab9f95c4ab173bf4b784ea7380bf17ab6979f56fbd01757
 AUX nvidia-settings-530.30.02-desktop.patch 406 BLAKE2B 63f645d5c9f76349b405c61327bc4f6d44e0716b4ec4c2f1aa012505638be0a329bc9589812d1f164641e4725dd15ac652eed0992161e767325b1310d9cd0718 SHA512 ff0fed69d7d36b2f67f9382055490a031ef8e834119bb18b0f71d1265afe92fad44cb11d6fabc5e3750a434c51e4660cfaa3347d062036d975fd341967187494
+AUX system-sleep.elogind 177 BLAKE2B 207d06f14e507dbaad58b94d7500ef415bf2ed842124edb149b42bacff7192d575aabb4b4576d2e84575a3039c9864b427625d748dcd051764f00ab8050d6520 SHA512 e727e5957ef719ca3f3a72f260f5bbcd2f95c5c8e1a3ae158afc95e6c043fa7a597ce33dde03cc0d55d6f9e9254c6d0798b51419d8df22137795a4f3d9b28cda
 DIST NVIDIA-Linux-aarch64-525.147.05.run 262738232 BLAKE2B 742feded05f659fa9965b2eebcc6a269b0355d08b6f2a686dad47c1acf2c20a359f9a9c33184ab2d51044b8823535bd7606180e31d348f362a016fad74cf476b SHA512 d1d9e49e16ee6cc69340a3458566f89fee7b63effdd8cae3e55e40cdfbd35d1e87b958769fd3b2ce5ab29596d88c3ac68189232d7a1dad8c16773faedcf5b568
 DIST NVIDIA-Linux-aarch64-535.183.01.run 269908911 BLAKE2B 93665bfd2c66391b232c0db7faa2b7929048f4eb0ac660726bc45fcee21bcf9b255da5f4fbdc14c281092f31e7603b5b112fc42b3c7d6e4769cdbedf8d0f16b0 SHA512 d2ac1be8c19b359023c31941374911f3adfe1be34aa2821ef582df4c854ac4eefbbcb10aa22583ac8c9d5caf9326bda12ed1ce6343d67479ed37a4887bd17b5e
 DIST NVIDIA-Linux-aarch64-550.107.02.run 236334785 BLAKE2B 6ed0cfddbe82566e6c9056d10454f6cb289a60e928b05cb64b65ae7ee341888f942e888c556d3e528b3d1228cc1ee14e938fa25c84750f85ab95239fb684f2ff SHA512 a62d5d13089dbc98c022cb3bdf00999d79da7ae370c6e84405ca9e32034f19fcea65ac74845323223f1a8b8f1443e506c60704ba56e6f5add04b2a007d2d443c
@@ -69,10 +70,10 @@ DIST nvidia-xconfig-550.107.02.tar.bz2 111170 BLAKE2B dbf2b0b7f7b71f17ce5a0b6ae1
 DIST nvidia-xconfig-560.35.03.tar.bz2 111203 BLAKE2B 347d4f80b9a16da54fbd7116d0ceafbb15b3b6e78aa1640b8505674b9ffc32056197925b67506d2cbb5d130054944c13246a592d9021f0bb2410ee6e8216df4e SHA512 1a68729b8aa1d3518b43392d4f9af163e2a084c635c08343b25ce761f835801aad203778fd03564ba050ad949a9d2df84fba4c8a48bb1a7afea5e72eb364eb58
 DIST open-gpu-kernel-modules-550.40.71.tar.gz 13811934 BLAKE2B 479c08b73afc91a2f09d7a28bd06795db4dd8f253b2787e41e3c5c8bcde5d606f9715f48d8d3f61ed0cc637445db83dbb6e4b09b0b50cbabe358ea13f8ff683e SHA512 81cb651a9a56aebf806b8442a9de70147beec415f6cb26f41e3d60ef31c024dc84f6c9754ccaff6d0112cc0d97a564403f4d64192c57d38c4969a9d026fc1f61
 EBUILD nvidia-drivers-390.157.ebuild 14786 BLAKE2B 0aa98cd61987bbcd67e2c117e0acee43d28b54787f1d4dbafa3e871902dc6d066873b8b6cfb57a83b1a17e49b8701925924e4b5f2d2abb22f12494c852a65c8a SHA512 2e85077a050a546a5b6a8f4ec38c27d7269a5993ff04b6f49e6b7a96e2e27ecd84e61730e286470af63e87a314258eb5e6a64a3c93aa7347d27541d9ea30ade7
-EBUILD nvidia-drivers-470.256.02.ebuild 14335 BLAKE2B 4ccf76ce3ee46fec93e8bad162c41b3e00dbdc61eca1225993ec8a68ab3d3c078012ef152b75e5fd2cff6e33f710db588f6bc0b56ddb2b6970a552039bb655fe SHA512 921307b5d9013bfdb04ff23f03884ac8da32d880327c2d52eb85894f216af0359e5319923220a08012b15a572805d870660d5c332a09fb8b7faeb70038f908a9
-EBUILD nvidia-drivers-525.147.05.ebuild 17649 BLAKE2B c587c8ec8f356844b95c4f5dc77cc4c4c684f79c8b67ad745e472c4760925c1e4b736dfaa111fa462ccfe6ebb7e20792937a374aaa347e697180f0087a341bb8 SHA512 4dfd604a3692d4330999617bb96f02dfec0ced6a07dd393113a3ee9dee8c3aa1b9792c3bf17af1d5da6181cbf3c79873ac2cd78ce7b13fb00041696d3f0a6ef1
-EBUILD nvidia-drivers-535.183.01.ebuild 17499 BLAKE2B e06cd90559e3af3ec6f6f3890426b46d10c61a761a4e7e01c8e7b4e86898c43eed802aa06f185b6b4650ad1572c866e55267ce4b0d8b0c626e364976119c2ea6 SHA512 f9d0dbc07c068e4e28de61f81d878b87ef9fe63e31f02f0d3f7587a5fef7c2fa6b237b5cde736f78623db9073244240c2818424633bf8e3fff6d592c97007efa
-EBUILD nvidia-drivers-550.107.02.ebuild 16589 BLAKE2B 61e4bb8a4f0f397d2a5a72872b0a85b8e6dea7e3e80e4a66a7f307cf61a9e41be995e74fba3209b36feb84b9d192953f225a5f96b66eeef136fbcd72850e2e05 SHA512 0495d80551cd07d2f8dfe00bc34428ae891d2eca421d50ae86645e4fc32cf3853bf4e82677576e77e00d44f3221c86ab71666c555178bdea6aae9b41bd1639c2
-EBUILD nvidia-drivers-550.40.71.ebuild 16642 BLAKE2B 07a8bfd5f412c20a3dc9e42668bb285bd43605994cd6d27a5fd4d1a23547535929096a791988ad2cd9d1853d1675076925e3d73078994ddff26f9414dd6157f7 SHA512 1f1109b3c68ee0594ba297d55cac251062e04c4f75bdfc2ac3cb4fa4c0251243ba22332af147ffc443dc5bd42fbb51554ad7f3ed7f86895efbaaa23239defb6b
-EBUILD nvidia-drivers-560.35.03.ebuild 17350 BLAKE2B c2e380495b2bdfc7c998a4de6584b27235c0688d1a63b2d755481219d9418f95e421e5ddd227afa9d9ea7707e3eb5d5c367d0f8aee27e97924f9a3cda7fbca47 SHA512 430b76702ba826b65bacb4fe883681736b45971ffa8446bab8497909541fc3ac810a757a65cb160a0c986003693dcc43e4745c7d57d0e288eb630ccf5a033f24
+EBUILD nvidia-drivers-470.256.02-r1.ebuild 17333 BLAKE2B 35823d70cff4f6cc62ee0cc748725ef3d6049b2041bd9d25acdd21eee589839981469d1a5a80bed4c3cd4265b3f4a83160ffb6d5054d514a17973f0471c96ffd SHA512 4076abad69b099fa266917db15877c27e0d849b040ff2c486bc1c61f9d5c654a3ca9957e29ff9062a638731ff4ce74e8c93c87b360b401dfcfe92d032245930d
+EBUILD nvidia-drivers-525.147.05-r1.ebuild 20647 BLAKE2B 4b2f98045d25202dd2b07431b6958977a468f130ee05bee465748f875233f5973f7084e22cd6d8170bff86987c2a95b4d9605fceb85cf3c53d0143d46bd7ede2 SHA512 92f57b234f4ed899f2c2c68acb4150e96279821775b097ca67ddacc1761fbf53164b07c2aa6f3d3feceb58700780ac93359f5e2babc6a41fd7c6b2490dc12d7b
+EBUILD nvidia-drivers-535.183.01-r1.ebuild 20497 BLAKE2B 8d79e450006c54a1bd9acd50ef8dec314b5a658781e6eac388d12ef55df07e027cf5b6796812946ac8f1f26b95ceeb32ba3b11904ce9ea8c6c9a7e879ada4351 SHA512 2cbe6fcf01255afda9f0d6da3a3853f0e49712f4a880943fc3e19169c201b8d78e6c3bba45538767fd80395b58033ff380ecefd33b91aa96cec458b1837702b6
+EBUILD nvidia-drivers-550.107.02-r1.ebuild 19587 BLAKE2B 55c67efa4ac7c2206b89e619940ecb3641f528a9da2a64734bc412bcb907d6cf4868bcefe8f540916d439d2b37ee06381a7de7b604d03e07ffe35b18da529f0f SHA512 54fca7be7815c83c22f1798b86d9ec232605fc711dbd3750c7a7aec6538eee4aa64194755270ceda838a27c8ce296999f196356ed33268ec2c0dc50c1f6bd14c
+EBUILD nvidia-drivers-550.40.71-r1.ebuild 19639 BLAKE2B fba51679ad674a628eb5b91b2e731c44d0d965697996ad12edc82e0bb4c7eb28d1b030c1e187e9b797976dd6072cab78e2a4fc1ec0f67c8a702c1fba14c652f9 SHA512 74f75d15dbd13a2512376f33fc77b7a4df71534d29bf137fb76a21c082cb3ef17674aae361d8d1729280d724a4172dcf0902f0e75fa39f2d5c7502aff331e85b
+EBUILD nvidia-drivers-560.35.03-r1.ebuild 20347 BLAKE2B 9e9f2014b956e258efeb827eab041fc7ddf380a2f1533ec43ec155f0f7316557aee62a494c87759d1858071d2dd0a1c8d1faa17ee869c667c01728f878a31e07 SHA512 550cb00a9dffc58d2c3558742875f4b6e795914a749b7f950cbb04ea683aae81f9a28afc345f398d1b2aedd8ce3943607e8f3ab37f3f46e6361ad2f0afbe2cf3
 MISC metadata.xml 1457 BLAKE2B 10fccbffe28ab58e012aae439123f947acea95eb3bdc4d0e2eb1ec14a92ad24fc2e3e0c248dcce87d9fdec54a65b8e040b2ed048d9ef11054f762f295c24ce39 SHA512 8469884c614a0275f438a0f8d583f2823d1159905ee27402e859c824cc458ac31daf69f2b7960533daaf86e1ca203be745c03e4e67ff12e9bbb2c08b91c667a0
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-470.conf b/x11-drivers/nvidia-drivers/files/nvidia-470.conf
index 2b87b67602e0..4dd0badfb271 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-470.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-470.conf
@@ -9,10 +9,12 @@ blacklist nouveau
 # Enabling may possibly cause issues with SLI and Reverse PRIME.
 #options nvidia-drm modeset=1
 
-# Suspend options. Allocations=0 recommended over =1 unless enable nvidia's
-# systemd sleep services (nvidia-hibernate, nvidia-resume, nvidia-suspend).
+# Suspend options. Note that Allocations=1 requires suspend hooks currently
+# only used when either systemd or elogind is used to suspend. If using
+# neither or have issues, try Allocations=0 (revert if it does not help
+# as =0 is not recommended).
 options nvidia \
-	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_PreserveVideoMemoryAllocations=1 \
 	NVreg_TemporaryFilePath=/var/tmp
 
 # !!! Security Warning !!!
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-545.conf b/x11-drivers/nvidia-drivers/files/nvidia-545.conf
index d5be9b654091..7c399e0c9490 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-545.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-545.conf
@@ -14,10 +14,12 @@ blacklist nouveau
 # experimental, "may" cause issues X mode switching, sleep, or more).
 #options nvidia-drm fbdev=1
 
-# Suspend options. Allocations=0 recommended over =1 unless enable nvidia's
-# systemd sleep services (nvidia-hibernate, nvidia-resume, nvidia-suspend).
+# Suspend options. Note that Allocations=1 requires suspend hooks currently
+# only used when either systemd or elogind is used to suspend. If using
+# neither or have issues, try Allocations=0 (revert if it does not help
+# as =0 is not recommended).
 options nvidia \
-	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_PreserveVideoMemoryAllocations=1 \
 	NVreg_TemporaryFilePath=/var/tmp
 
 # !!! Security Warning !!!
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-555.conf b/x11-drivers/nvidia-drivers/files/nvidia-555.conf
index 98bd87c43080..7f83ba752025 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-555.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-555.conf
@@ -20,10 +20,12 @@ blacklist nouveau
 # Cannot be disabled if using USE="kernel-open".
 #options nvidia NVreg_EnableGpuFirmware=0
 
-# Suspend options. Allocations=0 recommended over =1 unless enable nvidia's
-# systemd sleep services (nvidia-hibernate, nvidia-resume, nvidia-suspend).
+# Suspend options. Note that Allocations=1 requires suspend hooks currently
+# only used when either systemd or elogind is used to suspend. If using
+# neither or have issues, try Allocations=0 (revert if it does not help
+# as =0 is not recommended).
 options nvidia \
-	NVreg_PreserveVideoMemoryAllocations=0 \
+	NVreg_PreserveVideoMemoryAllocations=1 \
 	NVreg_TemporaryFilePath=/var/tmp
 
 # !!! Security Warning !!!
diff --git a/x11-drivers/nvidia-drivers/files/system-sleep.elogind b/x11-drivers/nvidia-drivers/files/system-sleep.elogind
new file mode 100644
index 000000000000..d36e2697b86c
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/system-sleep.elogind
@@ -0,0 +1,7 @@
+#!/bin/sh
+case ${1-} in
+	pre)	nvidia-sleep.sh suspend;;
+	# run in background given resume is flaky if elogind did not finish
+	post)	nvidia-sleep.sh resume &;;
+	*)	exit 1;;
+esac
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
index 72647eb64cb8..5223357f1af2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
@@ -358,6 +358,22 @@ documentation that is installed alongside this README."
 
 	dobin nvidia-bug-report.sh
 
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
 	# 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
@@ -435,4 +451,44 @@ pkg_postinst() {
 		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
 		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep | sort | uniq | \
+		xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 470.256.02-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild
index 69c715a9288b..de085dd0ad2b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild
@@ -422,6 +422,22 @@ documentation that is installed alongside this README."
 		doins nvidia-dbus.conf
 	fi
 
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
 	# 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
@@ -518,4 +534,44 @@ pkg_postinst() {
 		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep | sort | uniq | \
+		xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 525.147.05-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild
index b6e7ae3c70c1..340237b6525e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild
@@ -422,6 +422,22 @@ documentation that is installed alongside this README."
 		doins nvidia-dbus.conf
 	fi
 
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
 	# 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
@@ -518,4 +534,44 @@ pkg_postinst() {
 		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep | sort | uniq | \
+		xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 535.183.01-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
index 42c25308f23a..430c45687498 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
@@ -400,6 +400,22 @@ documentation that is installed alongside this README."
 		doins nvidia-dbus.conf
 	fi
 
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
 	# 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
@@ -497,4 +513,44 @@ pkg_postinst() {
 		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep | sort | uniq | \
+		xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 550.107.02-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71-r1.ebuild
index 0b678cefa151..de02b58759b9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.71-r1.ebuild
@@ -402,6 +402,22 @@ documentation that is installed alongside this README."
 		doins nvidia-dbus.conf
 	fi
 
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
 	# 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
@@ -499,4 +515,44 @@ pkg_postinst() {
 		elog "If you experience issues, either disable wayland or edit nvidia.conf."
 		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
 	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep | sort | uniq | \
+		xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 550.40.71-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
index 7201283bfb9f..31a3eab6d6e2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
@@ -405,6 +405,22 @@ documentation that is installed alongside this README."
 		doins nvidia-dbus.conf
 	fi
 
+	# enabling is needed for sleep to work properly and little reason not to do
+	# it unconditionally for a better user experience
+	: "$(systemd_get_systemunitdir)"
+	local unitdir=${_#"${EPREFIX}"}
+	# not using relative symlinks to match systemd's own links
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-hibernate.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-hibernate.service.wants}/nvidia-resume.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-suspend.service
+	dosym {"${unitdir}",/etc/systemd/system/systemd-suspend.service.wants}/nvidia-resume.service
+	# also add a custom elogind hook to do the equivalent of the above
+	exeinto /usr/lib/elogind/system-sleep
+	newexe "${FILESDIR}"/system-sleep.elogind nvidia
+	# <elogind-255.5 used a different path (bug #939216), keep a compat symlink
+	# TODO: cleanup after 255.5 been stable for a few months
+	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
+
 	# 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
@@ -512,4 +528,44 @@ pkg_postinst() {
 		elog "enables the use of the GSP firmware by default. *If* experience regressions,"
 		elog "please see '${EROOT}/etc/modprobe.d/nvidia.conf' to optionally disable."
 	fi
+
+	# these can be removed after some time, only to help the transition
+	# given users are unlikely to do further custom solutions if it works
+	# (see also https://github.com/elogind/elogind/issues/272)
+	if grep -riq "^[^#]*HandleNvidiaSleep=yes" "${EROOT}"/etc/elogind/sleep.conf.d/ 2>/dev/null
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected HandleNvidiaSleep=yes in ${EROOT}/etc/elogind/sleep.conf.d/."
+		ewarn "This 'could' cause issues if used in combination with the new hook"
+		ewarn "installed by the ebuild to handle sleep using the official upstream"
+		ewarn "script. It is recommended to disable the option."
+	fi
+	if [[ $(realpath "${EROOT}"{/etc,{/usr,}/lib*}/elogind/system-sleep | sort | uniq | \
+		xargs -d'\n' grep -Ril nvidia 2>/dev/null | wc -l) -gt 2 ]]
+	then
+		ewarn
+		ewarn "!!! WARNING !!!"
+		ewarn "Detected a custom script at ${EROOT}{/etc,{/usr,}/lib*}/elogind/system-sleep"
+		ewarn "referencing NVIDIA. This version of ${PN} has installed its own"
+		ewarn "hook at ${EROOT}/usr/lib/elogind/system-sleep/nvidia and it is recommended"
+		ewarn "to remove the custom one to avoid potential issues."
+		ewarn
+		ewarn "Feel free to ignore this warning if you know the other NVIDIA-related"
+		ewarn "scripts can be used together. The warning will be removed in the future."
+	fi
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 560.35.03-r1 # may get repeated
+	then
+		elog
+		elog "For suspend/sleep, 'NVreg_PreserveVideoMemoryAllocations=1' is now default"
+		elog "with this version of ${PN}. This is recommended (or required) by"
+		elog "major DEs especially with wayland but, *if* experience regressions with"
+		elog "suspend, try reverting to =0 in '${EROOT}/etc/modprobe.d/nvidia.conf'."
+		elog
+		elog "May notably be an issue when using neither systemd nor elogind to suspend."
+		elog
+		elog "Also, the systemd suspend/hibernate/resume services are now enabled by"
+		elog "default, and for openrc+elogind a similar hook has been installed."
+	fi
 }