gentoo auto-resync : 05:03:2023 - 23:52:45

1521 files changed, 10209 insertions, 9003 deletions

diff --git a/Manifest b/Manifest
index 894dd9bfe813..9f7c930b6d74 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29446 BLAKE2B f5734e40d1188f4debec400a5395c1b8d79addfa889e89e6d2b10296909fada6d7166c9f5bda12d33b78664ffdfc2a0590039fe8cd895af21bb699627b8d049e SHA512 51f96018d4780927175ab6e5f7ec44f6091c8b27220340feaea133086f1f11a46e74c20db66c25b8730a700b6f9660babb4b091593e67e474baeb8db726b9e7c
-TIMESTAMP 2023-03-04T10:39:51Z
+MANIFEST Manifest.files.gz 29446 BLAKE2B 382fdda6c841739d0318c166ae735e5160bf000f470c56157437e8ef58720f254f485eeaf900c48f0876c50d2e590ca139b7fa7c27dd2baa2d0faf120c0151ea SHA512 79a8139a9053aae49aa6a56ee284c9ece517206816fb654583c588ffe5908f82dd023f365c0ea315b3163acaeac846703985180ea3a8b9d83602cd47ad8d48c1
+TIMESTAMP 2023-03-05T23:09:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQDH/dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQFITlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBBqBAAlRvCOrwLF2xAQBgLPzAj3adjs/md7TSLn+vsc//ykyqhaxhz7+K7Co5E
-3uTimP/mosr/cMbWEDV7mWW+5xaTV1S012qxCEYZjSFkeUacbFENYaSQmF1vgilP
-5uLTXI1qZD8TFt/SV62GSFeLZ3SZlbsCELF6ydiYo/KBIlbnMTBDp/jC/4O5x7mY
-X806+ColrdIR5VY8JxQ0SawQRdqAxroVieYzDNWKItPLszYmyqtWwDZG+tHM756P
-53znUBTjDLFNDkK7FcGa4oU+7tSoevw/xs/g3t4tbFznD4kTXpWGz+bXaVkT+7Nt
-zUgoYl1PUEgwRxlh0VpCL7ju01UU2D1o0qKihh8amz4BnN5ceNdseAx4H93+KfBd
-r4LbjrJyEC2/nmETs1MtCoE840u28fa8zahVOLFWvcciepzoKldYQ2qauTPx9zlA
-AfweiGEsf9H285AGKPnL6jwLJAmQv5xtvu1C4VorST8Nz6dY7k4vhKQIGh1IIUtk
-gMif/q7au5LdPachMdYdNSkVrv3xdoUYsQ+1effKvgWLdmozGhggQ65BAXnzkYQW
-MYahnC2x6DYxyrpmobw3UhB0Sl8UiHjMfFUg+A4VoVKVCj14j8XuZIbGz5b62bwt
-HGHmvv5FWzlmgaofhB9R7LQJRzB9cBddDVT9zFEyNrzNe5WxUGw=
-=0BDn
+klBTlw/+NCz5YADNCh+AKWgKQdqGttc1rwuYsFXjpujDSu7VseRMfUGk+F0qYji7
+zhWW7IlW0fkmkuzofVnX08rlfxIcaGrQfZYnMhejfdm2vLl54PloxjH4qVPWqbzO
+3RPpp8/5ua1pM0lUvX063okrIzkTz3pnBuLQWHRwEhOscsJQYc08bI/pM3ovJoEf
+4jsvjEpLW94I8qcbOjgxGSuYrhzbv1uq9HsD0SKabcWbxi9SJ7q4u64Kth2ZL4rZ
+3EJj6vXTh+OaOyjwsiVlAc4c7pEhBaudB4xum2qyX/TJEQkRXkCqhugb04xETFKf
+yaZ8Qh7Hnn+mJJx4v1UfhkjUmEAwVAg6iCHBNJv1LIWIeP935iGk8ARRKaajGR75
+8RdxgIWTBrxWw7q7AEoQN0U2bI11fjVed0j4WSlwnOYsyuZK6bWX/U0U7rcT33Y7
+TzSoux5m59NasOBBELQ5snN6LmFp83JH+jwU/f7zwwaq7SB4MTLqiMSgz4TakT/Y
+QqG92B7L4XZM2il2eNGUbI6hBVzI5cWajHfm393for1vaQxifBwDHlSBY9swW/f7
+rg10uUB1/eRYgPrp0Z60Bq1xW0iMtMtuY4fLbbfZz7w6ataKqvjaeJVVrMsrnm/y
+jYZbd0d+AtJvMvoLurXkqWr9eD4nagqgQKViavtVlnaQVree1FI=
+=4jEn
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 462b8ecb8648..75dbd2517fa4 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 55159aed023a..12f940114ea2 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/nginx-unit/Manifest b/acct-group/nginx-unit/Manifest
index 6c8516c2397e..d52498e59f32 100644
--- a/acct-group/nginx-unit/Manifest
+++ b/acct-group/nginx-unit/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-unit-0.ebuild 203 BLAKE2B 7ea633b1d4ac19a7ec0488b28acc13254f012c0ad818a6bf24538bf7ac7a9f426c881e0ced25a1600b2d5ab46c85d0d35428c42384ff205555c92f0993999f81 SHA512 e50b163bd0978ec8f86304d5296bde21596f1bb0dc882132d0a49d5ab7228b84b9c2d8f694a0960d75343adc2e37c2246621dad3dd0909dfeb3afe52f559a147
+EBUILD nginx-unit-0.ebuild 203 BLAKE2B 72830e2222621769e42d9ccaab77d6b0574289a6625fbd627936e72e6b60351cda6ad753e3342c071a1f11ebee7fbac4b6e64f5e625a929d15a829f39a91f065 SHA512 626e6b8eee1bbbf2bce0db0a122dd842e914f7db8138ce4039923dbd7ba52faca1d1684a1f9b3fbed24eb0d5ee0449fbb9bce0b9d49202272948ce7f151a61cd
 MISC metadata.xml 223 BLAKE2B 095cbe9aa757b7e872656ee3f17c562e1628cbcc794c9776c46c6edb22e30ee62d077a5ec6a59f26fc453bea96c643cf710e773a399651bedebe8a5178f56344 SHA512 33143373e4f170a675d3f9edd8439432444e03242e1e9cae2166e5e2b189ba1401ecbf93a7496999faae23851c4de60b705b9598a59b97894dc89d6aabc4bd6b
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0.ebuild
index dc8f1f58f989..004f55765547 100644
--- a/acct-group/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-group/nginx-unit/nginx-unit-0.ebuild
@@ -7,4 +7,4 @@ inherit acct-group
 
 DESCRIPTION="A group for www-servers/nginx-unit"
 
-ACCT_GROUP_ID="526"
+ACCT_GROUP_ID="527"
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 4890071e6d2d..752834a78e1a 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/nginx-unit/Manifest b/acct-user/nginx-unit/Manifest
index 3952e3fcb99d..9b92894dea3c 100644
--- a/acct-user/nginx-unit/Manifest
+++ b/acct-user/nginx-unit/Manifest
@@ -1,2 +1,2 @@
-EBUILD nginx-unit-0.ebuild 242 BLAKE2B b2ae2fcfd058ca4f0f005ce414c92a6194af1bcdaf9a1b7f3c0c635e3bb51f5cf069fb90925066c4e928d83a6a27ddace20682a29d2aa45cfbe8ed0e04a854fd SHA512 84550a4de7c56f8452c8ff3065ce998ef2481292a9c0b10d1854e89d8bebfdb29f46ad0aaa8a830372059cc3977e66ab9bdec3f13f91521738b426f7849ad189
+EBUILD nginx-unit-0.ebuild 242 BLAKE2B ccc5855e43b1c3a396ea15a5e89e668ad3b833089f21509528e9e082bccdfc7343a414cf555f94ee95e3195db62561414dadb7a9ea398e5e38104405c46f540e SHA512 00f653c6453919020fa18f900d58abd6dca78fc82a3d49bc35ccd74cfd15147d1f6dfd2b30860073bb308054112ade0b8cfc5772d04c691cb4d7289678346a23
 MISC metadata.xml 223 BLAKE2B 095cbe9aa757b7e872656ee3f17c562e1628cbcc794c9776c46c6edb22e30ee62d077a5ec6a59f26fc453bea96c643cf710e773a399651bedebe8a5178f56344 SHA512 33143373e4f170a675d3f9edd8439432444e03242e1e9cae2166e5e2b189ba1401ecbf93a7496999faae23851c4de60b705b9598a59b97894dc89d6aabc4bd6b
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0.ebuild
index 9af0cc52ab82..25bc84af7397 100644
--- a/acct-user/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-user/nginx-unit/nginx-unit-0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit acct-user
 
-ACCT_USER_ID="526"
+ACCT_USER_ID="527"
 ACCT_USER_GROUPS=( "nginx-unit" )
 ACCT_USER_HOME="/var/lib/nginx-unit"
 
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2727a378faf1..62e5c1c00238 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f28954c5516e..22e8975cefac 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
 DIST aws-cli-1.27.74.gh.tar.gz 2368706 BLAKE2B 3eb9d8c21b9ddfd3a3e4bb53172a46ad69ca71033785bd29fd8b0b0f694c2ed62a4cad998ccd13b07949b86a89f2ca238a63a4553e591ba9066832f51ed87759 SHA512 cf61a3f1dd643bb7d0f81f047c1eeae78a7793532bffa612045273c46ae970b2763156a7679b6e16e65c2f886dec68e54db0169580bb3c37cc08420f874e704c
 DIST aws-cli-1.27.79.gh.tar.gz 2376690 BLAKE2B 8e55d3607b805ebc5673c682731483f0fd6eb77a6cc972d58ce3219c33f9f2054529df6ab46fc85b39849871580cea03c4d7f490c4386cd5ce9d222ecb3c8eda SHA512 fd8b880b6358c50ed189fac538d91ef88d762b8c382da1b57bb086a316f7ee96fa33206a53f3eae2df98df175929c819b855c7ff5b7e5f84c73ecff88f297c79
-DIST aws-cli-1.27.80.gh.tar.gz 2377306 BLAKE2B 3a0e6c66bb9c373456bb05537f20ad339c0987290557c30dbd2e2a8ea127b0f8bfc7028930db712fcbe7461c7bc87dac123c1847da93b675403822f6c02b1d3f SHA512 b94aab2588e8bc0ad007e0392c6eed0642683246b1803007332563495a69deb5da924eda48944e37b674c714cf2e5a45aeddbbedb5d12d51ad8c9c8e76c18ebc
-DIST aws-cli-1.27.81.gh.tar.gz 2377937 BLAKE2B 7323c06cab727066c6541772478a961bc4f7b409b0910e57c79207fad928b7ec82d1b0048983e64d8a8fa3e7ef69d1898cadf2fbd1ea560e05d7a2582e726f88 SHA512 19cff28cd4721df32079795cfab852a11b36f1a2d0335567f0f1dae48eaaf268ae04163dac960a2d543be869f39e8c55e6a0bcee746ccbab29bcf8f37881c305
-DIST aws-cli-1.27.82.gh.tar.gz 2378047 BLAKE2B ca55c81431afeed336e01b7cb6840a05856d3e25f8c06a1169907fb3536aa45393f35995d1683bea3685e91d196b67bdeed487ba46e896f774caac0e63cbc9be SHA512 b760dd417a87e1804ef5bb7b4e8ca22ef750c75a63455fac7f17f564f8e591c459bfef225acb56a9a3b3ad1ac94458d4731fb4a56147a2a6fd59ec8113b2df41
-DIST aws-cli-1.27.83.gh.tar.gz 2378425 BLAKE2B 7784274aa3879b59b9ac51a0d687526261c27d4285ca279004e301b156e08bfc07f89b4584521093db0a3a9f42f47c7bca607c686763044f73495623a9e6f366 SHA512 e9748ada13533ab67249806fe09261634cdc2858bcc99b818a7ff5cb1dd2ce8f9c52f344fa7a5f19464d1500e91ff35b3e0a7ce4d2ac2adaecb939c4c9a2a70d
 DIST aws-cli-1.27.84.gh.tar.gz 2378573 BLAKE2B b85d7eeb22b0a2a9264b49a27f2e3d3da9d35dbc44de205521c39522fcec31948ef8b67dfc3ce919b772ba85fa59cfc5a4d69e3c67aadd9cbb029da883ad699e SHA512 1d31d1b800b0795a8473af0dc334feb69f62d2fd8fcb88e0e4e7e4068435f6f37792d2c9382ec1b0c6b074d5eca09142e52f6e36c472145df9d57db2cc4ee078
 EBUILD awscli-1.27.74.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.79.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.80.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.81.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.82.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.83.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.84.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.80.ebuild b/app-admin/awscli/awscli-1.27.80.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.80.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.81.ebuild b/app-admin/awscli/awscli-1.27.81.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.81.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.82.ebuild b/app-admin/awscli/awscli-1.27.82.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.82.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.83.ebuild b/app-admin/awscli/awscli-1.27.83.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.83.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index b516cfa00772..6f723a932f2b 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,7 @@
 DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
-DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
 DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
 DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1
 EBUILD conky-1.13.1.ebuild 4795 BLAKE2B daff0445b97281fcd8fd737b681b862fae0570c15bbdcd9dd25fbaf5db825e8b6e0eeba771b34d09329ca338e869d341cd83b3ace80f31b28ccc103d59a66829 SHA512 75bd14e46fb12acc2d31b933adcfccf3a25e0202c8a40238bc585c9275c875e145833ae5e9870a9d0697bcf2b04b1ae5bbbb680fcd3c023ca21350fd6ead6e7f
-EBUILD conky-1.15.0.ebuild 5103 BLAKE2B 2e9485589a97fad28c223f495f3811e9514d9a358f3f5f7b064ff19b8b49e6293df0965597c069f0d71a36e990dc38fc0545efebc2a40efc2a2d307d9bb58074 SHA512 c5808d22d0fdfef98379eeaa97f9656e7600cd25d9727a7a4428329c4ca157f00f27b0b6bb876e5a8d7e22c928dd4cbcc6db1be64fc2ca420033bda40bbc27b7
 EBUILD conky-1.17.0.ebuild 5292 BLAKE2B db42b7caf72f9fcc93c12b6547fa697a435bce0a2cd2588f0afe8c041f03b626d0d55b2c5b8ce17a917a483374c703e3e4f62a999101ff359b002f138e77507a SHA512 49e45b5599d427ad6d411e918746b3cd619d847da323a2663de097131ca2c78afe7bff27512c704057fe619b2d34291dad7680d56f87a4102128f8e6cf98dfc9
-EBUILD conky-1.18.1.ebuild 5292 BLAKE2B 5d748fb3a4794a2ddc8ce888d327757c52262a14ce5d3b15a03673f275275827459f39586cb713def8ec2f1fb40ef3a237b5b02e43b615335f7d2ea08e3c929e SHA512 c218668c7320c08b7efabf16f9b7734c26224069d26701470a3438be64347abb5914acad6fc63ec3e6bb8c4e1fff49df052b6b454faf84c6c01a0e03fa9c70bc
+EBUILD conky-1.18.1.ebuild 5443 BLAKE2B e90677a3ea0cb529aaf27a9bc29852129f88e940f4b0dbbccbfebe2694c2d5f4a61a062987ccb79a7c2d4ae2178fdb6d2f6427c240b5cb1124b4a4f932cd9eb3 SHA512 f40b45c43dede63420b63e2e53e623b319df66883dcf6424f986f38a9d6794969eaad3145a74454844025696437c728a979118ebb0a7441014c5d7a890487e39
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
deleted file mode 100644
index 640060b9264d..000000000000
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
-
-inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
-	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
-	mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
-	webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( media-libs/imlib2[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
-	lua-imlib? ( media-libs/imlib2[X] )
-	lua-rsvg? ( gnome-base/librsvg )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	pulseaudio? ( media-libs/libpulse )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-	wifi? ( net-wireless/wireless-tools )
-	webserver? ( net-libs/libmicrohttpd )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xmms2? ( media-sound/xmms2 )
-	${LUA_DEPS}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	apcupsd? ( sys-power/apcupsd )
-	cmus? ( media-sound/cmus )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	extras? (
-		app-editors/nano
-		|| ( app-editors/vim app-editors/gvim )
-		)
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-BDEPEND="
-	doc? (
-		virtual/pandoc
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-		')
-	)
-	extras? (
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/jinja[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	use doc || use extras || return 0
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-REQUIRED_USE="
-	imlib? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
-	nvidia? ( X )
-	truetype? ( X )
-	xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
-
-There are pretty html docs available at https://conky.cc/.
-
-Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	lua-single_pkg_setup
-	if use doc || use extras; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=()
-
-	if use X; then
-		mycmakeargs+=(
-			-DBUILD_ARGB=yes
-			-DBUILD_X11=yes
-			-DBUILD_XDAMAGE=yes
-			-DBUILD_XDBE=yes
-			-DBUILD_XSHAPE=yes
-			-DOWN_WINDOW=yes
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_X11=no
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=no
-		-DBUILD_BUILTIN_CONFIG=yes
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_EXTRAS=$(usex extras)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=yes
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IMLIB2=$(usex imlib)
-		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_IPV6=yes
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=yes
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_XINERAMA=$(usex xinerama)
-		-DBUILD_XMMS2=$(usex xmms2)
-		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=no
-		-DRELEASE=yes
-	)
-
-	if use doc || use extras; then
-		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use extras; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
-
-		insinto /usr/share/nano/
-		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_pkg_postinst
-}
diff --git a/app-admin/conky/conky-1.18.1.ebuild b/app-admin/conky/conky-1.18.1.ebuild
index 4622f87abaf3..44dd8a64799f 100644
--- a/app-admin/conky/conky-1.18.1.ebuild
+++ b/app-admin/conky/conky-1.18.1.ebuild
@@ -121,6 +121,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# pin lua 5.4
+	sed -i -e 's|include(FindLua)|find_package(Lua "5.4" EXACT)|g' \
+		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
 	cmake_src_prepare
 	xdg_environment_reset
 }
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index d645928cf3ef..f7b307444203 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -9,5 +9,5 @@ DIST logrotate-3.21.0.tar.xz 168532 BLAKE2B f7fa0050bde51e2517eac8456ecf87648bc8
 DIST logrotate-3.21.0.tar.xz.asc 833 BLAKE2B b2099a0b8c15d1ea7f7325884027dff08dcc8305113411448797b8089d17026242a3f10bd6d7f3d865e3e339ec6fb5faf4ff48f8fd65bca3af4da8b335c3b5f1 SHA512 8f4c1853cd84f85c796b72b43048f4cf04e3409703e7669ee91e1d1aa5e9e5c04261fac1cdf85ec303508d5b6dbf126a44eb9ec819bcc772c664830d39e1068c
 EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 0a66afed01ac2efcefccbb3abc5309ae27fcde5429368e13a17dc4672d06c6c67bd5546cf5e80da69eaa3f1cf36149409db004682e27d4e9995056deb0fe06df SHA512 f3d7b346b50e086bb50fa7d1b5d854d4c5fdf9a9700d9212eeb992da8a0dbf6c4a8b21ee0bf5a26d917ed2a581980952121d2c0c88f6fe1d3ca474db30a96d3f
 EBUILD logrotate-3.20.1-r1.ebuild 2513 BLAKE2B c94c72483cb4c065b63cb313db67a8d28f534c7f204c852f79c05d363d2ee29f766136c98ff324b92d085f0b083093e4c73d7aea099f05b8c3ef85adad5811b0 SHA512 d6e9474b5de6a6ce945f9e7b1b0863e309956989064ab28ba14565f1b88cb434a12e1e2ee8cc6240dd64b49dd3a9b299c366d6b9b359eb410769b198750ae788
-EBUILD logrotate-3.21.0.ebuild 2483 BLAKE2B 1f50b52641910b1da94065b14d3527e78c8743171eee3dcd7187a3cb34c889dd0e91c64f5c15cfb01c15962e1d917513a98ba65568b0fc78aab59f3f04a13126 SHA512 940b50e93f5c3b0dd617f0798a16f7f45429245aca579a762b7dde0e5962ad4d1b24ff7b7fddb769a2a4bd30117d339f2c0ebb5a6f2c50d23eb88155afc5094f
+EBUILD logrotate-3.21.0.ebuild 2481 BLAKE2B 80f61e28b5ee90558adb1adf8be93ad546aec7ed709720993aa313d0154e01475407c5402670672082c5c3f6000bf23a0af5631b5fadf123746a23e7f16874d6 SHA512 49682e1914c962fcdfd84db6be3654097d540a19db7ebcc66b7589dfcfd1fa1dd2939ba60152ec1ff0ef87cbb6a2ba6a8028518fcb76abce3e744c5004195334
 MISC metadata.xml 1203 BLAKE2B 434c8f014678fca0829df99c4af0a965721dd5023baee7e0684b66993db4895152c879a71bb7c73a434834d648392d96985260a61d98209c14238dc18884576a SHA512 785c3c4c45ce53caab03bfa43be4240b9e0514885c2e195729cba576b2f26c17744be9f5767342626e1052475a3f1f2a089a698b541730b8a94e04bfc5d9d837
diff --git a/app-admin/logrotate/logrotate-3.21.0.ebuild b/app-admin/logrotate/logrotate-3.21.0.ebuild
index 30946c295323..274d7c986b0e 100644
--- a/app-admin/logrotate/logrotate-3.21.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.21.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND="
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index dbc0556386f7..a289a26c5fb1 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -7,6 +7,6 @@ DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036
 DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214dd44a4518da88a4b1f0c4c92a6df4eb7922e9a2e76d5012364219067cf66e220d8f54588ab22acf09937e41aa2dc SHA512 a7938ccd8171d849b5d89df6ab90942278c824a3dbd17abda8ae3d80ce5227cbc3fe23b31806609114482606d780ec7f0676a0fedfa950ed8cb5a59f3583bd57
 DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614
 EBUILD rasdaemon-0.6.8-r2.ebuild 1472 BLAKE2B dbc2f9640d87137e5a7c714c077415baf2c513c5ce2e10f3ee2cff59f12cc8f096ffc625c02d9556a5c0d5a4f03208def23c386f8824242f0276dae98acc36af SHA512 a3ceade6b072dbc5cab09f7f337a32fc8fb5ce56e19a327df7b503eda22133aeaf98e8f9a9047b7a5655ab997f8ba886f58ed711d10fdc22f73d718cee343038
-EBUILD rasdaemon-0.7.0.ebuild 1347 BLAKE2B ffc1c24bc28bd096e2f9993edd43db11b14f1b78d675374294d9c0e25d2ac63f3ce3a8674a941d944b28774ebe536a5a83bd47a3ae754878955ebed2e5fb8c80 SHA512 3076575b7e0896cd38e621d623f4cbc09b9733469171f87fc77c6868550cf5d9d73a58127731a81104469e8a16e0655ddf5bbee6c0e7ad0bce3d18b5b272a844
+EBUILD rasdaemon-0.7.0.ebuild 1346 BLAKE2B 0d877f64100ef2c8e321a7dfd8a591e65a6de26a2c7309dfac1b24807ce843adecca82274db350845993a1e924ed418415c23e50b76f1e3e60057d03f1bb1396 SHA512 c45512febbed1a68b1c54639c00e0a6f7380d2371540430ab3376b1908cf98851561d1b96ba96eb67bb34a7bb604409b560f06c451a62fc8a58f417c5deb47e3
 EBUILD rasdaemon-0.8.0.ebuild 1737 BLAKE2B 21fdc82371a3605fcb3761c8c99dbf369afa60623adf0bfb377ef90d38e6a4cb6976a5c1e02265b9ae16bfaf28bc0f1aa36c12b35ab63a1528cde1314d997a71 SHA512 afa62d2bced383c48b831b6bacd52c4c52d51e495314e87c5d68def25aba36598f483d209c13f1e455eeeed7ece5d7e2d58135acbf1300ccd81f77c17722f72c
 MISC metadata.xml 1086 BLAKE2B d9017158e600a5aca8b1ca0600a36efec9f12c26493e28b129a0029caa37224b2e5341292ffdebabdc81893aebddba7b893d69f66f87ff4fd927e5310a4482c8 SHA512 3801a8c374a0d38f9efc07a288eb338739e74d1e7e41a182b871f01ce8cfd695621cfb6c883e5ce8da267e1440bf8106db6ad5ac12ef5e156bba958f72ea6297
diff --git a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
index 5e618a5f7140..c0ee30e744f2 100644
--- a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	dev-db/sqlite
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 117d7f723915..8fa9d1753f84 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,4 @@
 AUX testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch 1268 BLAKE2B 9c57329b3576cef7f23177fe07d45cd49a449b4353a9abd3a3196a9ec2896a05e900b1d7785d087f4587642d786efb36ea655d8b2c35833c8736014fbdad9cfb SHA512 7325ff2d83350512acf2e0b3f2269cdc4a92f775eafeae62c0b337fa4f31dac0c4f56d9ed7397fbd8a29d7679eb259401ca934d48c51438bfc4e3d0e0bcf7e00
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
-EBUILD testdisk-7.1-r1.ebuild 2354 BLAKE2B afc950294c018dbff1423bbfa67e07a9ba6de3166629d8c09bbaafd878071658c9e462d8cf9cdbc5fd85bfdf994050527d164dceee9c7c9f395f1d6d1d2162d6 SHA512 9f878e51186866e6b8d5621e629f020218f24544b611733fb581925fb8fa916cde3ffbf42a29dd5a77e4224e88a0be1029eaaaaf84ec716ebcbc7eb5ed5e4a64
-EBUILD testdisk-7.1-r2.ebuild 2487 BLAKE2B ee5dcbaced5760bec08a8956a90537c724fbe252111fc2a415652fec7790e29ee2926cd8b47ec2ed5ee3fa81d85f76ce90725b50a71d5e70996773f072708c0f SHA512 d37a02399c2001fbef952e4b3c4ec3fb56a26b48cd5e88bb8e6f95f81345f73c4cde29b84553807801f0cd1fd8f7adf9cbce602d1e9280a3f026c14fb9aaa08b
+EBUILD testdisk-7.1-r2.ebuild 2486 BLAKE2B c4b0af4bbf0aa9d42a1e5fa2687c4863403e12ff92b49880094d6fd1113e57bf4b3919400ed48800f4e4a95060841b6fb45c8fe7b98866894eb09028d769fb3a SHA512 542cc7c3878e99d46f42e193a7c18285bcdc0a229e707ee8c7ad8d9c98cd04b68f6376a613ef2648a93a9f6f894c7edc2d2a51c393897cb43e7be01f821c9a9b
 MISC metadata.xml 640 BLAKE2B 2c906cdb19a874657ac6f51ea5ec0035b27b0644e73faac95b9234a888a991bc8d9026252a0bf1bd32841295519fe2a966f77101396ca8071dd96c3f742bfd24 SHA512 8996a1f5afaaf7cf18f088d342b717d43316737e92c7b891c63613f9698e4b60bcdc6c65d3d87e4ce4da129b40993e3a60c75544dd5503e9d104d2652460b58c
diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
deleted file mode 100644
index 502a73ebc76e..000000000000
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-	static? (
-		sys-apps/util-linux[static-libs]
-		sys-fs/e2fsprogs[static-libs]
-		sys-libs/ncurses:0[static-libs]
-		jpeg? ( virtual/jpeg:0[static-libs] )
-		ntfs? ( sys-fs/ntfs3g[static-libs] )
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-		zlib? ( sys-libs/zlib[static-libs] )
-		!arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
-	)
-	!static? (
-		sys-apps/util-linux
-		sys-fs/e2fsprogs
-		sys-libs/ncurses:0=
-		jpeg? ( virtual/jpeg:0 )
-		ntfs? ( sys-fs/ntfs3g:= )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-		zlib? ( sys-libs/zlib )
-		!arm? ( ewf? ( app-forensics/libewf:= ) )
-	)
-"
-RDEPEND="!static? ( ${DEPEND} )"
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=()
-
-src_configure() {
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local myconf=(
-		--enable-sudo
-		--without-ntfs
-		$(use_with ewf)
-		$(use_with jpeg)
-		$(use_with ntfs ntfs3g)
-		$(use_enable qt5 qt)
-		$(use_with reiserfs)
-		$(use_with zlib)
-	)
-
-	# this static method is the same used by upstream for their 'static' make
-	# target, but better, as it doesn't break.
-	use static && append-ldflags -static
-
-	econf "${myconf[@]}"
-
-	# perform safety checks for NTFS, REISERFS and JPEG
-	if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-		die "Failed to find either NTFS or NTFS-3G library."
-	fi
-	if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-		die "Failed to find reiserfs library."
-	fi
-	if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-		die "Failed to find jpeg library."
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index 746af9681ff3..b280e54ecc04 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs gui reiserfs static zlib"
 
 REQUIRED_USE="static? ( !gui )"
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index 344287157364..f31faf56faff 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest
index ac7ca471bfc2..f962bef7d397 100644
--- a/app-alternatives/awk/Manifest
+++ b/app-alternatives/awk/Manifest
@@ -1,2 +1,2 @@
 EBUILD awk-4.ebuild 2575 BLAKE2B 0650d15256ad87939d18330ac0e234023b18769428c20c08c8bcf6a66f089095fb966bf0df563a2c2705e9e7c1f5403d43f73caf2cc021a783a0a115dc607f77 SHA512 e0e063124cd5ccaf81c789669c65d3c297d98d3e12c4d25be74daf56476c61b8c6ba191be8b08f1ff9d25e87155b404468f1933fda60a62aade723bf6e949a0a
-MISC metadata.xml 829 BLAKE2B bf4375b33e702c61a3f8553e1b63110acab32b68d4ac2d905b6dd12a2204484bc5c2f3a34b2ec127a6c60aac8c105949dbc6eb5ade3a1c8c959afdabdd3658a1 SHA512 32252970d3b12c7a5b9fc7c7ffae821908b9bd4101372e699c70e64572fd7563121427ed5971462417d8c2e6155e47f567ac3bb057d457d58648c5b4d2458974
+MISC metadata.xml 715 BLAKE2B bd5d943bc9fd00f7a4cc999d80cdf565a2138f5dbb95b51e8589384109b2abfbee478b4fb56b30fc16659a1a51a08b0353b30126004bfee28b9ce5217c68c6d6 SHA512 56434c9ce869659cf9d319fc4c2b6e394fde089657db78430c8b7a87d013f0716758d46349795fdb3be4183dca4d10f6631ae13853b658aae4be0a88e5570888
diff --git a/app-alternatives/awk/metadata.xml b/app-alternatives/awk/metadata.xml
index 0cf5fbf0d2f2..7c4c46c75e10 100644
--- a/app-alternatives/awk/metadata.xml
+++ b/app-alternatives/awk/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 136b3408a43b..422bf9449c5d 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 668c586c2851..8e146c2e7eb3 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,4 +1,4 @@
 DIST ncompress-5.0.tar.gz 34185 BLAKE2B 7b296bd00024bfb483d3261ff8aa6e47a6be8c62b445c3d456d702b69fbc2a7b731326f7ea91aa331ba8e8a27936f4318b3e252cc978b6bf3198e8812988913f SHA512 5bc886f98f25b03d034e8d8ebb0ee9388d727ee3e0c6d8a906698b2f8fa5c930f55d857486244b7f40447c7b74f3c620626600db619d0c6d6fd434f52912be42
-EBUILD ncompress-5.0-r1.ebuild 1082 BLAKE2B 3c80a4484be1a90c1422938254a45080adc5fa2f64164d9b6dc5de1749f937992d340d5fd613f3c1da84f6eac1e34a224f11db6aba96447a04cc5e0549210c6c SHA512 ccc2bcd1a61cfbd1378da21430a7161c460cdf97e2dedcdd8daf9acf99dc9a88640b4e5a4f0bc55b204c8d89fb3924362f60053a81e61deb17a69f62d4972993
+EBUILD ncompress-5.0-r1.ebuild 1079 BLAKE2B 00d6ae0d803472b26e03b9aa278b1cc83cdcc9e9683c7b55be378843145b723181a5b10d9bc6901ac69dc8c27b7bce9ceab87f10d40316c372ffabfeab77be3d SHA512 0ecacf11c5a561b4dd90afce94c13b33343e5cb5c48abbb88573e1afbc855633cc1e247e4bf22241ca9ecda8f390e0a18bbbf6bfdb567e9c73c71a885c5b1d1d
 EBUILD ncompress-5.0.ebuild 763 BLAKE2B a5eac829aab31ff186a7668542410587ed8bb8fd8787bd2b3053003e9a3a72515dec842050a6bfdadc2115bfffd05e15b7a71a8cd79fc40a3a87cb4391f26416 SHA512 a2753555531e73a519331c9b282e1cd54781093649eec68209bd4c0cbc1e78009f90b9b4a9c0c36ff79afa6b05451084e9a51b00a002ace40cec8fbf138097f5
 MISC metadata.xml 393 BLAKE2B 24133518bbc568fc7861bb255fcd6ebb34d8ed24912889ac7df4f0517f34fcb281a3eff0c75d5a285891f820956b680270b42cdb1f5cf7a417f43241b46d392f SHA512 7b5f6f0ea16f60fb9b05d9a27701b56e80b62c8e9d1fbf05ecc75015f51dc010f53546661013ec36831051985360e21fb374bc8b5006ecc14f707f9b715fe745
diff --git a/app-arch/ncompress/ncompress-5.0-r1.ebuild b/app-arch/ncompress/ncompress-5.0-r1.ebuild
index bae27aef67f2..0e8390191260 100644
--- a/app-arch/ncompress/ncompress-5.0-r1.ebuild
+++ b/app-arch/ncompress/ncompress-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 6f29933be9c2..4dc2328dd503 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -6,6 +6,6 @@ DIST unrar-6.2.3.tar.gz 245210 BLAKE2B 85dc22e52404a57286a19c901543aaeffd4526a2f
 DIST unrar-6.2.5.tar.gz 245711 BLAKE2B 6cdb899ecb996184769eda11b113e8cdb39f89d6be9c3109fbb6b72a8778109db02c9a7b8451190c3eb994dbd3c628d7c8bdc6a9316aff0596d1a10d903d39f1 SHA512 0b85f085e3419d4d044c70a20abdd28f4528ffcf719703a30656ea906610cd5aa5826f57ef63e2db4e541a2f01c6c5504c19bc67319bf48c377784a30fb4b20e
 EBUILD unrar-6.1.7.ebuild 1826 BLAKE2B 8d1bf4e45161d4d98462c23876551bdf9770bce19a8907a6151c293fc92ba5a19595efed02d0f1308517f774cb28496d0c0fd9b9819adaf3eb409da4162d1cc0 SHA512 b326b0c8cec1c02ce8deca83f111da38f059f238b0592a99ad572dc347e0f51b6ab19ae6443fe93f15dcf9699c1cdeb8582e412130595456e19688aec0473def
 EBUILD unrar-6.2.1.ebuild 1826 BLAKE2B b449ec63a4ed696c256b7a4491650ffab88ef56f09cc101a31cbc7c70effe2561987e5c8029cc67c900bac9b556f2e3fa76de37352e8ae9795b93a38b8db1504 SHA512 638c07ad01e388dfb64132c9faa2512433a9aeae37385d065feafa1626a9a781454f6439ca3d2ce2db818375101fbb1800e7e609798b720eff2f913f63ee1707
-EBUILD unrar-6.2.3.ebuild 1829 BLAKE2B f81dce921804cf0e42d6606ac9428f08de9f17e390479763de00686b255467855ab9ba9554bd66d84d020b40551d747d9a6343b8889faaead4577181cf074c2a SHA512 5b4c4e3b5c7a0b69e7da55580faff53d766383d84f483b8b151e123acdd9430812eca42635b9c008275bd8e9be48136cf93f52b745dc8328a9cb6a995d82f506
+EBUILD unrar-6.2.3.ebuild 1826 BLAKE2B 080d4a4075a0d073dab090ea1b7dad6d903c6048789b10d95d887ecb2564acb486e5dd92fabfac8e724d96ac013a489fc302e04ce6e7041c5044c9418ee0a50e SHA512 8e16b483f9eca252fd485c102b6c79cb1c2e0b5adba35a9ec3af509a69a86e8279b5036cf68f63bdabc428e3589b1eced174febbedb6790402229ff183da42ad
 EBUILD unrar-6.2.5.ebuild 1832 BLAKE2B 306148a28ae97c493e7a86761079d765b042c95b346288650e67d33764f556f6373d76baa5430c65c51241b154ebaacf620e4ace2db77e530579cda2a980f527 SHA512 529fbb6463ea9a03737fb60e7c440b0e07f3b630bb9307b15f0c8129570a9fdd87da4abaf11da84a14fb5d324fae724fca051a0bca4c8437e4de1d78d4b386c6
 MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
diff --git a/app-arch/unrar/unrar-6.2.3.ebuild b/app-arch/unrar/unrar-6.2.3.ebuild
index 9b00c1fd50ee..e34669f3505f 100644
--- a/app-arch/unrar/unrar-6.2.3.ebuild
+++ b/app-arch/unrar/unrar-6.2.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.3-build.patch
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9efa5875806a..370f1de8d2f2 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 89d26ea415ac..863c674ea268 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,8 +1,8 @@
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
-DIST rdiff-backup-2.2.2.tar.gz 933227 BLAKE2B 41d31892b7be1918a13e26a2c974f1e7b11abdce6d0fc3f7d524525c99ddcfe9878b594723aa575326b551a4aeb7e89ee176cead2c7803731bb7818899cb0f0a SHA512 cc0d351f213077fe73837ce059aefc19be7c5f61b7ec498c930b2e186f1cc0e6a70d9af1c7fa52001e3c08c3aa4f2c5e45f0fe040313331ee9b59884ef65c6a4
 DIST rdiff-backup-2.2.3.tar.gz 940780 BLAKE2B 37f36ab06e3ebbe67f42af9edc26e1862b11043777775fc100ffdbdc44f9442972601df1fb298c5ca0c5caebb18e0bdfeff86cdc1636a2a615c5f830448373a2 SHA512 5b243316deb04b444c48f64677979e9df208a21699bfd6af0f1459cea331d60deb37f664d168b3ec45a9a774a8898d5d0a8b0e3e9bf711931839e2d1174fd4d0
+DIST rdiff-backup-2.2.4.tar.gz 941625 BLAKE2B 5635c8a418f482d44bac354415f33ec46d7f82fe4212517aef65712977ff9024c253515ef74b5696d200cf3d2b4f132887c22d35b633f02963ce56cab687b89d SHA512 3777038f90a702aaf0d87737ccd79dd6a0bc9d6bd49dc8154fbcd240b9b1971f5a5f3cc0ebffb623f1eeec82cb939fbdee75a813d27ef9eb78d5700ecc2716b5
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B ac77f2576c939098ff7bd56e0a24bdb01ea152e70b60fa459643c42f32cd10252bc8621af4b33687492ef0f1d3fcc9a8f5882f4039c1c03d79b613385d046372 SHA512 817d5be88a71dddcab46a751ce25eba49b9781c0c76c70b1865e84d35160819bc025eb293842f439c1f00921e570eead17e912a60d16c0bce6212d63adb2b454
-EBUILD rdiff-backup-2.2.2.ebuild 875 BLAKE2B 74e997909b083bf335eb9effb71ff185b778be3b29d2c4874f30e1cfbdb7c69c77e574ee0cf2b76f44383bd81ac42063d0eff88f7342fc4a77e9385d9612df21 SHA512 28d53b1075a14ea9e6fcf830e2bbb550c07f7e36f61f12924c70969deac057ec121d0e3630d54073b1e684e48a4e6342d7400ad4344a2ece8067c44eaca3fbac
 EBUILD rdiff-backup-2.2.3.ebuild 848 BLAKE2B e07bda4bf8c72e22a678e40c7f1121436171a14c0219549924f5ba6681d05d5a86046bdb58756aff1bfec222c3eb42945cd5d7fd95c4a029d3eeec2546a7de53 SHA512 d51a0fc350686be296fb6dc47839115c48e09730754633b72c751863c673e162544f996307869c5984ded32db8cac49d8ee87ae91afb77ea695fd252c580a031
+EBUILD rdiff-backup-2.2.4.ebuild 848 BLAKE2B e07bda4bf8c72e22a678e40c7f1121436171a14c0219549924f5ba6681d05d5a86046bdb58756aff1bfec222c3eb42945cd5d7fd95c4a029d3eeec2546a7de53 SHA512 d51a0fc350686be296fb6dc47839115c48e09730754633b72c751863c673e162544f996307869c5984ded32db8cac49d8ee87ae91afb77ea695fd252c580a031
 MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.4.ebuild
index 952d7054d4ab..144527672536 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.4.ebuild
@@ -4,12 +4,13 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
+PYPI_NO_NORMALIZE=1
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Local/remote mirroring+incremental backup"
 HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -18,7 +19,6 @@ RESTRICT="test"
 
 DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
-
 RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
diff --git a/app-backup/rdumpfs/Manifest b/app-backup/rdumpfs/Manifest
index d990521de595..abcfeea6d63b 100644
--- a/app-backup/rdumpfs/Manifest
+++ b/app-backup/rdumpfs/Manifest
@@ -1,3 +1,3 @@
 DIST rdumpfs-0.1.tar.gz 3054 BLAKE2B 6ac78101003dbecb8920c52bc1c4a0bd902b2f4805cfd004665edef4488bb766c57d0328a6bd23413e88e8d8202348e0e10d1012e731eab9dab150188598a2e0 SHA512 54add203d09bff1190c3bd292bd5fde3b81f4b6810f4dc8d1be18f9abfb5334bcbca1aebc00795f4bdce861f356a7b9e5d809cd80475a3c50a21752380570853
 EBUILD rdumpfs-0.1.ebuild 552 BLAKE2B e184dffa690807907dfa7600b695b23f35af4c3c5598d508c87189962b6812069c09571f22241f209564dfecb0911b31d3d3e03383d52bc7d85a7f26dcd8639c SHA512 11cf252b8dd81b6966a662612a1f8cc88ecf099cf9ac94d34c5210be08133467623bb4034ad0a879543cdb6a234e81f70ccabf1f15f789a1829b84fd8ae63c12
-MISC metadata.xml 349 BLAKE2B c491dd1e4bf38b1f5f2bc24e7b9b6ee4d48cb63b962bb58b7ce3ad4c4f9219e410c919334fc515db78e042407e14306fe1259f19b1ebd224df67b9af73dd66fb SHA512 31168fcedfe0bb5c11367621a0d869d487d0c4ee8f66b2126978d7c12171c1509ad56974ca2858f7ebe8d61d1a2ccce9838ee4b4c1c1810bde5d7e4ce85ecc70
+MISC metadata.xml 258 BLAKE2B 2ae68a7dcc439b11ddb03a9401fadf757d6a3ff36b88bcd61792f5f19abe71d1dfdc92304ec33cc69642a21e7d40ee7b9de0e21146afb12be9a9d1bb21f00275 SHA512 6950bc8c3f8cb74ac1edab1846b5afc191cdcfc1d0c4488125084fb00e9b7a8021c28f28991c61a26c4ded27916876d11b1299bbbbfdd2e14e886c6418bae628
diff --git a/app-backup/rdumpfs/metadata.xml b/app-backup/rdumpfs/metadata.xml
index 25411800ccba..d46859db33ee 100644
--- a/app-backup/rdumpfs/metadata.xml
+++ b/app-backup/rdumpfs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">chneukirchen/rdumpfs</remote-id>
   </upstream>
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 442c92ff419b..d1a82f7b02d0 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index 330f80145df9..b8191b304ab0 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,5 +1,3 @@
-DIST stress_1.0.5.orig.tar.gz 105766 BLAKE2B 7bc4a1d7739828ccd4b58c814e8ded42cddbd0b226bb29e916fe220835bcfa9dcdb86191bb321247aa98bd0e58791556713770bdeda5dad399aa61f2703a766c SHA512 8ae2b74213e2a6e7d17948b8277bdd6143c135a6cee64fb43d183b10134eaea761981e1d76af86ea4700b2d41598d5ca53b17755e61982ab50802297b139b805
 DIST stress_1.0.7.orig.tar.gz 105784 BLAKE2B 9faacbd1bba441be219033d9a51cd970ecadeca4f8b6b637c932b74e8819fd81472164c8c63c606bbbe19b2e4b1b8af008456062a893caa275ecf4ad3207ed70 SHA512 93d5d8708a0abbc7d85585a37cd6085362d3dca7d49d2915c09e7bc151296c4023e2cedd5e190578f7540e666280ba16b4e9a7aa0133f35dde598446252fdccb
-EBUILD stress-1.0.5.ebuild 588 BLAKE2B 281054f2d0583c357b3f14a6244498a8826497c0cebe78a3ed8a868e185150ea28a4e335f6f33d524f051f5db94bd7659e8c7fc6d7ffa76e0e3214b772ab0a39 SHA512 d7c5da96e4b0c410a46a7efcbffcedb4908a1c1ed4aeb48b5ab60a7be0171210d21b88327d93eea3435bb314d6df7c5d09b0d088bf753c0c86dc246f10b79d5b
 EBUILD stress-1.0.7.ebuild 588 BLAKE2B b863871a1c4a7455f61e01244de0719cd5d48ad91963e95e0bf5849a01ec6bb542ed260503a42cc8aa273c347f66752646d54eb532582f1a0cb618fb6c8a305f SHA512 f3694842e54390cd6c111aa4c8b6d7385cccfe236e04fe86adcb29bc67e31e4d53e05280429bc56f3c3366d2f8c18555c06f928f57455fcd7cc5696de8780ad7
 MISC metadata.xml 449 BLAKE2B 3017469519500c11712693bec0d179d89a31b9765ca4ab21939c4d5730afb664db66f746b8825d0b71410d704dfef9ad9e6e53233254e01fcb12f1f117a3995b SHA512 eaa43980bce8b1a58010b80b31396313fa50966f9b7229fa201af689308b83f8acd0acdc4b2669793cb5652871865c895ca3708097b96a048c5b10087cea8b0b
diff --git a/app-benchmarks/stress/stress-1.0.5.ebuild b/app-benchmarks/stress/stress-1.0.5.ebuild
deleted file mode 100644
index 2cf842fe3bf4..000000000000
--- a/app-benchmarks/stress/stress-1.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A deliberately simple workload generator for POSIX systems"
-HOMEPAGE="https://salsa.debian.org/debian/stress"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="static"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index d8acf8c4fc3a..623a0d11b7f7 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index edae0c98e8c4..1059fd435140 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,8 +1,5 @@
-AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-ax_pthread2.patch 15694 BLAKE2B 8619fd7ff18634fc6285fd02760b7869e498429810af3a3ad85b8b7b20deb8ffa13f34c210afa12837e4cec0fba6b0efa83e29a94d18871a6125a801f41f8231 SHA512 f3b3a0f52e4c77ac4e22deb216379732e5ce045cda472faf2b2e1aa49f1cfd44338a58e32d0086e4c2f701990e2193a25485e11728452de2a259cf83dc34f92b
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
-DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
 DIST cdrdao-1.2.4.tar.gz 1603363 BLAKE2B 9c22d21a391b6b1b6ded19f88506acd22e681a43ed91b1c71d20de27ce93cc74381d4efe8574adc929a189143c81f5838ca8d8227ec0e2e05a593f0df9547964 SHA512 decdc9d83fe380a4a05443ac26366eb3288d24bd7ed6c16d006707abb616dab91858a59af6638f2d7a72bc7bb6425dbfddd119ca492d18f07afbb27341b23d0b
-EBUILD cdrdao-1.2.4-r1.ebuild 1032 BLAKE2B 4e225d7b9d63ce944b86dd482aa74a3d3d23a4c3f3ff37a1f8142c654cf0d5e817b49f90c92a0693ff3d69c028e30c6d8fe98793bdbcbc69483cfa09dd9d7773 SHA512 b11da255fd2e486453c919924d91605747d499e0bd5637ec78e1204b891d3c5c351861585c2a589fa6b830e9821db186fdb0b2f08d91567a515118fcf5ab2854
 EBUILD cdrdao-1.2.4-r2.ebuild 1180 BLAKE2B 18f8d791a5018e77475b009a3a7c07e029c6eadd880cb4a886a243efd5cb4a3eefa3a55c58515b32bf8a766f0a925fb7fea0f475a844cab070771528fde8aa7a SHA512 2f818a1f810763acad9d610e009ece2eb96c9510c16ab436dd6e43364bcc6d7c019b5e4ce7dc9e552489833ee93ea1b3edcb04442adb1330b63db88fecef5d29
 MISC metadata.xml 627 BLAKE2B 07ecffb902470b7bcc721b90a207d5c3fe929dc15476d21943bbe5cff0ae53438c049cadf7b23daa3b83d5d7dde7957f203af9c4c274aa1add31f0bd82248a72 SHA512 fbfcbf66c921c04a502dee9daff5df1ec73674e555511d15d2441288892bfb4427534063db224edcd148c1b79caefa4d864ded6cc02ac015239bc66fa656bc2c
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
deleted file mode 100644
index 0695b645b539..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="encode mad vorbis"
-
-DEPEND="app-cdr/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	mad? (
-		media-libs/libao
-		media-libs/libmad
-	)
-	vorbis? (
-		media-libs/libao
-		media-libs/libvorbis
-	)"
-RDEPEND="${DEPEND}
-	!app-cdr/cue2toc"
-BDEPEND="gnome-base/gconf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ax_pthread.patch"
-	"${FILESDIR}/${P}-wformat-security.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		--without-gcdmaster
-		$(use_with vorbis ogg-support)
-		$(use_with mad mp3-support)
-		$(use_with encode lame)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
deleted file mode 100644
index fe052db02af7..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
-to CFLAGS, CXXFLAGS and LIBS.
-Also use AM_PROG_AR to detect proper ar
-See also: https://bugs.gentoo.org/548004
-
---- cdrdao-1.2.4/configure.ac
-+++ cdrdao-1.2.4/configure.ac
-@@ -2,6 +2,7 @@
- AC_REVISION($Revision: 1.26 $)dnl
- 
- AC_INIT(cdrdao, 1.2.4)
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CONFIG_SRCDIR(dao/main.cc)
- AM_INIT_AUTOMAKE
-@@ -32,7 +33,7 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_CHECK_PROG(AR,ar,ar)
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- 
-@@ -113,7 +114,10 @@
- fi
- 
- if test "$use_pthreads" = yes; then
--  AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
-+  AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
-+  LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
-+  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+  CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
- 
-   if test "$have_pthread_std" = yes; then
-     AC_DEFINE(USE_POSIX_THREADS,1,"")
---- cdrdao-1.2.4/m4/ax_pthread.m4
-+++ cdrdao-1.2.4/m4/ax_pthread.m4
-@@ -0,0 +1,332 @@
-+# ===========================================================================
-+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro figures out how to build C programs using POSIX threads. It
-+#   sets the PTHREAD_LIBS output variable to the threads library and linker
-+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+#   flags that are needed. (The user can also force certain compiler
-+#   flags/libs to be tested by setting these environment variables.)
-+#
-+#   Also sets PTHREAD_CC to any special C compiler that is needed for
-+#   multi-threaded programs (defaults to the value of CC otherwise). (This
-+#   is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+#   NOTE: You are assumed to not only compile your program with these flags,
-+#   but also link it with them as well. e.g. you should link with
-+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+#   If you are only building threads programs, you may wish to use these
-+#   variables in your default LIBS, CFLAGS, and CC:
-+#
-+#     LIBS="$PTHREAD_LIBS $LIBS"
-+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+#     CC="$PTHREAD_CC"
-+#
-+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+#   PTHREAD_CFLAGS.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+#   is not found. If ACTION-IF-FOUND is not specified, the default action
-+#   will define HAVE_PTHREAD.
-+#
-+#   Please let the authors know if this macro fails on any platform, or if
-+#   you have any other suggestions or comments. This macro was based on work
-+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+#   grateful for the helpful feedback of numerous users.
-+#
-+#   Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 21
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test x"$ax_pthread_ok" = xno; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try.  Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads too;
-+#      also defines -D_REENTRANT)
-+#      ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case ${host_os} in
-+        solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-+        # a function called by this macro, so we could check for that, but
-+        # who knows whether they'll stub that too in a future libc.)  So,
-+        # we'll just look for -pthreads and -lpthread first:
-+
-+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+        ;;
-+
-+        darwin*)
-+        ax_pthread_flags="-pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+# Clang doesn't consider unrecognized options an error unless we specify
-+# -Werror. We throw in some extra Clang-specific options to ensure that
-+# this doesn't happen for GCC, which also accepts -Werror.
-+
-+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-+save_CFLAGS="$CFLAGS"
-+ax_pthread_extra_flags="-Werror"
-+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-+                  [AC_MSG_RESULT([yes])],
-+                  [ax_pthread_extra_flags=
-+                   AC_MSG_RESULT([no])])
-+CFLAGS="$save_CFLAGS"
-+
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-+
-+        case $flag in
-+                none)
-+                AC_MSG_CHECKING([whether pthreads work without any flags])
-+                ;;
-+
-+                -*)
-+                AC_MSG_CHECKING([whether pthreads work with $flag])
-+                PTHREAD_CFLAGS="$flag"
-+                ;;
-+
-+                pthread-config)
-+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+                if test x"$ax_pthread_config" = xno; then continue; fi
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
-+                AC_MSG_CHECKING([for the pthreads library -l$flag])
-+                PTHREAD_LIBS="-l$flag"
-+                ;;
-+        esac
-+
-+        save_LIBS="$LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+                        static void routine(void *a) { a = 0; }
-+                        static void *start_routine(void *a) { return a; }],
-+                       [pthread_t th; pthread_attr_t attr;
-+                        pthread_create(&th, 0, start_routine, 0);
-+                        pthread_join(th, 0);
-+                        pthread_attr_init(&attr);
-+                        pthread_cleanup_push(routine, 0);
-+                        pthread_cleanup_pop(0) /* ; */])],
-+                [ax_pthread_ok=yes],
-+                [])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test "x$ax_pthread_ok" = xyes; then
-+                break;
-+        fi
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+# Various other checks:
-+if test "x$ax_pthread_ok" = xyes; then
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+        AC_MSG_CHECKING([for joinable pthread attribute])
-+        attr_name=unknown
-+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-+                           [int attr = $attr; return attr /* ; */])],
-+                [attr_name=$attr; break],
-+                [])
-+        done
-+        AC_MSG_RESULT([$attr_name])
-+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-+                               [Define to necessary symbol if this constant
-+                                uses a non-standard name on your system.])
-+        fi
-+
-+        AC_MSG_CHECKING([if more special flags are required for pthreads])
-+        flag=no
-+        case ${host_os} in
-+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-+            osf* | hpux*) flag="-D_REENTRANT";;
-+            solaris*)
-+            if test "$GCC" = "yes"; then
-+                flag="-D_REENTRANT"
-+            else
-+                # TODO: What about Clang on Solaris?
-+                flag="-mt -D_REENTRANT"
-+            fi
-+            ;;
-+        esac
-+        AC_MSG_RESULT([$flag])
-+        if test "x$flag" != xno; then
-+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+        fi
-+
-+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-+            [ax_cv_PTHREAD_PRIO_INHERIT], [
-+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        # More AIX lossage: compile with *_r variant
-+        if test "x$GCC" != xyes; then
-+            case $host_os in
-+                aix*)
-+                AS_CASE(["x/$CC"],
-+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+                  [#handle absolute path differently from PATH based program lookup
-+                   AS_CASE(["x$CC"],
-+                     [x/*],
-+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+                ;;
-+            esac
-+        fi
-+fi
-+
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-+
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_pthread_ok" = xyes; then
-+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-+        :
-+else
-+        ax_pthread_ok=no
-+        $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD
---- cdrdao-1.2.4/m4/gconf-2.m4
-+++ cdrdao-1.2.4/m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+  	AC_HELP_STRING([--disable-schemas-install],
-+		       [Disable the schemas installation]),
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 678f3b09c5d5..19dffbd65be9 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 6377ac4cef5c..6a9343be9c74 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -4,5 +4,5 @@ DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c5
 DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
 EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
 EBUILD ccid-1.5.0.ebuild 1618 BLAKE2B 7fb2069cb13c95003be20d28a230b5f8516f6e5b03a03171d3c24de4dccd431286189e1c7d95f355717b0757d20708cb3c7658363fac3ce68b2e7068e23966be SHA512 66765d3df507dfe68b620c92a630835edf0bd51652d1ed532a4c9df5c0f47aa6b71bf0aeec0b057bda81c6deadefa097b2b4061b7886f3375001bbe958096a2b
-EBUILD ccid-1.5.1.ebuild 942 BLAKE2B e278e0c685c7b167ec268f7f50e75357e39d03ef2612ef07065821af7b1a12163964fa63bc28af95d21166855751517f15eca7ff90f2ced8d9172f2c4a6638f4 SHA512 7607c97d04a1fc20c1f80389e848a84e5ffd4745d319e3c4beb3e9889d32e4dad1e9936026a386c300de560c243e92c11cd33ad8e67ac92cc7739d7234430d81
+EBUILD ccid-1.5.1.ebuild 940 BLAKE2B da6ac353e97b916126ef0990a80be03a92105c38e1ed4dc1893fad853df419188b10d381bc23d810a083427a0b35dea9066b705baf868ccb2d4bab1dfa39fec0 SHA512 e0264beda6138afc794d401cb2f0763820bce74047532063a113ebc072121e3e20221da74a633805a738a760272c38fc0e793456d115c97230d99e8e592791f7
 MISC metadata.xml 410 BLAKE2B e62b5075deab55dab4f862dfe242085935f383cd51d35f3a61a7e2aeb4d913f3352980d28cdd7ff4ac41f5bf0adf44c763f8267a8e141908fd4371e4656cbc87 SHA512 aabb5b8462ef6146d0230a6d67656fbc8fb2e4a25036e72b4ce9fa3a7ffb29ea1ae0d7eb8bc474343ea654dec649d13749fa844516689ae3f3e33734e0a24d3a
diff --git a/app-crypt/ccid/ccid-1.5.1.ebuild b/app-crypt/ccid/ccid-1.5.1.ebuild
index 46740fd43c9b..d2baa0389016 100644
--- a/app-crypt/ccid/ccid-1.5.1.ebuild
+++ b/app-crypt/ccid/ccid-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="twinserial +usb"
 
 RDEPEND="
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 66005a001f95..f0ce2692a84b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c7cd05f5c8b3..39ad43589342 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -14,16 +14,16 @@ DIST emacs-28.2-patches-2.tar.xz 3760 BLAKE2B 73a78b4fa05aec86ed29315acdad821995
 DIST emacs-28.2-patches-3.tar.xz 5416 BLAKE2B c361fdebf375427cf25c4ac206161b5b55d8d6de88752de35491c778ba90eedf277159a8c317ccda7aaf5e000035d6e33d8e70282436d6e03fa311c4576abe03 SHA512 acae15b577af831bc94e102323836f3fa5b0d51ec1096b84063c81c58f1087b67487507c05d93ba5ddacfce0fea4f3e755906a9ec582b061b65095ee7d693eac
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6b55c01d94254d6aee25887991a8da694f3239a7f443adef0debbc300043ad4595b5934b6aa383daed10257bcbae0 SHA512 2cd4c5174a5ade6f928de3ff6aa1728fe0f18bd5b985d87b62f38aa083da14d9ae3db6372638548d33ef7bbb632823eabb051307d8fca6c78296bff3c79b2d2f
-EBUILD emacs-18.59-r15.ebuild 4392 BLAKE2B a2d1b7dba97a50ebeb7e70f8112aa6e9b67ea0f49e2ea03351aac0d73e57d8750f40d76dccbe37c85c47911a1c0c11d7405760df26ad49113e345f838d0e4d9f SHA512 27ae9452912e9d7f5e21b9ad3fbb79d4b40d92eaad0f952ac7500423b2ebf907eb1654218ce760b93a31f18fa17d216f5fb7757a03fb2dcc65f4b8682b6300cc
+EBUILD emacs-18.59-r15.ebuild 4342 BLAKE2B 08852c5c45cc4330fb7684be880272a3d2ebe71ad736226f6fb3300ea3a5ad615509ddec3f3f49cc9a563e12e37d3bce4c227f8778634a02a8e632c539877d13 SHA512 85e85041bdc5f509d874602602c7bf5a7ce220a8fbdb7af571570e50e37fba89ec07cfd312b555386aa82a87fa010737787cd829689a83506cc61f4eb84a3839
 EBUILD emacs-25.3-r15.ebuild 11093 BLAKE2B 4bae8f9ddf46a9300076808f8ee365da379633950cc3b159a837dfd7bbee39731d66ddae316f79c2b94a29aa53e7612fab1761f87f6c2c38fd16fe1b415d82b8 SHA512 28a0736dcb4ba69ab19a723a978f176d907d878c35899236359aa61c9305223e28315c0500b78f9cc76115f6740dd89f52022370a5bd5741bde723dbd4026104
-EBUILD emacs-25.3-r16.ebuild 11098 BLAKE2B b57c2e554e0b992de30a3b20b707ee62d754a8600c28a9c27846d18230a2c33b230efc6bc961d95d9373b62161fe053802a220017b837f05ec54cd046c5c1359 SHA512 222ca59e223403834c3bfec7824b82ab4831325413aa2e84692097945484cfb794a96a9346a8d3f7a652d937543a0e967967780ed1ce2e61ba209738b2e39929
+EBUILD emacs-25.3-r16.ebuild 11011 BLAKE2B fd5a8324ad44c24471f0d29d4e2475dc084c5db5e7a5f9bfa62e25c24408c2f90bcac6ccbbcef196a1d32f36325ae4a4af2ac0ee2110c68a40c7f69818d69eb3 SHA512 fc087ab8138ed7067afea0bb30ce8656b7145f2da17eaef07c9c8e47af64fe3949c7b71b7d00e5deb14dd771cb03f2f24030f70619a7bf180a8ec24d6410e96a
 EBUILD emacs-26.3-r11.ebuild 11782 BLAKE2B df6298cd44cd0b542df107d1de249a1cebe25b5c4312722bc0736818cb1f345322b0c7e01de261cd5622bdd966cb8c9204e6a7976503c35cf320ce41c4737f6f SHA512 fc19f754dcb120e6a73249622358b6b02d08679132472ddb5e59ab3556293724bc4c132e88f41de4f9a6f0a00dc37c9dbb5694085c3456de71e76187f57d6308
-EBUILD emacs-26.3-r13.ebuild 11798 BLAKE2B 5c3b97e526a311e24213d8db6aa54bf74f6ffd8969f3a734ca76a8c8404e3fb47d8649d01cb7e2ad26900fbd3413fae733fcebc113464667f9fc4414daeac308 SHA512 5bfde7d7c94b300f30efe17723d58da01562aa4034b2c45efa4f94bcf2a457b8373ae11d50d98b23bcd9320c80469c177a010ea15def31310f65042b840920d5
-EBUILD emacs-27.2-r11.ebuild 14318 BLAKE2B 1a511a177273fff5d840406fc5aa9b3e1be169890271fddb5733e3833053d8fc7b744b39416b035bb13a38c5ff645d7d9d08f7d45474bc17ca1e86e17bcb5d6c SHA512 8a9c35642c0d29048c359699918de6a0f09f23ba41b366b9a7b325044fc1ba6a7281df2e49524eaa0f82c6480e1d1057616faea76cfae746e8c9e11eb501536f
+EBUILD emacs-26.3-r13.ebuild 11740 BLAKE2B 352b94899d28136a5c4239790489843fed526a3e25b0130e22ba7bf628697754308b0d3af50e315c0bb4d62df249a72db8d37268d4998c1dabbf22f025cb9c74 SHA512 394ae65e7a9fbd180b6ad54bb2f4e5ba88ff712dcf11943e806c7914e35ff8645cccde67ba218a2c8bef331179da7cc9cd18a1e5a1ef475341a04f7b67104565
+EBUILD emacs-27.2-r11.ebuild 14260 BLAKE2B f9ae761d12052f2908bbcdd86dfbe0c023854dcef3ad2779a1fa70bdcf4a6dcf142d66b96a8515ea9407feedd42173f8be747fecc8120c69054b7cbec59e29a0 SHA512 d96f6548f7ced934876e84757e7729216a4a50a0846a882001406ae1d538537090b983957b32c7c4a3320ef104de0d41c9ca0f7da13c90403bb2bd2cac256c47
 EBUILD emacs-27.2-r9.ebuild 14313 BLAKE2B 9e5d108ecf03da117123995e8542d92e461d845df19eb0b0276dcfe6aedac2142d07298096c2aafeaefbfd58cc8db9ed589077129dc06f80fbc14a65589f7205 SHA512 6dfe590ca8cce4f0ed03646935875eed42376870732a46ee906971383ddf7e3fd521858d1ab08b0d104da8657f0a4c9411afd16945d0f04171bb0a8fc5a3009e
 EBUILD emacs-28.2-r4.ebuild 16758 BLAKE2B a9d8e7a0f010698e530d0dfa502036ca36bcd112c31c94c5540957adf41eb244a76cb5d97c8ea8dbaf1f336deb50197e9888c677125894880520af8d224be330 SHA512 7a9e3cbcaac1bf5e273489b87a2bc6d3919af7223f36b317201f9e2c748aa7e6ad935ef8290c7699aef5fb187dde42f2d028a8c78ac4341f7f9928c8b01558ec
-EBUILD emacs-28.2-r6.ebuild 16765 BLAKE2B c08a2079ee7ed7905ca2640beaf78acb40601c7a03cd027f5568b83c4d1a97999ff2ad002f98507554e4184d4aa73931143916ad41e26f13ace76bd3b8d79edd SHA512 9a349f6f8d3755f0ff3bad7a635d8115dfbeae1a2e76b1892b7350de6fe07c567c5d2b3d918ac6b1b3f684b11158d50c21a7bebaecb0c605ac2147ff36b7a0a0
-EBUILD emacs-28.3_rc1.ebuild 17256 BLAKE2B 9c0d6f83f5451e3e1ccdcfb9334782b3f64884f41534c95d2edfa0f0fe00765dc70282c2ccc424b5eb33d4126c75cae344863653c15eaf74ab5f8eb31d79f77e SHA512 16acc38562a16fca4ee16372e1ed620202682b190d292c69ab1573f1b59c4ede0ada71d312eab17bb4516a586c39bc71a58fe3f7701d75eb7681d4c04e6c9ba9
-EBUILD emacs-29.0.9999-r1.ebuild 18196 BLAKE2B 376255711f13ff7e629491990a84e07ff51d04371dda9b11e0488cd441b6f99d807315425ebb4d16ad5242c8ccc7ea225645faa9fba2a92588dda14941fbbd87 SHA512 c5e0cce0a79b3f93f58fb515a3a4c4dd6ae5a2a50ee9dda8ad4bd8934a311db5f0148ac5846ffb265ab126363d509b2ba603ddce5d8c5d2993748849b23bae1e
-EBUILD emacs-30.0.9999.ebuild 18194 BLAKE2B a198f5125839960b8d3bf45be132f4b35ad4137c02c7c660f00fedfe1c4cafb9248a334be2346cad25bfbd012f8d9e7f207e84a762b3115a4e2646dc9cf84ab8 SHA512 f042a997db7a555fe05c12c5b09edc2c44a2833e6ea0dd1d04245fc86bc0c5a9f9a1ce39fa87e28ae18655ddb28f9667dba88cf471149f16f8e5eec5b6c0cd63
+EBUILD emacs-28.2-r6.ebuild 16707 BLAKE2B ec647f539b1006f9945bc7ff91d60cedc23f5dad95f0f53cc56589d314fdf188f464f209a27dfa5de47a4407b83af8ba78e70bdb0df9f1a896f9990277a41d09 SHA512 6e55c00fe665acb9c69da018ea6080c42327832083f232c99b4223628d401a3a48384c3499a63f5793d76f283d929f52088dab679e39e87f1ab512fc8aff8f63
+EBUILD emacs-28.3_rc1.ebuild 17198 BLAKE2B 6e86b94cd8c6cbf9e46914027746a9c52b5d5a512a101f4f45c1d129cce2587b1aca13d1b4e3e4beed9d544d8aad64c1636a95a5667423b10352e7f571a03586 SHA512 71bcc63ca873b2c144a3987436a59be0f695cd1e0bfab15419330ab092d6deb35a100e7ce895dc98f6887bf077e3ca8094df3d0537babbd7eff0abeb319a201a
+EBUILD emacs-29.0.9999-r1.ebuild 18138 BLAKE2B b1876d79dbbcc0b23c991ee8e503b0da0d542224fd878cd9dc941b80c53b7865f6730d7831613a4232951ec1c8cce9a324189ab077357868e0931a7fb0857636 SHA512 14e13297734239f4d4c769f365591bc754fd00bafb2430af5f9709250c3ba02e4fa5ffa87d777bd47269d5dd75b12d31beee764025fca288322806e010bfcc76
+EBUILD emacs-30.0.9999.ebuild 18136 BLAKE2B 5aa17458480dc84a8c182281a67262ef5d0993211e623c86c47c09c812dba3bd213d930da0ab57f727c32c9df73db9a16151ec3b51db128b3c3a41e87b061484 SHA512 fd0659852845e8eb07ce05d57e231ecd06362beed199a2bdd3d11484c6eb6cc2477b1f30b49b011ab04d6669679dfffc2140a931097f01768b831afa7c7ea667
 MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild
index 6822620a67f8..7844e27bcb93 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -134,8 +134,7 @@ src_install() {
 	dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
 	docompress -x /usr/share/info
 
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
 
 	dodir /var/lib/emacs
@@ -146,10 +145,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/emacs-${SLOT}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-25.3-r16.ebuild b/app-editors/emacs/emacs-25.3-r16.ebuild
index 1e7a6cd64d8b..c30c446b5c38 100644
--- a/app-editors/emacs/emacs-25.3-r16.ebuild
+++ b/app-editors/emacs/emacs-25.3-r16.ebuild
@@ -240,11 +240,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
 		|| die "moving emacs man page failed"
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
@@ -330,10 +328,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-26.3-r13.ebuild b/app-editors/emacs/emacs-26.3-r13.ebuild
index 10482650084c..908d736cf0d5 100644
--- a/app-editors/emacs/emacs-26.3-r13.ebuild
+++ b/app-editors/emacs/emacs-26.3-r13.ebuild
@@ -249,10 +249,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
 	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	if ! use mailutils; then
@@ -350,10 +349,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-27.2-r11.ebuild b/app-editors/emacs/emacs-27.2-r11.ebuild
index bbe0dd17f23d..314d7da47ad8 100644
--- a/app-editors/emacs/emacs-27.2-r11.ebuild
+++ b/app-editors/emacs/emacs-27.2-r11.ebuild
@@ -307,10 +307,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
 	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	if ! use mailutils; then
@@ -413,10 +412,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-28.2-r6.ebuild b/app-editors/emacs/emacs-28.2-r6.ebuild
index 31ef2328e4a8..a86b866e289c 100644
--- a/app-editors/emacs/emacs-28.2-r6.ebuild
+++ b/app-editors/emacs/emacs-28.2-r6.ebuild
@@ -386,10 +386,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
 	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	if ! use mailutils; then
@@ -492,10 +491,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-28.3_rc1.ebuild
index 0a3be1463dbd..f27c55f138e8 100644
--- a/app-editors/emacs/emacs-28.3_rc1.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1.ebuild
@@ -403,10 +403,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
 	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	if ! use mailutils; then
@@ -509,10 +508,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index b06274d3a565..16e932a02739 100644
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -433,10 +433,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
 	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	if ! use mailutils; then
@@ -539,10 +538,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index 0a03ca0c6d54..257e0e3e5c92 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -433,10 +433,9 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
 	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
 
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	# dissuade Portage from removing our dir file #257260
 	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
 
 	# movemail must be setgid mail
 	if ! use mailutils; then
@@ -539,10 +538,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
+	# verify that the PM hasn't removed our Info directory index #257260
+	local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+	[[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
 }
 
 pkg_postinst() {
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index e08702358dd6..7abbf28d34e3 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-latex-3.44.0.tar.xz 1168840 BLAKE2B 7eb34502a9bcdcbb5c8e2d8336a3029fad1cdd1da0cbd704fae4de44a3aab913ed43228172dfe7798c7a513a61664fd8af97df0aff66d62f8502edbe845ac12f SHA512 d1dc7b2321438ebed7a209c7c750123a0dcf8ebcf92f73fd7eb4c79282f51d6b6a8328ee8759326f43e53dbd2ba9d1fadc056c2fcea11e7785e7c27574707e95
-EBUILD gnome-latex-3.44.0.ebuild 1088 BLAKE2B 0b5f46d48d8e4c21971501882617d13dcdcb84692d2c0cbec865148ab7f80cad31288364e850e76f0ad980f6795489f512387e85982acc49f355e608c5a03c9f SHA512 2e65b0212d9e1fed106804f1f1e0d42739e40a68c0feced7be56f4c5f4a58aa8fe86c8323edaca4b84fa91841303b8e6d1cf7e2a226cba45378af826fd9dec06
+EBUILD gnome-latex-3.44.0.ebuild 1067 BLAKE2B 3dc80120b6328fe65d5913d09b8e3b75d7251238548e8e3d17d59d3651c4c00064465681a91e27a325507c05681df8fa18fb6b7bedea30abcaee5bcccc82bb80 SHA512 bbe7c13cbcc10198fd140626ab0d98fd5f6695f35938ef8010e583eee59ce132159d3b4ff1ef87a72fdf6c822786347bccd86ffc837bbccc915f886f3d918537
 MISC metadata.xml 575 BLAKE2B 73604444b6c40826ddad63c484b35ed2bb7c3edf6ab59e40994881769051c96b2ebb211d47d2f67b562c48e15ca589863f6cad9984accaf40567bc8f697b15e6 SHA512 6a6bbbcd0f1e3119f624828a3f008d12377c835f4235fe6fe232f326dc8d3bcc960406d1c33ababd00b0a941f9c7160c3f6a7b106a9f70ccb505b0eb0349e5b6
diff --git a/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild
index e273f490a551..2a2cbcd1fde6 100644
--- a/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild
@@ -45,6 +45,5 @@ BDEPEND="
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable introspection) \
-		--enable-dconf_migration \
-		--enable-vala=no
+		--enable-dconf_migration
 }
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 8b2b595a94d7..f13b62097b06 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -4,6 +4,6 @@ DIST nano-7.1.tar.xz 1605272 BLAKE2B cc606a04b34e723da01326d617b50f79711d0b35034
 DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
 EBUILD nano-6.4.ebuild 2703 BLAKE2B 77ce48f293a4c8200b3e8175bf07e8aa1158229887062324c8aafbdb96846c66bfe9ca5d8cf3889595c060dd13982cea0bfa42fc8b125075311e259f2d5a08be SHA512 786d9897c4ec70eac6d3107b9ce6fed248af4b76c450eab17df5ed37aa325faa73d7c764b5ac7aabb98b1d64c362aeb3624f7ff18468c322e584b33ad81c25e5
 EBUILD nano-7.1.ebuild 2646 BLAKE2B 0b405af8ca54fff520dc1e37d821c38df33ee9fc92c4b3e428e97fcc367434e97d27564c1c2f9795844141a9aa9f9cff81d369c7d8540c6c99b88730f96439d9 SHA512 12e5c4ee587a052cc062a602e1f62ec932507bdf1ac5f02cf3f82c9403ee20c7ca18a64362307c26fa94cde5311d93b0d5a97cc46cefb741d0aea921e7f8343b
-EBUILD nano-7.2.ebuild 2639 BLAKE2B b98bf8fc9cd84629adc7e34689842c411710b758202f21fe6d98a31116185868b35c3f77e6a91c8fe577abfde7f8f6c25a07ff9565b978c54dc94ed96b26bcf7 SHA512 e183c48ed95a57051d1db0ca80a0dcf0e5281d6e4b1935dcd73c1dfe07ffd44297704be3e30fd8fb2dd7be5edf5056c3723e39320ae7d9001675a1755b4650e1
+EBUILD nano-7.2.ebuild 2638 BLAKE2B aea81eb9ed8cf55fa0c3f8d0797a88b7219fdb96732a35eb36104be758ec58555cf191d3192c9731d17a6df1f1c61215961b84f20debd19a881b0d5af4198cac SHA512 181d36589d436d3456c32c6934aca1cb2825e7cce6d5fb3f41766606e1956ecf238d3f6919b11b2f2fc3741138c7767323c878530dbe156da930604d7ca7693e
 EBUILD nano-9999.ebuild 2646 BLAKE2B 0b405af8ca54fff520dc1e37d821c38df33ee9fc92c4b3e428e97fcc367434e97d27564c1c2f9795844141a9aa9f9cff81d369c7d8540c6c99b88730f96439d9 SHA512 12e5c4ee587a052cc062a602e1f62ec932507bdf1ac5f02cf3f82c9403ee20c7ca18a64362307c26fa94cde5311d93b0d5a97cc46cefb741d0aea921e7f8343b
 MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f
diff --git a/app-editors/nano/nano-7.2.ebuild b/app-editors/nano/nano-7.2.ebuild
index 3b32708bf317..766043f09add 100644
--- a/app-editors/nano/nano-7.2.ebuild
+++ b/app-editors/nano/nano-7.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 4640868a76cb..4260914fcce1 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index 9398a0b43a42..9d78a8dd066c 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1,7 +1,9 @@
 AUX 50eglot-gentoo.el 82 BLAKE2B d5c0e215ceef684ac390a835633aca107f4ea95a83544779724c4fcf9a73963ba87d956aece3406d82bb02f82a5f9b909632d52e3b8fe361d26921f88d0f4e67 SHA512 9039a33b75c7101b04e367432f217700354fd2293914a295adfe3abd4ae1b8626205155fe8c0d809acf5d02b56af3feca22e837e926cba96d872fea4b3354a5d
+DIST eglot-1.11.tar.xz 36900 BLAKE2B 20496e37944127c0e209762d2455fad01e6578fd1fa8350cc1a6782ed3e5dc11b09f8b737cd97d5439ab7ef67caa5cdf725d53d2e9e91bbca10223106a9073ad SHA512 c258c89d8c81b1c1df8ea9798c120a7534c174ce435a4551f503c7477520619ac08bd627372033ed1740dfc67bf7e8004751259769844d6be9adc9411d8ae5ac
 DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
 DIST eglot-1.8.tar.gz 302450 BLAKE2B 7247b11adaf9a65a2e071ca17b55038fe85f5842fb4155b44dbfa82bae5774e4cd2f7a5557d40cb1a7ab7f554233f15abe297e10568a1630b464ab6a600d978f SHA512 0295eff6dfbbf9d7a82349b8e5ed9e7dad700f2f0bfcab879d906e30bfbb4d28b8779fd9076108ac9b1594a60ca5e30c5035e2f8ceae44add99c28a843027609
 DIST eglot-1.9.tar.gz 316541 BLAKE2B 5b9f188ae3f2b26fd7bb95aeb3095fbf5a78f6a15eeccaceaf947f5f91e78253622d2c81d5e57f11762c0370baf9d6c856a4f770c2652840d750f98ee780b418 SHA512 961399e0877a09bd292424715c3fac86e7750e144ba302e61262925b6ded1d30c6ebf3e63067b27b56fa2062461a947425951ac5538e25312d179fa20bd68b79
+EBUILD eglot-1.11.ebuild 581 BLAKE2B 9ca1ee6b890de466cfcc4fcef75117e3845de756ca5d6c9c24551f9383ea39cab090e7ff74ad44898319d4faf9a0db77c760bf19ccf2553f64ae4d05b0b01d83 SHA512 7b65c4ef0771f65277797a8fa91e74ed14244d734db8bf8d6fad6e790decc98f716c98271dc12805120290c47bd8c644c84af21bdb9ac57f6d5a2a76ab1ce496
 EBUILD eglot-1.6-r1.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
 EBUILD eglot-1.8-r1.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
 EBUILD eglot-1.9.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
diff --git a/app-emacs/eglot/eglot-1.11.ebuild b/app-emacs/eglot/eglot-1.11.ebuild
new file mode 100644
index 000000000000..4c3f5fa8f297
--- /dev/null
+++ b/app-emacs/eglot/eglot-1.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.3
+
+inherit elisp
+
+DESCRIPTION="A minimal Emacs LSP client"
+HOMEPAGE="https://github.com/joaotavora/eglot/
+	https://elpa.gnu.org/packages/eglot.html"
+SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/external-completion"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}
diff --git a/app-emacs/external-completion/Manifest b/app-emacs/external-completion/Manifest
new file mode 100644
index 000000000000..96ab5528bf60
--- /dev/null
+++ b/app-emacs/external-completion/Manifest
@@ -0,0 +1,4 @@
+AUX 50external-completion-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST external-completion-0.1.tar.xz 3292 BLAKE2B c89929bb474f8d6d8a9b82d25a52591b0b84a10c25b217607d7d5438f99979c8fb50ea6c1278a295292bca14bdce385bcf727d2d4715ea1f280b00b15c898232 SHA512 beda4c0a57807bd2fb6944a8abfafd5801c6b32a7270e76395ad720a76fc0b27f73fb5e5ff60659add43805a715372d60687d5be1cee7fe8425e2573f4b51e2f
+EBUILD external-completion-0.1.ebuild 429 BLAKE2B ba1b9c596b3909f939c2c962d2317015a01066f76af1a28a728c6145d73ec615de47dd8f570c940dbe0d394465e375161b0371f99e352a19ed16395546bc2b43 SHA512 3c2040e2c876829780ec3b8baf41fa1f00c9ef1a53d7bdc8dbc53bbb216370502470a846f0782c11747d1173539d516045ba52fa3c801a7b9bc33b98033db37a
+MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/external-completion/external-completion-0.1.ebuild b/app-emacs/external-completion/external-completion-0.1.ebuild
new file mode 100644
index 000000000000..9286df028ef4
--- /dev/null
+++ b/app-emacs/external-completion/external-completion-0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Let external tools control completion style in GNU Emacs"
+HOMEPAGE="https://elpa.gnu.org/packages/external-completion.html"
+SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/external-completion/files/50external-completion-gentoo.el b/app-emacs/external-completion/files/50external-completion-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/external-completion/files/50external-completion-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/external-completion/metadata.xml b/app-emacs/external-completion/metadata.xml
new file mode 100644
index 000000000000..cb313e2aec78
--- /dev/null
+++ b/app-emacs/external-completion/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="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <changelog>https://github.com/doublep/eldev/releases/</changelog>
+    <bugs-to>https://github.com/doublep/eldev/issues/</bugs-to>
+    <remote-id type="github">doublep/eldev</remote-id>
+  </upstream>
+  <longdescription>
+    Eldev (Elisp Development Tool) is an Emacs-based build tool, targeted
+    solely at Elisp projects. It is an alternative to Cask. Unlike Cask, Eldev
+    itself is fully written in Elisp and its configuration files are also Elisp
+    programs. If you are familiar with Java world, Cask can be seen as a
+    parallel to Maven — it uses project description, while Eldev is sort of a
+    parallel to Gradle — its configuration is a program on its own.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 46c030506334..9d0ee7c2cb63 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index fd4240e3b816..fc63c32e6d15 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -1,13 +1,10 @@
 DIST wine-mono-7.0.0-x86.msi 86433280 BLAKE2B 9d164bf10f9c790a1f518624321a77965800742c84677a6372cd57b1f51bdd16a2d61ee85f868e84be9b07d4c3f5a7afa770e98637f698c2337c42d42890cf58 SHA512 d7af2a68c3b48cab93ddd489f674ab9064d69d5ca0b6c91e58713dd0408af9fb1ff82ef8847d91645d96df40cd5526c6735d621064a3598166ab5f51d1e0d076
 DIST wine-mono-7.0.0-x86.tar.xz 45085800 BLAKE2B 504c57acce486c19a54bf33cdb4b9444c07a58a7f56ced0c93178886a91fa5d94a61f6e26aa885f3e3a2cceb2ff792f01006a4b16fa5bb88c3d25ddff02fefd7 SHA512 a3977563c5eb6418eaeda25e5b39bd2ef1faf305d514979211e049280c4577718ca48c8566e527b97a58fc465b310dd600093a616102573e12e8985794d828a6
-DIST wine-mono-7.3.0-x86.msi 86919680 BLAKE2B 917aa260ba7a012ed1e1565f8ed23225c82060c82dbb74a1e0d105a7b38a1d840c20689e0a8e7cc1a5c5de938807c78f36c98cbef07270accaf789b6b031f22d SHA512 d92ab4a9d0ac1c48dfec583b1681317e9ec9556efcb18766a865bee06a3a53ea08159099ca3ec92149f677d67583648991d59adb9b8a612ef41de06da8c77fd2
-DIST wine-mono-7.3.0-x86.tar.xz 43557004 BLAKE2B 919912faf97cf38b2fcc9813de4e035d907b0a00db78d2a251c1c43dab65ba44847ecbf494a15dba761d9ba8203855c1a6e5f5bbd07f20484c9948c3cfe4d3bc SHA512 c26dc21d0d462b3c79e778497815e33d26b5ab545eba0552b436f30d9b7aa340ccdef69fe0dcbf32c04330e6d0f813314646ded7d2d24e6f4746e4893adbbf7f
 DIST wine-mono-7.3.1-x86.msi 86930432 BLAKE2B f43b605ab7b07a7b4d8d4675297af6e827e81b2b232c6991fb1f559a247c6b546490017dd4e1aab04aad664570cb90152ff872be61bb8e12a154ae2366dbb21c SHA512 dd9f3860c4b52edce44f51b27de2a3b4acc97271d661e41310b889fa378f502458739caaa548fff5e16ddba418d40d647528c151c0413519df54c38f9e237946
 DIST wine-mono-7.3.1-x86.tar.xz 43216532 BLAKE2B bc00f41d2e9e88c0a687fad6bdd48e9a836f3d7369747602665691ca3e430c895655e9c5e9ef955a5cf45a96818b6858bc3cc93d90c3d7a49f8d8f4ff824d45a SHA512 a2c8d10d9b34fd7775eeddb6494b84f2f04e6a2f21d93940dc902434b189d43bdfdcd198baf8133cda8b17c2bc25ee84538e12a32027cdd66da9ab029eed6777
 DIST wine-mono-7.4.0-x86.msi 87334912 BLAKE2B c0b778f9db59d1a2917631f1d6ca1a1798972a6a42e27975da78f3a35b77018a99228d7d95e5640c57618533a6b01bf2252859e3e978e2aa8dbdc8cd62afcc28 SHA512 cf35513b368324487c387d4339e5b05a90c4825b25ea603140524b79e69786ccc20dfb898213a9548c0313c0b0e4b160acb88364e4b280dd6712d185d9e5ae57
 DIST wine-mono-7.4.0-x86.tar.xz 45404344 BLAKE2B 3a74106b9b3f21a88c2435f7988d66a54e08beea931a0ce0df6431c21add4ee2685bf9c9cb2404ee1a685736d61b1aee3cdd507130e5c5dddba7e506a2ff18bb SHA512 108cb5d969e84deeda3d2b11dba7cd73853fc3b088ecf2bcdb9bc5c5bbaaff03e72cd4f485d1935eda43cdd95b927886441be1d2204edeaee1ff1fea75735d22
 EBUILD wine-mono-7.0.0.ebuild 612 BLAKE2B 39b9a3190973e810ad32da319b29e8448de94e7289b264579900c9261d32fe3bf101dd1b46e2fd71ba61d2fa4b073aceb59526e0fdb59b8e15abb55bd0eadb4b SHA512 eded1db18604b14f9a634d8364ed5013ec84821f32a31ee459f5aa38172f2f8f1b3e3d38e1527d87208e69d604dec49f01d8b9dc30ca70530aacc7e1f9039039
-EBUILD wine-mono-7.3.0.ebuild 614 BLAKE2B 3714993f823335c75e1d770d92a16452b9651a3856469d8e06ddcfa5d2c69822fee0b23aa76aa7c378eefb9603014787c27d5141eb0e5d0fc2eb177b7f46b6cb SHA512 89dfe1f004c48631259b5a81c30b0935b049c340e3a6320a6850ab711b8431a754d50d0cffd9aede4b8353fea6e4ad1ed10f179a8540574cbba430039c2009c3
 EBUILD wine-mono-7.3.1.ebuild 662 BLAKE2B f2f93392f9b755e268615f55ca56bb17e4f6016a6cf5b429db3a6bee6f919bf007dc6decaf1b89173cf1ba93271958abdd0d034730a1c92e815a31f27e08544e SHA512 0f7f8305547cc3a502991df847c393180da67ca74be5bef604536bd1c22c23e2d56e0807b6c9b252073d93a5ae1c9d5938089011d79e4080ae85e8f9272461b8
 EBUILD wine-mono-7.4.0.ebuild 662 BLAKE2B 1e4e33a1f0a9f6436d787091a0186b8f8d77a6678c5d86fac205720a02ae5fb21e6a40e3df33d8f1501af6974261ce23f3b47c0a558ea299b454fd439b19b7d3 SHA512 930cebc2ad75709cda8819b527c3bbd0c34c6e59fec7562197b8d1ad8fc3e0597b62a789e1e37951ce63fe8687158617f6d332cea585db4787b71de576ea0982
 MISC metadata.xml 746 BLAKE2B f9afe281dd6e667a39d5c42dc0580f7bd6581edf5271a0c54e7436e6398a69ea415e09425fd5df56342cbcd128cf24ad4c94f43d64d1d42bcdc528073c72e3b7 SHA512 83016f049bca7f127af165425648857df8e44c3d6cbcb33d849501ff1ddefbec590c38e8a59d3c69e4ab583c89ac4dabc9cba5d7fe8ada66eaffe5b4d55dd13b
diff --git a/app-emulation/wine-mono/wine-mono-7.3.0.ebuild b/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
deleted file mode 100644
index 4dc409c643f3..000000000000
--- a/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://wiki.winehq.org/Mono"
-SRC_URI="
-	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
-	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )"
-S="${WORKDIR}"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared"
-
-src_install() {
-	insinto /usr/share/wine/mono
-
-	if use shared; then
-		doins -r ${P}
-	else
-		doins "${DISTDIR}"/${P}-x86.msi
-	fi
-}
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index f4942f8e700d..9e66b87d84c0 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -5,7 +5,7 @@ AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f1929
 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df
 DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-EBUILD wine-proton-7.0.5.ebuild 10401 BLAKE2B 1c11f3665732f5217a52cfb3798f05eb9e2fa3f2c86a7ef8491a908accd0b3ef70375d7fffc24db452850e152f39e84b0d69d278333fa5a68da6b896b76f539a SHA512 90875a85b1704329d4119ce0e9ad1c6d2cac5b1d13ae8e5041bcb554b1937445ed4e26066dd49030b147b0470a275eb531193c28954415364bfa58719945751f
-EBUILD wine-proton-7.0.6.ebuild 10402 BLAKE2B 824dfdeee1b05195443a45941ba06d13b674f3dd011ed66f0c0930d51d2a1ead5a9880975fe16ecd897533439ed86d0952d5a8fa81d85a0b832e49cfa060dd35 SHA512 5c8d55618fab8e7b9b049c84e1803ff890db473d1906c341196eb3e644b7d7ba21582159f96b79f8eb286ea3607adc7f070a13ba541e8deebb5536efe690c727
-EBUILD wine-proton-7.0.9999.ebuild 10402 BLAKE2B 824dfdeee1b05195443a45941ba06d13b674f3dd011ed66f0c0930d51d2a1ead5a9880975fe16ecd897533439ed86d0952d5a8fa81d85a0b832e49cfa060dd35 SHA512 5c8d55618fab8e7b9b049c84e1803ff890db473d1906c341196eb3e644b7d7ba21582159f96b79f8eb286ea3607adc7f070a13ba541e8deebb5536efe690c727
+EBUILD wine-proton-7.0.5.ebuild 10445 BLAKE2B c6286f68a8af657a47c46e733b2002eeb4773f7d9af004b7e6e43b2a4e2cf300ec2c89c51c6ec4299840f8e2f20a5092856c338a5ca1a81a15273619a64d0717 SHA512 1f5c6528da022b5a2ab7f8f6d33e243bb951312d6d36a3d1db8a75e46521ed67377b144e787cde8b5d129f0a4dff9da6c41539327c18878070f93d8ce8729bd7
+EBUILD wine-proton-7.0.6.ebuild 10446 BLAKE2B 4054d064fe52ff7279b2993959232b755c6d114aaa14ef7e358ba6147672641f7791b796b703e2dd5204fc3eb5f5a3857f312e2cbdc0e234b80203b8d310fbd3 SHA512 03fbab5a2815dce75b69723fe5d42a8b56432a3208fdad515ac75429c7537d2c5434efa765be1e2b4f86893de04494b368dcf24b2135412cfd3bc2a0c3d2354b
+EBUILD wine-proton-7.0.9999.ebuild 10446 BLAKE2B 4054d064fe52ff7279b2993959232b755c6d114aaa14ef7e358ba6147672641f7791b796b703e2dd5204fc3eb5f5a3857f312e2cbdc0e234b80203b8d310fbd3 SHA512 03fbab5a2815dce75b69723fe5d42a8b56432a3208fdad515ac75429c7537d2c5434efa765be1e2b4f86893de04494b368dcf24b2135412cfd3bc2a0c3d2354b
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
index 1b2840143d98..e025c4683455 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
@@ -104,6 +104,7 @@ BDEPEND="
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index ac7d38464311..453a7f39a5a8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -104,6 +104,7 @@ BDEPEND="
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
index ac7d38464311..453a7f39a5a8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
@@ -104,6 +104,7 @@ BDEPEND="
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 033efdaf2ad3..584b7440ce90 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,20 +1,16 @@
 AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f
-AUX wine-staging-7.17-unwind.patch 1694 BLAKE2B ad8ba23e07a846152bd93e76a0b226869c8a9a28f197321b0faec3ad3721d05b892c69829d89933f245a7b6e0c8070db0e7dfef7d4b9bb047052d57f5ba7067b SHA512 80c3a1f347e7250cb1d7ab958507987b2aaeaf660c4ffb95c19118011ee61957629a9e28f2600fdafb384b61c26f50bcdaebab1fcbe30a9553c63cbed664c817
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
-DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
-DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.1.tar.xz 29083080 BLAKE2B 6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5 SHA512 3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
 DIST wine-8.2.tar.xz 29129032 BLAKE2B 831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231 SHA512 d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
-DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B e53fd47af493cbdc4542f908a39557324d70ad67ff2e06c80296c006a63518e43988750cab2f4d3d9197fc9c8a1e61ed4d96bcc310b82b6cfc8ec12b941f1c5c SHA512 c51cb18c4ae00eccf414f5edda18ebf363674ba7cfa95da135b3a43b7c012c086d454d6ac32b22d98e611bb87e55c3e1ee95571a4a0c9713028b5ac38e8aed3f
-DIST wine-staging-7.22.tar.gz 9528424 BLAKE2B e41f24f924117259715505f4f9998ef23a657bca5b0e285feb7f9fd732e6b566a495f48ec59af09b1d4d51db522b051028f6cbba748256e939929fbf978f0e44 SHA512 5fdac19ec290c67767fac71abe07d9350ec431919c67a0f2d2df18ced20f1d3dddb921b3d5586d03add187c6281e1a691cc220e8d2d5ad4eeb94015721479d65
+DIST wine-8.3.tar.xz 28983532 BLAKE2B b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287 SHA512 9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203 SHA512 76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.1.tar.gz 9527176 BLAKE2B 363243a4a04bc767099b74f3b7613463d99da82996c176e68b9233cbf51c87ecd143840f7729a3edc31ac004b771b89ec3d57a0276b26e30d475feb273d09257 SHA512 c5c3111b27de7d3bf1d7a3a53f33e8d78c5006f22ff0361f77392455fa69b0afd7c58406515ace04b2df7e1dfb20e3adf9d874e5e8be09c9032c1c1aa31fe696
 DIST wine-staging-8.2.tar.gz 9528476 BLAKE2B e6fb4d15e9b94c9196c1f472ac50fbd3eabe34ef4a54493ca11b702448c4039c5a4f13fb1119a88477924e204c6e1972b1b25efe742118beec01f71a9d879aa2 SHA512 24bbfb6d03ca8282de058019cbbee57b36f8fdcf3e485f2ca94dbcf50614cf6c80e31103196d11fe48c77953d59a741ae2baf6987e56a88bea038ed16b692ad9
-EBUILD wine-staging-7.19.ebuild 11179 BLAKE2B 58982c661d242e8e165d7b1d7083284eedd8cdee1a3aee6ee4a728b2e585772ccd8c93c06b490389dd566a54046cfdf7a092bdd2af3b31c68d60eb1926fe8364 SHA512 5047a1cfdb3480cc9654ea8d879bfbb2779d956dec6776f74f746577b62fa6a3ae6996895bd5acb9948fb74cac3be8eaddda0458abc131a96a83cfbea6452f53
-EBUILD wine-staging-7.22.ebuild 11281 BLAKE2B f8be09ce1670d897fcc72d92e816140be8507d92c70a2fe58fbd224e522a74749ef158173f54f09025488a0d5b1a572112410e9774eafc5f684cb8c1b567c9c5 SHA512 58acbe4ddf7045a991f156fb8d70c89fc83e8cb3733884154f263078671e02f6cdf961cdc953709e8da818ab92f8830a5a065acfd17b4f21316b004be0ca112c
-EBUILD wine-staging-8.0.ebuild 11313 BLAKE2B 8e6e5eeee1e58aa9da6f0424bf588d89d90434369dbb17511dfd44498a159de206b984b8af884e26cbfc5dfbf331090887c505d0e0f7e2bed1dfb8dfa78a951b SHA512 1b5c5e9bf2c799c80652629d4108d9b11d018515e7fc4b336ca3281e15e0061a1c2316106d239872d5f77c2fe640e4e5b5be1f54f42f66f917c356b934ee7ce1
-EBUILD wine-staging-8.1.ebuild 11286 BLAKE2B bc764057d81f5fa4924413e191a85684f0f730fcd95dad32c62d495351dec5432ab15c8b2e37af4b457bcb37e45272c5860c82762af33a5ce8eb3bc67aca6304 SHA512 f306d4563077d9fc8d919f757508619292fcc31613a73a7b22de4bf586cf39b17cad2fdafc5e99fee1b7b2e670e08480c6ad38dc153468e7937c5681ca6c7380
-EBUILD wine-staging-8.2.ebuild 11320 BLAKE2B 4ac49b9ccf438d22044c143faeddd34d247a0886bfe787c29f36487c344573ed59693b4d36bcf52e8cc11d884202fbba75a578be44acd489fea8b7d826c112ea SHA512 26286b081bcf3da5db060ba0885db0032039a4d486307822319091adba8b12e2fe76afd148678cff60846f644e24cd4fd7fd80873c333f8467b779b056987e67
-EBUILD wine-staging-9999.ebuild 11418 BLAKE2B 6004f2b458c5580a40b08c796b2cbae6c3df0c031aeb22e05e912c26a5a9970e52249227f07ee11450179e4afea8fb15a1622c0f9759669ab3fe1e694b9aed1a SHA512 176be7d38572304ec39c2467e33ec1e512af844ce3fb63515e3a236eb5cbde64db08b7395d2f4865498c213dce6924ee09687c97b2475a59bca479ef76875eb7
+DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b SHA512 e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
+EBUILD wine-staging-8.0.ebuild 11357 BLAKE2B 132574cde456a99c87032e26e8b6eee076d8398614ef2251c0567768feda986390c76297fe61ad276e233a5cfed5f60c5f19add76e4bfe9be30dd49c07126f52 SHA512 060331d76d713e3e597eae04d35d4a0d63f45e7524e524847eaba4ab10aa5420db463e772fb5ab6cfcb6d22f4ddb5ebcd94dce13e8b0f3a05d28d91a53a668b2
+EBUILD wine-staging-8.1.ebuild 11330 BLAKE2B e375d0cd8af340054f654317942d280c25e6f48e5e6201b149aed8e1932f75fc40e9055c4639dc7aeaa14529966f1cc1dfa60993e4d0b30c0d8da1a15da25197 SHA512 d448682c8d33323250a476dd6703925f1314af711e294caf1cd8b2a282529a71819e9851ecc2ee2d29019cdcb21d6f8a910c0c686651934e4d37e6ca700b3c6e
+EBUILD wine-staging-8.2.ebuild 11364 BLAKE2B 81b62c6ffaf8afe36d911ddb7a8aec793f06b424f8502051b3a260d25ef9c62947b715feb002c69dd55a7e77ac45d455bc39fca331592a6fc25beebe60182f0b SHA512 e5de9f312e8a63687e2eb529dd07e2f6248f6cf9ae00b90595bc5b704497236c634e19aebdda4a24f3f76a7fce788c0c488e3591804232a86984c7bb9ab7b4e3
+EBUILD wine-staging-8.3.ebuild 11462 BLAKE2B e4c5950895f5eb4b65e7ad2d5de3e696286beca26186066bc254f6eaf9ac22abae3aeb991e7b705eea56579fad6d69b4297dc56874833764db416dda83c3c21e SHA512 b340c356e1c74c4ae1b57029231517b868f19c249b6584d24339cc5579b4799c2ebca6c715e2da7919bb39c25c402b18d59bbdf0cfc0726ecd9b1ef5417cae4a
+EBUILD wine-staging-9999.ebuild 11462 BLAKE2B e4c5950895f5eb4b65e7ad2d5de3e696286beca26186066bc254f6eaf9ac22abae3aeb991e7b705eea56579fad6d69b4297dc56874833764db416dda83c3c21e SHA512 b340c356e1c74c4ae1b57029231517b868f19c249b6584d24339cc5579b4799c2ebca6c715e2da7919bb39c25c402b18d59bbdf0cfc0726ecd9b1ef5417cae4a
 MISC metadata.xml 2301 BLAKE2B 9b65253f5a19d8aafc6c9ccd361a0b8cdd14a600ddd51bf163603c7400b2c39bf147f7fe671e3aba68ff8f8f2874eec0b64dd73afe4dabad3667cd23ca99aee0 SHA512 885f7c8e2239733193d16b32bb29a21285ff732092ae0c095056ee311bdf9b7135200a29ede5958d668acf9777640f139ffc5ffe43b1455356ce4bc897621401
diff --git a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch b/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch
deleted file mode 100644
index 52512ca82968..000000000000
--- a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix build with llvm-libunwind, and also fix for non-llvm libunwind
-when using clang+bfd given clang doesn't have _Unwind_Find_FDE in
-its rtlib and expects it from llvm-libunwind.
-
-The _CONFIG_H_ check is for <llvm-libunwind-15 (adds _VERSION).
---- a/dlls/ntdll/unix/signal_x86_64.c
-+++ b/dlls/ntdll/unix/signal_x86_64.c
-@@ -734,7 +734,9 @@
-     unsigned int cie_offset;
- };
- 
-+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__)
- extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
-+#endif
- 
- static unsigned char dwarf_get_u1( const unsigned char **p )
- {
-@@ -1456,7 +1458,7 @@
-     unw_proc_info_t info;
-     int rc;
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__)
-     rc = unw_getcontext( &unw_context );
-     if (rc == UNW_ESUCCESS)
-         rc = unw_init_local( &cursor, &unw_context );
-@@ -1579,11 +1581,13 @@
- NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context )
- {
-     struct dwarf_eh_bases bases;
-+#if defined(_LIBUNWIND_VERSION) || defined(____LIBUNWIND_CONFIG_H__) || !defined(__clang__)
-     const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases );
- 
-     if (fde)
-         return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde,
-                                      &bases, &dispatch->LanguageHandler, &dispatch->HandlerData );
-+#endif
- #ifdef HAVE_LIBUNWIND
-     return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context,
-                                      &dispatch->LanguageHandler, &dispatch->HandlerData );
diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild b/app-emulation/wine-staging/wine-staging-7.19.ebuild
deleted file mode 100644
index 649285646ebc..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.19.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.3.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/wine-${PV}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
-	opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
-	selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
-	+xcomposite xinerama"
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? ( games-emulation/dosbox )
-	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
-	nls? ( sys-devel/gettext )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.17-unwind.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-		EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-		EGIT_CHECKOUT_DIR=${S}
-		einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	local staging=(
-		./patchinstall.sh DESTDIR="${S}"
-		--all
-		--backend=eapply
-		--no-autoconf
-		-W winemenubuilder-Desktop_Icon_Path #652176
-		${MY_WINE_STAGING_CONF}
-	)
-
-	# source patcher in a subshell so can use eapply as a backend
-	ebegin "Running ${staging[*]}"
-	( cd ../${P}/patches && . "${staging[@]}" )
-	eend ${?} || die "Failed to apply the patchset"
-
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
-	)
-
-	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
-	filter-lto # build failure
-	use mingw || filter-flags -fno-plt # build failure
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-	# https://github.com/gentoo/gentoo/pull/28355
-	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-		append-ldflags -fuse-ld=bfd
-
-	# build using upstream's way (--with-wine64)
-	# order matters: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		# CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
-		if (( bits == 64 )); then
-			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
-		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
-		if use mingw; then
-			: "${CROSSCFLAGS:=$(
-				filter-flags '-fstack-clash-protection' #758914
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
-			: "${CROSSLDFLAGS:=$(
-				filter-flags '-fuse-ld=*'
-				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{CC,{C,LD}FLAGS}
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
-	if use abi_x86_64 && use !abi_x86_32; then
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	# don't let portage try to strip PE files with the wrong
-	# strip executable and instead handle it here (saves ~120MB)
-	if use mingw; then
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-		use debug ||
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index b23645292240..6d0fce43bdc4 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-staging/wine-staging-8.1.ebuild b/app-emulation/wine-staging/wine-staging-8.1.ebuild
index 887f0e540454..4c27aba38ee4 100644
--- a/app-emulation/wine-staging/wine-staging-8.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.1.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-staging/wine-staging-8.2.ebuild b/app-emulation/wine-staging/wine-staging-8.2.ebuild
index 3c2601e3bcf8..9457d9533997 100644
--- a/app-emulation/wine-staging/wine-staging-8.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.2.ebuild
@@ -132,6 +132,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
diff --git a/app-emulation/wine-staging/wine-staging-7.22.ebuild b/app-emulation/wine-staging/wine-staging-8.3.ebuild
index 6e64e8c69828..bcdbcf4db2b8 100644
--- a/app-emulation/wine-staging/wine-staging-7.22.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.3
 WINE_MONO=7.4.0
@@ -30,8 +32,8 @@ SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
 	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+	+gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
 	+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
 REQUIRED_USE="
 	X? ( truetype )
@@ -61,7 +63,6 @@ WINE_DLOPEN_DEPEND="
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
@@ -86,6 +87,7 @@ WINE_COMMON_DEPEND="
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
@@ -110,7 +112,16 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )"
+# gitapply.sh prefers git but can fallback to patch+extras
 BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
 	dev-lang/perl
 	sys-devel/binutils
 	sys-devel/bison
@@ -122,6 +133,8 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
@@ -164,19 +177,14 @@ src_unpack() {
 }
 
 src_prepare() {
-	local staging=(
-		./patchinstall.sh DESTDIR="${S}"
+	local patchinstallargs=(
 		--all
-		--backend=eapply
 		--no-autoconf
 		-W winemenubuilder-Desktop_Icon_Path #652176
 		${MY_WINE_STAGING_CONF}
 	)
 
-	# source patcher in a subshell so can use eapply as a backend
-	ebegin "Running ${staging[*]}"
-	( cd ../${P}/patches && . "${staging[@]}" )
-	eend ${?} || die "Failed to apply the patchset"
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
 
 	# sanity check, bumping these has a history of oversights
 	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
@@ -230,6 +238,7 @@ src_configure() {
 		$(use_with pulseaudio pulse)
 		$(use_with scanner sane)
 		$(use_with sdl)
+		$(use_with smartcard pcsclite)
 		$(use_with ssl gnutls)
 		$(use_with truetype freetype)
 		$(use_with udev)
@@ -240,7 +249,6 @@ src_configure() {
 		$(use_with vulkan)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
 	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index b7b0d4577f20..bcdbcf4db2b8 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -133,6 +133,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index b80fed966616..8b0c22e39944 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,16 +2,14 @@ AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f
 AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae
 AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156
 DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
-DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
-DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.1.tar.xz 29083080 BLAKE2B 6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5 SHA512 3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
 DIST wine-8.2.tar.xz 29129032 BLAKE2B 831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231 SHA512 d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
-EBUILD wine-vanilla-7.0.1.ebuild 10398 BLAKE2B 2325de4a59845efc0f10c7844f8a75494ed8d8cce7044bd1ac8047e0d84f72ff996cdac6f704e9b8b4577bd9d08c21da98a6a52cc13868ff80d833a0f8d2ed03 SHA512 256b737f5feffb260c625c4f06997576b38963f2e2a9ced73173a2973937cb097811556e42c7efcbbe58dd7b7244716193ca36fc9e13f1fe65846446691579e4
-EBUILD wine-vanilla-7.19.ebuild 10315 BLAKE2B 247a6f527c4751f59405dbc16a2d1da00c15d714ce730e2f05226f860867da63915a8d6b09b5dfddbec2b1cb5559eb406d9630a3941eba968307e2d1c7e08584 SHA512 f94993a24382d5e9263459fd2f35944b0d0ec0f8ccfdb18ac961b2a51bfe70d87c9d2542bb5db9339d3d3dcda308a29fba4a6cb8b9feb43083fcb12b3d04dbc5
-EBUILD wine-vanilla-7.22.ebuild 10418 BLAKE2B 67a75c5abd4d286f925993f3ff39dbb0eaabb80bb9ac4a5f8ac2f3264bd09e6461e8ae22cdceb7b0a338b0785dc36acc2f635328fea1ed554bf9d184265854c8 SHA512 8fabf1e573c35dbfc2766e78f5f012c659528e75188c680b55e73b90a44aedb366285f632e332d1d48c0788584c882663a00f3663273ac784d5b3f4292a02391
-EBUILD wine-vanilla-8.0.ebuild 10421 BLAKE2B 1ef8909cd9b818577725309f101e0791ac94167c526d8df9c7c4b3bb29cb4e2a2be9b29ca893b67614b17813ffdceb2b082177456d80afe8d516d77c87de4edb SHA512 c0065784f9f360ed8a91814a0b82db810b373cb0b40c3af896ae88c3e317cde3942482a8a016f6e11dd010313b3011c5eca8810f1551c608bed9868530d4f23d
-EBUILD wine-vanilla-8.1.ebuild 10423 BLAKE2B 432f66156816f8c09a753d40d8f975d992c1af77a38029eb0aa3f9d1cf9840522cf0377486bbf4b0668f0bdb5a65f8a5482d916ac289d0f54a4ba21b9b1e1f48 SHA512 b411f521ae7d22ff00a0dd267cdd35e170ed1a2dc729d4d2451134330b8cb858fc331bb1c8999ac1c0d76e2367bcc03d5f91e899c7b7fc21ffb51368adcb6787
-EBUILD wine-vanilla-8.2.ebuild 10423 BLAKE2B 432f66156816f8c09a753d40d8f975d992c1af77a38029eb0aa3f9d1cf9840522cf0377486bbf4b0668f0bdb5a65f8a5482d916ac289d0f54a4ba21b9b1e1f48 SHA512 b411f521ae7d22ff00a0dd267cdd35e170ed1a2dc729d4d2451134330b8cb858fc331bb1c8999ac1c0d76e2367bcc03d5f91e899c7b7fc21ffb51368adcb6787
-EBUILD wine-vanilla-9999.ebuild 10521 BLAKE2B 31735a83a1133de7e1dc9a93275b69c15c84c4b45256debdfccdea9f8f76201d631d79be6d17f09cd90e922d509788439d55e989ed796c96aeb2342ef1db3fa0 SHA512 fd3b86f868725e733c1b33080bbd488897f1bb1503f581039820d6d06dfd521ea8e7254e82ba629e138fab83c7f248cbb32d33f18f99e60f32ff830b0620ef72
+DIST wine-8.3.tar.xz 28983532 BLAKE2B b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287 SHA512 9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
+EBUILD wine-vanilla-7.0.1.ebuild 10447 BLAKE2B 0b56e6e0745aeab8efa6628cc4389e0788276f7fcaab4ab97a37f69c8e95fc9249ebc5a0dc8b530fadd5b1db137cb35345cc484bc8ffed6b6465bda2b888a603 SHA512 dbc105ef0c6df1d0532ec597301ac2757acf40e140cc429d1f0e5975b803e98c8c1757185b299a427c123039477c8d8407295eb2dd742bb2ad09dea8cbf2cd35
+EBUILD wine-vanilla-8.0.ebuild 10465 BLAKE2B 4d72cc1848e971cc6f4c90807249e04304ea527599eb0caf0d59a252e873c3b926932c9d573d5c372dae96ef68ffb01ce63bfe5e2bca9c17cb865ce53ed4051f SHA512 757aec10adcb2b478da3fbb60617a8b2581773d5f89498ae617ad1db1ef98797753c5138b384fa4a7cc58ff4859702c70c2c3a68364722732d9955193a14009d
+EBUILD wine-vanilla-8.1.ebuild 10467 BLAKE2B 09a868668d2486b29ace0d71fe3923ca6c0af4b62f11c76fa0faac185f0278b1a9b24a09dbd20bc81149fe53d7d328de066644379e329b15fb657fbe3732263d SHA512 af4623012a0ce22dbe0d4a4360f5898d4e5cf88b0f69bfb3deebcb0e33834d3f0da8e9fdcc83c9f586d06731ae59dc5730fb4189bd64271aad63594885e1686e
+EBUILD wine-vanilla-8.2.ebuild 10467 BLAKE2B 09a868668d2486b29ace0d71fe3923ca6c0af4b62f11c76fa0faac185f0278b1a9b24a09dbd20bc81149fe53d7d328de066644379e329b15fb657fbe3732263d SHA512 af4623012a0ce22dbe0d4a4360f5898d4e5cf88b0f69bfb3deebcb0e33834d3f0da8e9fdcc83c9f586d06731ae59dc5730fb4189bd64271aad63594885e1686e
+EBUILD wine-vanilla-8.3.ebuild 10565 BLAKE2B 5fc8e983d69a321ebf594b4b63de0884999e2f685e0dfbb45cfb8015a19e66112a7c73e5f04b09424ba917857d5ba18115e0451c07738f271de5b1c883b29a48 SHA512 d2945a0a30c0a889e2b3f389a8ca1d30e5f8f8053ae9177996553e260d5bc9ae8c5bd4c1eba1a5d780dc362a17104484a86e3b91000788cd29baf1122f9ca4c5
+EBUILD wine-vanilla-9999.ebuild 10565 BLAKE2B 5fc8e983d69a321ebf594b4b63de0884999e2f685e0dfbb45cfb8015a19e66112a7c73e5f04b09424ba917857d5ba18115e0451c07738f271de5b1c883b29a48 SHA512 d2945a0a30c0a889e2b3f389a8ca1d30e5f8f8053ae9177996553e260d5bc9ae8c5bd4c1eba1a5d780dc362a17104484a86e3b91000788cd29baf1122f9ca4c5
 MISC metadata.xml 2376 BLAKE2B c37d5b769ce6ea0fd6ac0cde1084a332e34c13d31633d5c60970f89a932f621c0332b97b0667bbc42098a01c979919ac9d8d30487f2ad6691259270641b85485 SHA512 2968f0df88d5d95c0c649ae15cbc9088061c915046b2014448dad782a4abfa8cb173b6ec8ac15575329e5ce882342dfd1f5076a0ea8a2e89800fdc9628dc05f9
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index e17d6a292d1b..5be8047387f9 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -123,6 +123,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
deleted file mode 100644
index 5619b8ebd018..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.3.0
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
-	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
-	S="${WORKDIR}/wine-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="
-	https://www.winehq.org/
-	https://gitlab.winehq.org/wine/wine/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
-	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
-	+gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
-	opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
-	selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
-	+xcomposite xinerama"
-REQUIRED_USE="
-	X? ( truetype )
-	crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		opengl? (
-			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-		)
-		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
-		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
-	)
-	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	dos? ( games-emulation/dosbox )
-	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
-	mono? ( app-emulation/wine-mono:${WINE_MONO} )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-LibXML
-	)
-	samba? ( net-fs/samba[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/binutils
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
-	nls? ( sys-devel/gettext )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
-	"${FILESDIR}"/${PN}-7.0-unwind.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local mingw=-w64-mingw32
-		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
-			if ! type -P ${mingw}-gcc >/dev/null; then
-				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
-				eerror "yourself by installing sys-devel/crossdev then running:"
-				eerror
-				eerror "    crossdev --target ${mingw}"
-				eerror
-				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
-				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# sanity check, bumping these has a history of oversights
-	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
-		dlls/appwiz.cpl/addons.c || die)
-	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
-		local gmfatal=
-		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
-		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
-	fi
-
-	default
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# always update for patches (including user's wrt #432348)
-	eautoreconf
-	tools/make_requests || die # perl
-}
-
-src_configure() {
-	WINE_PREFIX=/usr/lib/${P}
-	WINE_DATADIR=/usr/share/${P}
-
-	local conf=(
-		--prefix="${EPREFIX}"${WINE_PREFIX}
-		--datadir="${EPREFIX}"${WINE_DATADIR}
-		--includedir="${EPREFIX}"/usr/include/${P}
-		--libdir="${EPREFIX}"${WINE_PREFIX}
-		--mandir="${EPREFIX}"${WINE_DATADIR}/man
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		--disable-tests
-		$(use_with X x)
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with cups)
-		$(use_with fontconfig)
-		$(use_with gphoto2 gphoto)
-		$(use_with gstreamer)
-		$(use_with kerberos gssapi)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		$(use_with mingw)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pcap)
-		$(use_with pulseaudio pulse)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_with ssl gnutls)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vulkan)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(usev !odbc ac_cv_lib_soname_odbc=)
-	)
-
-	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
-	filter-lto # build failure
-	use mingw || filter-flags -fno-plt # build failure
-	use custom-cflags || strip-flags # can break in obscure ways at runtime
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
-	# https://github.com/gentoo/gentoo/pull/28355
-	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
-		append-ldflags -fuse-ld=bfd
-
-	# build using upstream's way (--with-wine64)
-	# order matters: configure+compile 64->32, install 32->64
-	local -i bits
-	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
-	(
-		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
-		mkdir ../build${bits} || die
-		cd ../build${bits} || die
-
-		# CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
-		if (( bits == 64 )); then
-			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
-			conf+=( --enable-win64 )
-		elif use amd64; then
-			conf+=(
-				$(usev abi_x86_64 --with-wine64=../build64)
-				TARGETFLAGS=-m32 # for widl
-			)
-			# _setup is optional, but use over Wine's auto-detect (+#472038)
-			multilib_toolchain_setup x86
-		fi
-		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
-		# use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
-		if use mingw; then
-			: "${CROSSCFLAGS:=$(
-				filter-flags '-fstack-clash-protection' #758914
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-mfunction-return=thunk*' #878849
-				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
-			: "${CROSSLDFLAGS:=$(
-				filter-flags '-fuse-ld=*'
-				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
-			export CROSS{CC,{C,LD}FLAGS}
-		fi
-
-		ECONF_SOURCE=${S} econf "${conf[@]}"
-	)
-	done
-}
-
-src_compile() {
-	use abi_x86_64 && emake -C ../build64 # do first
-	use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
-	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
-	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
-	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
-	if use abi_x86_64 && use !abi_x86_32; then
-		dosym wine64 ${WINE_PREFIX}/bin/wine
-		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
-		local man
-		for man in ../build64/loader/wine.*man; do
-			: "${man##*/wine}"
-			: "${_%.*}"
-			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
-			newins ${man} wine.1
-		done
-	fi
-
-	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
-		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
-	# create variant wrappers for eselect-wine
-	local bin
-	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
-		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
-	done
-
-	# don't let portage try to strip PE files with the wrong
-	# strip executable and instead handle it here (saves ~120MB)
-	if use mingw; then
-		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-		use debug ||
-			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
-	fi
-
-	dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
index d9b6ce69a9ec..441555bec6ca 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild
index 1aa7a660b98a..a394c2c5bfba 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild
index 1aa7a660b98a..a394c2c5bfba 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.3.ebuild
index 02df0a4439ca..8aa9498430bc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
 	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
 	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
-	osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
 	+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
 REQUIRED_USE="
 	X? ( truetype )
@@ -85,6 +85,7 @@ WINE_COMMON_DEPEND="
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	unwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
@@ -121,6 +122,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
@@ -200,6 +202,7 @@ src_configure() {
 		$(use_with pulseaudio pulse)
 		$(use_with scanner sane)
 		$(use_with sdl)
+		$(use_with smartcard pcsclite)
 		$(use_with ssl gnutls)
 		$(use_with truetype freetype)
 		$(use_with udev)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 5e06e2fc960f..8aa9498430bc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 0d8ec49e2d7f..b02be2315083 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-timezone/Manifest b/app-eselect/eselect-timezone/Manifest
index fcb3194aa5a8..027981adcc7a 100644
--- a/app-eselect/eselect-timezone/Manifest
+++ b/app-eselect/eselect-timezone/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-timezone-0.2.tar.xz 1400 BLAKE2B 22d19159629dda57f7372ae31283693d5993c17096c1f0057060ecbb731274bb856c292b0b1dd91751f17a0226502ddf942bafa0c2fdc544d1ed1480cc8193c9 SHA512 757dc88b94fde547af2026c0759c9109f803f7144e843be9d79e9eef0bcbe8f2273a5585448dc1d810d89f4f4be7f6d8974e7dc35f6dc8069f8090775bdf8b52
 EBUILD eselect-timezone-0.2.ebuild 422 BLAKE2B 30503512de7f1a5a742fc45e86498905b48e0ffa27fa1e7fc9c4b4a96dd33daeeda7f3236a7c993759afde3437c4093c90e50d8074ca3983824ddcfc5a638b66 SHA512 439afc9830bb742f87568be887dc8df791313cd2c567e63ab646413938c0565b8112dd9e1a1c52ddf50d340ccb7a9d3316ccd99bd9103c346fbcfab445aebcc7
-MISC metadata.xml 278 BLAKE2B 216472b9c8995b42715f0372655cc4b51ddb5a1e660879da7f697a6be1e8b2087710c4c390acdad7205acf35cb8483340bbf91af944f7f2178d92f618ecb2272 SHA512 15b206b99440e435e8f8c7efbf5b4337d95aba4e61452c8b678d9b40f6c672bf01d60b8adc309c5eae356a5c169a1a299126607db87c2c7046cc4f5b9b0c0a69
+MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/app-eselect/eselect-timezone/metadata.xml b/app-eselect/eselect-timezone/metadata.xml
index a2e015de1f8f..c3bda71eefca 100644
--- a/app-eselect/eselect-timezone/metadata.xml
+++ b/app-eselect/eselect-timezone/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 073a5011b147..1efce5c441fd 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 4632c4d1a2eb..59f5ce5ca43b 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-libpinyin-1.12.1.tar.gz 1766803 BLAKE2B 1de8a51b52688dede32c572b39bd379296480ab2b0f909357465370e346bdf50f4cade5ab3f105f62a74e59cf2dc5e8d5235aedde7571b70d3c5dcee86d2e36b SHA512 ad6e7507bdb468d506071135449383e5bd4fc878bcffda4be6e4e7915b79dbaf919d2fa941b92b177dc7790bd895eaa9a6d04a2610f85e1e80e8eb50f188211d
-DIST ibus-libpinyin-1.13.0.tar.gz 1726869 BLAKE2B f18ae81edb4ebf18f569fc13f3088f32e57c6a4512f7cafb33a18fdb08d5fdcdb17ff1861c3419db3063808f655510f6f4de63c274d798c48731ac4632203ba6 SHA512 8eca89c3c71ada37ec93307556fc476ad8719e58ca828f684dff6e74e1cb91df3e8c8ce03c87dbb72d5b7213e7c7ca367da8cf6b1dddb47d63afdf23d53bc54c
+AUX ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch 1244 BLAKE2B 79dbfb0b5803277a47c444955277fd55ccaf575cdbd5f648a0d8e389cfe5841494b5b1842132c1921578c4f70df831ab8d01dc8265d57fe595247087d6ed6d3a SHA512 be17fe4e1b92a45cd101e633079feba729330bc8324acc2aa01c5272d2d1ef730d1110a0b839411549f813970ed9fb8b41b3f74a9c0374358ab3f0fafa4e044c
 DIST ibus-libpinyin-1.13.1.tar.gz 1726900 BLAKE2B 2540b5ca6657fe421f6f2986f32fba1b8840cafcc37b3ec5402705cb0edc0aac6b12d972b5da0326339a04c875dbd8f8cce902f613558f3f9d21b4a0cace31a3 SHA512 ee3a8c95e091992acb0558ff297743eb49bd8c73fbb9cd1f2b56db75137573dda2c677b1b25eb213fbd8779be004b06f95cded04273d7a469cf49f45cc27813a
-EBUILD ibus-libpinyin-1.12.1.ebuild 1454 BLAKE2B 426062753878441dc93d537bbf19d416808a7bb31d40391dafdd7b713b44aac3340e524e353290ffda720929d9fdc95d795512676b76960fa3e8b72152021227 SHA512 220874c802cafab084ce2456542d3a5bda85f3183c851207c89a49f0a9191ba5184f2277c321cc99095b222a3ef8a893e215cc795bd94970aec7aa5b835f7057
-EBUILD ibus-libpinyin-1.13.0.ebuild 1456 BLAKE2B 2f2b71d7133fa8c511fb50460fced76c721b50e5236ae99039e21581c40bef0f378ca8a7c6bf10950447db3d4e8160dbc223f210f211431bea3c675b81961699 SHA512 9d8bdab3529ef257390f29c04806cc896705e0514ff898e3bbe26768001aa60e2565c7fdb07cf64b658f6e0722cc9b1dc2ed7c3a1c1fe3310538727943928972
-EBUILD ibus-libpinyin-1.13.1.ebuild 1454 BLAKE2B 426062753878441dc93d537bbf19d416808a7bb31d40391dafdd7b713b44aac3340e524e353290ffda720929d9fdc95d795512676b76960fa3e8b72152021227 SHA512 220874c802cafab084ce2456542d3a5bda85f3183c851207c89a49f0a9191ba5184f2277c321cc99095b222a3ef8a893e215cc795bd94970aec7aa5b835f7057
+EBUILD ibus-libpinyin-1.13.1-r1.ebuild 1517 BLAKE2B c68bd6ed8192519e20d0c9ff3d05799f0ae0fab1803661d2e5f8d8a963beb7564cfae3e92ff1a0a56a001bf681f4fa43076103500eb07adcbc0bea5b2c6842b9 SHA512 eb25c499e570a37b997c6fe3084f456dd86f3cb4f716a08b937a0a8b10bf1202b1d3bfbe7079318bb62e02106c7bc0ece19064f7d14fd7905217dd087c72579f
+EBUILD ibus-libpinyin-1.13.1.ebuild 1454 BLAKE2B 0c639322d06f32c51b3c8432016ec9c7fd4191eb5ac4b45253e47b94cec659cf1fc6fe1c548b4f065e2f12d864a8d26b0c392540f76d61d02af5424fac3136ae SHA512 81a2d5dc8f41331339a59d0780f91b1a0f2a21181d342ff5db6be7816ccd5c6543b720ad7cd8f80ab077d1dd13a2b4462d37a71ac61394b1ddbf679a88abdbbc
 MISC metadata.xml 834 BLAKE2B ac644e5ceced4364c282f0766cfc5d85dfc14fc19fff46e96dee2aa8ff48c1c5d84dd496e3f83951983f311cbab0ea84652fab3e3a87e870dab999cf46821452 SHA512 dd1629baeddeb1ee4ab1670a4e29af865a75e40b7c6b58e9029af5900d5de9bfb98f71ccaf7eae508f0849ac85f4530d8770cc392d9bb8c31a881f8154ac5761
diff --git a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
new file mode 100644
index 000000000000..e3f001d42002
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
@@ -0,0 +1,43 @@
+Fix quotes for compatibilty with sqlite3.41+
+https://bugs.gentoo.org/898478
+
+From b7f58280a3f1e20e01471fa53509007c0e96ad02 Mon Sep 17 00:00:00 2001
+From: graham <graham@ulsterit.com>
+Date: Sat, 4 Mar 2023 15:55:03 +0000
+Subject: [PATCH] change double quotes to single quotes to meet SQL standard
+ for strings, compatible with sqlite 3.41
+
+---
+ data/english.awk | 2 +-
+ data/table.awk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/english.awk b/data/english.awk
+index c5dc0aa..bed156d 100644
+--- a/data/english.awk
++++ b/data/english.awk
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+ 
+     # Insert data into english table
+-    {   printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2}
++    {   printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2}
+ 
+     #quit sqlite3
+ END {
+diff --git a/data/table.awk b/data/table.awk
+index 700529c..c097ec2 100644
+--- a/data/table.awk
++++ b/data/table.awk
+@@ -21,7 +21,7 @@ BEGIN {
+ 
+ # Insert data into phrases table
+ NF == 4 {
+-    printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1;
++    printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1;
+     id++;
+ }
+ 
+-- 
+2.39.2
+
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
deleted file mode 100644
index b7af5906e50e..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2015-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools gnome2-utils lua-single python-single-r1
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="dev-db/sqlite:3
-	virtual/pkgconfig"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-i18n/libpinyin-2.2.1:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	virtual/libintl
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	boost? ( dev-libs/boost:= )
-	lua? ( ${LUA_DEPS} )
-	opencc? ( app-i18n/opencc:= )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/^appdatadir/s:/appdata:/metainfo:" \
-		data/Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
index f2661fb08430..c61330975867 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools gnome2-utils lua-single python-single-r1
 
@@ -36,6 +36,10 @@ DEPEND="${PYTHON_DEPS}
 
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}_sqlite3.41_fix_quotes.patch
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
index b7af5906e50e..25bcb2100bd1 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools gnome2-utils lua-single python-single-r1
 
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 782eb2cfc2c6..695664833b0e 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index 9ae181029249..26e3253d97be 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -3,4 +3,4 @@ AUX hdapsd.init-20141024 2177 BLAKE2B c790b9899ca67ecee13a3af54dc821020f551ec35e
 DIST hdapsd-20141203.tar.gz 128818 BLAKE2B 0219e30e032032dfd729e97f526eb7402fe4cb72245589ef03cca28f75a6e1f2cbfa55c5aa5599b24f496bbe662467077415fbec47caa1db17d6108e07292daa SHA512 19c1a8b362f15864b71f4fb221c0993b43b3b2d965d5826af06fb9f6b0e345e5da99181493e13e230c7fe77060ae5b373027e8ec90a511566a6ccaef43998178
 EBUILD hdapsd-20141203-r2.ebuild 2183 BLAKE2B ebbebdd87b20ed6a4681d1b270ba69b462da528e0e7c5e553c7cda28c8dae71744089de747f4e9e03890cb35560eb6e23a163c855a622870e25637a87c36b583 SHA512 2b154fd3c40fa8e46822ee0cd8da3b554cf579c46f572ad0a0b9873f0402a826165a49dd8bec9179a5763f31fed758c211e952134b086978ab446d1dc56870e6
 EBUILD hdapsd-20141203-r3.ebuild 2270 BLAKE2B 547503f35de8c034405f5356426ec0baa08d98366a24bb431817c25fb3fbde9b7772bca96da2f74ab344d444f537b128f6d9d79b1c705ee101ed0b5a3f79ac8b SHA512 7bba6c8fb5164f8a824d88fa2276d036ce9f23a44a9882c8aeb87f7f8bb6dc1107aa88960f9b938a338330a12f17640caf802b0d0f68b7749c27eba5af3cf68b
-MISC metadata.xml 674 BLAKE2B 4246e65437c78ef90391a087db192f713104a121baa007b2bdb23a5162bb308d07260b00738a421740a75157e761fcf80578e96ed447f2ebf00edea07f3710ab SHA512 344f3064f5f6ca9a2d6ddddd280cc1565a331bf7dfbd5d47ef12af2264d742cc430463b44ec64e22da8af9464f5423b477115dbab2a58b5a434bbf514c81c8d1
+MISC metadata.xml 554 BLAKE2B 3bb86449e6f32b9c6eb3511aa2eb2de96d144baededfcb15de99b936cde40c532bfaaa77ddd3458667b0435c28100cc7cc71138055654d94096180c81c372027 SHA512 d3c70dd395e1075a3a6fb48e5a47fc7f972a0c9e0a37664e0a039c15e080bbe8615ee36b1702ff3213ccfcab0d58834d8d390f2b9490cb77dfc71919ea153494
diff --git a/app-laptop/hdapsd/metadata.xml b/app-laptop/hdapsd/metadata.xml
index af8c4b30f832..ba8dfb8f7fb2 100644
--- a/app-laptop/hdapsd/metadata.xml
+++ b/app-laptop/hdapsd/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-  <maintainer type="person">
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
diff --git a/app-laptop/tpacpi-bat/Manifest b/app-laptop/tpacpi-bat/Manifest
index 89530e0e1d3a..0df9cfe8cee5 100644
--- a/app-laptop/tpacpi-bat/Manifest
+++ b/app-laptop/tpacpi-bat/Manifest
@@ -3,4 +3,4 @@ AUX tpacpi-bat.initd.2 1488 BLAKE2B 43e196ae490ba367edc15b1b9a0ef81cc7f56fec33b7
 DIST tpacpi-bat-3.1.tar.gz 18584 BLAKE2B 5f1e890f33be4e0d176bda486d9e4363d56a7a933677eb69bedca9ec42e8af5a0e5494f8447702d33ffecda3d1d4a447a56f7aeb9480a3b855a24bce45028d38 SHA512 cdc9e0c0ded96281678199783b4c48ff85a497c90b244a7ce2276b54d7ae4bfa7eb430214bcdb6fabd7478796507b0fbe7fed4b1ab4bc4cdd7bd5ae25f943a77
 EBUILD tpacpi-bat-3.1-r1.ebuild 799 BLAKE2B 207ea4cf6217813ffee525eea23e3feb69d44be9c213ff346b6e94093338f61c2a1ce7bb9b6861258db41ceba1fcdea6a6814e598aad3d21d990f0b3e5e2648a SHA512 7e0b987d48d54633a7f0cbe667a1a3d08cde0814fe87e346dd531acc19ecfe8ac85ea9fbdddeeb75ae046161c18e08595188dd687ceec7b437e11b3de5431a60
 EBUILD tpacpi-bat-9999.ebuild 799 BLAKE2B 207ea4cf6217813ffee525eea23e3feb69d44be9c213ff346b6e94093338f61c2a1ce7bb9b6861258db41ceba1fcdea6a6814e598aad3d21d990f0b3e5e2648a SHA512 7e0b987d48d54633a7f0cbe667a1a3d08cde0814fe87e346dd531acc19ecfe8ac85ea9fbdddeeb75ae046161c18e08595188dd687ceec7b437e11b3de5431a60
-MISC metadata.xml 339 BLAKE2B 6e26cad21d95bacf45fcf3ae51c05726a4c65549662929593054843831051a232a92d746b830816a195c12e41947d83440d610d28c570649b8881eed2f18ef24 SHA512 0703897b1761de25d6a9735e69029e99693027a5556822174266d09211efc925175c3f96e888be33e9d19733367aaa80beb13f2932ec46812b8488a2cc2ac9c2
+MISC metadata.xml 253 BLAKE2B da241fba41ebad0b9a00d384f0db9fca58e7051e3f9e99e36a018c8f91c5db4ef9e34c0e80ff403ebb012d6178ceabc84aef8419cadf5f5f63291b0769eed7e5 SHA512 42f590c07efc6b1d120305b406d2a229ca518b3d8c62aa88686035dcfeacdc184ee61ec504e602c7a02bccb7c2fb0e1d8bc00abd43646a12b766f5e853e517ec
diff --git a/app-laptop/tpacpi-bat/metadata.xml b/app-laptop/tpacpi-bat/metadata.xml
index 82c4e06c2bd5..6778091ccf54 100644
--- a/app-laptop/tpacpi-bat/metadata.xml
+++ b/app-laptop/tpacpi-bat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">teleshoes/tpacpi-bat</remote-id>
 	</upstream>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index be6222f26065..b287f51968c1 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
index 566e8e9f79f5..ea77f5c7a58f 100644
--- a/app-misc/radeontop/Manifest
+++ b/app-misc/radeontop/Manifest
@@ -1,6 +1,6 @@
 DIST radeontop-1.3.tar.gz 38138 BLAKE2B 41bc36c571a99a136f2d1c1d5ff1a06b1e99bccb6e01f7432b9867e2700afa9d2b5cab7f743d3560b2120642c98253313e0356af977805ada173cd3c2168acbc SHA512 cc54e0726b2a934d14ad591c7a199474b49885e6122399b282e9289610d26f3c55b3d68a7d655d88a0ff8de1a0ac0994e868fa06ae1198416aaf857a099181f1
 DIST radeontop-1.4.tar.gz 44602 BLAKE2B ad8893f491442c06f91c2a7bcf9cf884f066bb4fb01be019afbaa8e604ca12355647c624efa0742b15cb99e00fddbf71fa5b75f34086139acf0779c72668b354 SHA512 078087929bdbcf9b131d78f5ab0adc3d086be168d376d9f8e27a886668764263b072e0b08cb4dde593284fcdd16faa44711125c2ea5a14aaad70c8fa0f57f2b9
 EBUILD radeontop-1.3-r3.ebuild 1160 BLAKE2B ecf73b21aa0328c6de562a1396ae023addccdff599da07751801d5fad73e86feb1d812b87d6a174b12ab5e9e4e3df27a20bd73ed43c334f63b4713e801d14e7c SHA512 6714b25d073b99cfd1a46914d0e7f097142396e5f87839a46b1fe16fd3962525ba5c6855831a3795861f54bb97e73ae7e953e3e31d384dc0b8646e4a009accb5
-EBUILD radeontop-1.4.ebuild 1175 BLAKE2B 26099c0f5a8fa290f077237e58a3c2524f83e58a8f0cdf2fafd44e64b39de8de4cad06d1dfcbde037f14b6b784b2b891edc73b9f101f0fd32892d4194b5aebda SHA512 5b5e0a10d4477beaaaf030d4bf832decca0c96f6baee92223b0c977073a3c28ad86fff1bb08bc73eb1e23df20bc4079977b506af592e616e00a4be5dc10a8cf9
+EBUILD radeontop-1.4.ebuild 1182 BLAKE2B 00bf08c1c02fd10152ec9e01a974cec25265167cb8ca4a8aa4b5980d0a80be22e0978d7702b908b858681877e2bea24cd43d1d884594085f51c872f54de60633 SHA512 fec7aa49443731a1d151d3c399450f9e0a4866adc416d8b5d5bb9727e2089c1047c5f09d7022950d45899783f399b9120dd63d338fe5148eeaac6bda7b5c1d97
 EBUILD radeontop-9999.ebuild 949 BLAKE2B 0e3848df70261c48edf2ef2aeba3f849f223bf5bdac504f28b7e49ebbb441d6bd6611ff8bc71384af72d9ca0351892d731eea84636fb29be39789e6cc31598b1 SHA512 2cab73ca387a147ea575228365e8c79bf62f29c893ca8e67793d9af859828dfa8a75a377f7cc7f3d2de53243fabefecf19698440b4115017bcdbd71c63f35aa7
 MISC metadata.xml 482 BLAKE2B 6e20916b0a497603d7956ee38cb34288f561ff799e60b454fe3fc227fcb4845fe5ba1a6f02bed5a6afee67c53a38af80f7a23ccae51110afe99093f2774cb637 SHA512 4f5279922bc1c7416d61e79317f4d097d8b51ea706148ee5bc77693114e4833413c07777a4691e8da8ef2651c672b209aa36f65de55df17bad3623a3bc7d4be3
diff --git a/app-misc/radeontop/radeontop-1.4.ebuild b/app-misc/radeontop/radeontop-1.4.ebuild
index 2c1606ec6fba..6aad6527b642 100644
--- a/app-misc/radeontop/radeontop-1.4.ebuild
+++ b/app-misc/radeontop/radeontop-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
 IUSE="nls video_cards_amdgpu video_cards_radeon"
 REQUIRED_USE="
 	|| ( video_cards_amdgpu video_cards_radeon )
diff --git a/app-misc/rmlint/Manifest b/app-misc/rmlint/Manifest
index 34919333067a..f55dac7f9cf2 100644
--- a/app-misc/rmlint/Manifest
+++ b/app-misc/rmlint/Manifest
@@ -6,5 +6,5 @@ AUX rmlint-2.10.1-scons.patch 3626 BLAKE2B cc9187d2b8926eb36071462d02a60f3a4b06d
 AUX rmlint-2.10.1-skip-tests.patch 1216 BLAKE2B 8fa9727f5146a26fbd91e8e6c4f8b903e432c386ca8f97b4591bd9244940bf94aa476dfb0390c332fe8fa7e777e31890046423cd88e47181f3a8f30e3fead4be SHA512 c66812da8860a714d1ae368039f95dd86d59b3ba6164fc9141f0c1c0ab6ab7c7245dcef9785a179dc437615cd5d9e8af1a1ee60354e99c02fd3c345fd2e91608
 AUX rmlint-2.10.1-x86-fix-size.patch 1092 BLAKE2B 2cd3e7e68d5252c89b84d1d78a17520e6c5f7b61f5d9bfc05bd25ea96b9057bb195c7afc6e61a8bac121ae749b5f84d28dc032be2d92bd6f5a2ab04f5b3cae9d SHA512 78a41f52aa1af9f9d63227b9a2100cf87806a442f07d153e83ccedf7110a14e4c7fec8c9a4fdf21284301927895a62eedaf666cbfe90092eb4ac41e68bf34c6e
 DIST rmlint-2.10.1.tar.gz 2494474 BLAKE2B 40219ff64d54f0e2fc66a958c6ca51520152f77f9038e9756ab601da5180502528be7b2d750c85b5991c31db96c3eb7415841084b6c90db103dc212947864034 SHA512 a1281359798816dadaf3a1e706e671dc63edf8f7d176c114a924a1e03fc9ad6fa54d10de701b09b5e364a9a815e0d11bdbef3d16fb7fec74eb85af20a106db1a
-EBUILD rmlint-2.10.1-r1.ebuild 3075 BLAKE2B 534f4634a94ddaf2cc4c3aef6d663c0215b7725bd448dcf8c8ed657cd3b2cf56919794b69211024b0218b433dae989ee9bd3c181cd90044e20c69873099d928c SHA512 7bd5d1a72e4b17b086d30e6cf62a460f08f417feb761bdc9541a82382fcce5076ebd5c22a945b00215b80193e649dc1ccfaaebd60c1c39cbd3023dfcb07b3198
+EBUILD rmlint-2.10.1-r2.ebuild 3405 BLAKE2B 1bb99670dbd83e5053b83c562eff6bc6623825edad15e6e208beda309c634914f22ab2022ff5f299ce0650a8a68390bd2001093af8f8f578dfa8bea544112d62 SHA512 2eccca7653895fe9e3c9dfe0a26bdfd6aa6b6586a409d3b72a627c4a08e783aca6819a08dfd5424980e726c8530c5d5c708a346d8b271a011644fe543b8691bf
 MISC metadata.xml 383 BLAKE2B 5ac0b3d0708812cfcd5f432f43556ea55a2e7686447e06d876ae686befb854831415f1e5713cab07f3ba9f87c7cd982e17342423630eae4ea9656cbce29ed957 SHA512 d42c9219374f548e8105f7463156895e584c0b5863788fb9214633c9dc5c46dc8f2f4c53a00c411dd32aa1f3b83d9b9e9bd24508a2f18f69e7032aaf4c1de218
diff --git a/app-misc/rmlint/rmlint-2.10.1-r1.ebuild b/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
index 0bb48648fcc8..4d755cc14da3 100644
--- a/app-misc/rmlint/rmlint-2.10.1-r1.ebuild
+++ b/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
@@ -27,7 +27,12 @@ RDEPEND="
 	${DEPEND}
 	gui? (
 		${PYTHON_DEPS}
-		x11-libs/gtksourceview:3.0
+		gnome-base/librsvg:2[introspection]
+		sys-auth/polkit[introspection]
+		x11-libs/gdk-pixbuf[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:3.0[introspection]
+		x11-libs/pango[introspection]
 		$(python_gen_cond_dep '
 			dev-python/colorlog[${PYTHON_USEDEP}]
 			dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -76,6 +81,9 @@ PATCHES=(
 
 src_prepare() {
 	default
+	# Force the GUI to run with the correct PYTHON_SINGLE_TARGET
+	sed -i "/const char \*commands/s/python3/${EPYTHON}/" \
+		lib/cmdline.c || die
 	if use test && use x86; then
 		# Skip part of a test until this is fixed:
 		# https://github.com/sahib/rmlint/issues/522
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index aae8f54d9ab9..e12d0afaa35c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 0469b24c2481..42eb00d9b9ce 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,3 +1,3 @@
 DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
-EBUILD elogviewer-3.2.ebuild 1680 BLAKE2B 470cb22b10ee3e187665d7efeaccc427a1f8e408de9338f91f9fdaf1c2d833e69d4c6595d393805196dac3e1548663881e1cec347ec341f9ea697d5d15adb44d SHA512 515d5cf6143a51a1b5a95089f8f9f06532ecc2cbdf40d641f76338ee60f2104783dbe15b541cec40b722a69a216b182f240756fabea5510ca591525be0b89049
+EBUILD elogviewer-3.2.ebuild 1680 BLAKE2B cad68e28a294853e09f6572df1214be999b9d288eb97b40a724e3a19477b1dafd607217fd2dfefab00cef8dd0dc8c3d414f7555181e957ce5de42341b92ba926 SHA512 45556fe9fd86bd048503a1a71011d2389964ce82bc32550c4c61aba0830908019452c3df520e56455e6bf27fda983a4692c4130dd1306b2b18894d0f667b5e6c
 MISC metadata.xml 403 BLAKE2B 328a31cd1131b83154bf313dd3f32fe5038ab96f9239d9e15b5ca650d2932203ff1dce0ba547faa6ca20afdf30734fa810e46521c77911b2015c1a88e4223e27 SHA512 e400ef090331518b4c12a5daf2962595f894cb5c54665a47f61232b2687b796849c6ec13d6c9c2c8402b8c19cbd052b9c6984cc29ef2c67561a977ce07075d02
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
index f247168bb18c..1c6330793153 100644
--- a/app-portage/elogviewer/elogviewer-3.2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 DISABLE_AUTOFORMATTING=true
 
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 3eab7ee62f6b..3445039df35c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 5b1554e847a8..462728b7b508 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -3,7 +3,7 @@ AUX bash-5.1_p16-configure-clang16.patch 1108 BLAKE2B c3b2e0f74fdf83f8670b3f6e60
 AUX bash-5.2_p15-configure-clang16.patch 1116 BLAKE2B 5ef332cd2847f46e351e5db6dda79d01d9853f5eda9762deeba0450c2bd400eec549bbb85696777b687f64d0977daac4883d6ce3f1e26cec0d5f73e8ee97f000 SHA512 8cc761a50e936bb602c14fcf047e7278fa2f5394f78fc7f0f0b9ae9df4b48bdc9ca8424ccd6f6422364b7132c3317b8e688f330ce60a0c4724046144c58bd3e5
 AUX bash-5.2_p15-random-ub.patch 451 BLAKE2B adab09c3f2ce3697e3659e01266120155714b80263bd125808edf556a354291af615540189553b1c32a2d462ac41e28a9df8fb9f7d963a3ca3629d297a46e62d SHA512 ac62d3bd609a5d17434cb3614c3ee229569a84087173ebf694eb144a43891fdaead7c531f034b47d72c801ba46d48b0db616e3dcaec82bd7151df518ef070400
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
-AUX bashrc 3496 BLAKE2B eced5328d6ff2545c4e088ec5050ccd72fb5344bb83bd7d70b95840e68e642bd2a302c393b2ad12bd1ee9f42d51334043f8c1a0d36274bfd365339cec33cdec0 SHA512 39472c63db1f69cca8a92c5d330695f29e8f0b0524a6319482bbec394d91503d7c3a69dcd961927c7c404490efc8cf41b381e7bf4134098b750f47e5a47ff393
+AUX bashrc 3496 BLAKE2B d16ce6def14ee683b5bb6cc52b30aed2d642914939973e70ed9ed04b89f67c13eb4c66d149827725b5044bc0bc6653b03b754e35690313053146e6de167d89bf SHA512 19ed48ae3188d3baa2407ce0c80fab2e4e9396b17922b60afe936cfdb1916c36fe2358a23ca9352d651dbceff5616fa592987aa3558b5aa189157a62ee4c9f3d
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index b7202a361d31..98621a7c9a80 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -42,7 +42,7 @@ case ${TERM} in
 		PS1='\[\033]0;\u@\h:\w\007\]'
 		;;
 	screen*)
-		PS1='\[\033k\u@\h:\w\033\\\]'
+		PS1='\[\033_\u@\h:\w\033\\\]'
 		;;
 	*)
 		unset PS1
diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest
index 8e0d821a4203..8061aeeca526 100644
--- a/app-shells/mpibash/Manifest
+++ b/app-shells/mpibash/Manifest
@@ -2,4 +2,4 @@ AUX mpi-3.patch 806 BLAKE2B 4a5f6db66474f1df8edb63390ffebc8d1648cd77d56f494d1951
 DIST mpibash-1.3.tar.gz 369803 BLAKE2B b1959deaa2d5b3bce1a66e5ef0ff41ad156093aec9cc1efcd12873b6d5814ad1586ff951d6fd7f37dab6a55040378774b435edc4e2c8892952480539864f91fa SHA512 4728565239aae80013322231a928fd1e9a59484614a92cf7e314d0cd5c090d3a47de395507ce52f71a6900245855089d659c6509f8c4df3bfd88e46fc2187749
 EBUILD mpibash-1.3-r1.ebuild 1000 BLAKE2B b678447b0b9960df69eb165f4a9e2a200a7038edd80cba025fd14e958cc76102f0ae1b39ebe5a606a5b2800f258711309783dae6bc072a9e53f79415d08ccdbb SHA512 03eec8f007749773c9eb834cf0f231e08a868dcae2f9bcc36b2467d05e6e3e3073fec9257ff824fb45371dae9df7bf4d7b8edbbdc78600f9f99eca9a9b009a8d
 EBUILD mpibash-9999.ebuild 961 BLAKE2B 961fbd97899e752eddf18ecf16d2daa56f621f00cd62026350b6cfc8d61d4d0b36d4115438a3c976024f807d19fb1f0eacae3af0cc9e16a420c589671fa4b2ef SHA512 5700b9f95a805ad9718f6ad51ec887c04b7b757ea7b21be08e27c609cd39b27bf0577ca51c3891b703a76e1d37fb0c72845e6bae6416506d25204caa850aeec6
-MISC metadata.xml 462 BLAKE2B 061cc6b6cc74a616a5f3c351d3ba86a0bc23c8cd9090561a1d194391020c15d893fb6a2dadb6045f513496105cfb4f84b63a692b43a91464f73277052324b8df SHA512 d8fc43f4ede84aa5a27fe975da31ce118917c3caf8840c73016d34ed9a47a53993921c935b4c3c88b03c518c93c723eebd2011711a8d8b1ec81a81440756af0e
+MISC metadata.xml 342 BLAKE2B 520dc00debfc4ba86a893bfad929b970e26b4ae108f3217b455e0c41fc3b3ede0959ac8e00c7863d936a183af221cf814bf5d71f139dffa1f1ece13a5f3c4846 SHA512 7ad753edc5a3073eecaf6fc3918f36b787ba5a03f3cdf54935f31cb72f9579817548aea75fdf8b20c684a0ee8bbf0beb7d118dfdd4f6151f0506f86f430f3294
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 05c42cd54152..9c1468f61f6a 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 3b68eac795dc..e165c3bbefc2 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,6 +6,6 @@ AUX zsh-5.9-musl-V09datetime-test-fix.patch 641 BLAKE2B 693f3caf1e98ba971d776f1a
 DIST zsh-5.9-doc.tar.xz 3130444 BLAKE2B 96b635b438f8a90bc1f3c15c8a287ab392ba830e975e49b7f1c09d12de44c250dcf33d1d6dc93b58693839af2e57eb5c9d4e874ca08dd82fe876cb5ca26e6508 SHA512 5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860
 DIST zsh-5.9.tar.xz 3332400 BLAKE2B 3ecd6d080ff47b78d228d9bf5c1bafd3dfc602beb681ec533ce1039041d0e93143ebd7e0e73a9aed0789e27ca42d58a55f3b6e2c7d89113ab3ee99112dec46d1 SHA512 d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
 EBUILD zsh-5.9-r1.ebuild 6477 BLAKE2B e5056ec62f5aa5a9ee2e53f02e68cd91a6080dbca1d8a96bc52b7f3dc18f5e9804017390c443d74324b898a19a57671022efef5f3234f96e0fec81ae6f3979f7 SHA512 d62f608777b9831da8d227eecd822b6510d2d67f3970e95fc428245e9668e1bf8787e4cd385b7ab45d3add9a36d3b21d1cd8f98404dc204898a6f6dca68b428b
-EBUILD zsh-5.9-r3.ebuild 6469 BLAKE2B 78b57cffdc83ea98315ba5e151e6e6eef36f386824f7ab534185559a3041f61cade3d598df33daf713df1259efe12fec3208d9fe92e466e071d9c44d69eef988 SHA512 350bde1dae9fad7de0f82f3f30b3ffb7a62699b5645af5eb8f0e736bf78ccfc0f340f6901ee264695577df3a01345063abab57206decdae014eb7c935dbface6
+EBUILD zsh-5.9-r3.ebuild 6468 BLAKE2B 110a838070c8684bcc2d801264710378d1316c493b5dc1a3735e2dca364e52a16c5fc4edbfd4395f5d2085b2ccc84dd02aad6f23e60253ff443df194aac2a016 SHA512 c344eb8106642b28de281271ba10b15e1b72aac29ef325b6778465918d124491ff309b1a244d90a74da913809d2ef926fe313e9c9f96fdb20faa8ec82c3d8710
 EBUILD zsh-9999.ebuild 5898 BLAKE2B a0343e0caa2b715c1d35060f6d907e48449e6163007f7cd944a9374174e3efbcc8c0599f29af409114f291beca97635db89ad2aba07595b1c48820f3bb7c1563 SHA512 75496f76a2146eae389d8ba1f4c6aea2dcc9bb1c38a2c5ef6844d14e6272c2f26eb0daa082780bd224457e20fc76b9c1ade64bbd7832909c221a1b9266080a82
 MISC metadata.xml 659 BLAKE2B 659f50310f4925023da341663c06672715fee9853f56a4f538c54e5c5a38c6fc494a5f35cb144de7b0f2ae74402fe48eed4b1402c3fd718cde9017505f94b0d0 SHA512 fa1929d584f7c29e861f6e07e2c359400a4e725d5037837f1bcfdba1867b78c200bb583539b9e03bfc03a60d32893c75528c18a177497cfdaf88f42a190f4e7e
diff --git a/app-shells/zsh/zsh-5.9-r3.ebuild b/app-shells/zsh/zsh-5.9-r3.ebuild
index 05a149894d5e..35f108739d09 100644
--- a/app-shells/zsh/zsh-5.9-r3.ebuild
+++ b/app-shells/zsh/zsh-5.9-r3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 81a734914e6a..63143642297a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index e1f2e2228746..ca15a726ad59 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -6,5 +6,5 @@ AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f1
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
 EBUILD dblatex-0.3.11-r1.ebuild 1827 BLAKE2B 34b52a951121ede45a6068422fcd3348b98fe3f5b764fa2eaa463a837c260a0dc881ffdfa7b2d63464062b1214e12f34a0ccf4c2b78942b81944b74ad86d1b9c SHA512 7c760c2e1caeb089c1b038535ee849becee4ce06fc9634a3c382b2f518ef81d60a9ab5869ca22f44efbc42dcb6be73d2d5237ea6940732bf09ce5fd793a0ca50
-EBUILD dblatex-0.3.12.ebuild 1888 BLAKE2B 95f3692c84a09e20958659a22b0b042f6287b7c6501ed9761e758920f341c6d1f4bd53b6201994e7bc9978fa94760865656d19e4a5f70188a669afb2d0b63a73 SHA512 65ff85953a5b106097141d56b7d9b31d5abf8a9dd44922ba8268c7ded476c798db2751e579715f8556e710ebb54236a21365a266d1ca4a2ed9c1c8658c7b3cef
+EBUILD dblatex-0.3.12.ebuild 1895 BLAKE2B 284cfcfa518aa63e437b0f7a5a201a1b30b4b6bbb8f9cebd953431d58121f9cffdddee600ab129c1c27857538f0b6aaf3a9256635f6f24713d8eb005bba087ee SHA512 5b7bd960fe28f3bb2e420fe137f24d97344a579eb3942095934bfa440b189c9c72d37e906e25458537914c8c89aaf68253869c09ef1be2045aa529841014d1c0
 MISC metadata.xml 908 BLAKE2B e13f176739b3fb7a63a5eaeb704afa1c0b4e9740ea25dec54656c283cf9f8f614096aae407df8822414e054eaad0082c738c0a5a2acc91a51ce3f6b729fc37d6 SHA512 a39c4073b4cec1753724d16bcca023c9306eeac79bc7f008c6e090f85c4661733810c9864b91b9552fbbec242c01a312780ee780d11724ce26399bad3c9a0899
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index d6fdaf52dc2d..ba104ee9d005 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="inkscape test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index dc5ef8c0eb5c..65d290061219 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -6,5 +6,5 @@ AUX kjots-5.1.0-missing-lib.patch 683 BLAKE2B 719f3c4ef39856c33b683f4c7edca664f8
 AUX kjots-5.1.0-speech-optional.patch 2921 BLAKE2B daa773ddf2c40dce83891a3afc35c209343d2e9a71673dce669132aa998fdfa225eab03fa8df0bcdd0a1c9694ebfa117c4fe9da129b63979aa37fe797a74edc7 SHA512 a7f4b30b04e1bf6bc403a9baad213d92f96fe147b7f5a279a2f19d3f0758714dfc3c99bbeced7bea6bc2a36e3246407152e4e276c162ade88f1de71fed0b2af8
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.1.0-r2.ebuild 1598 BLAKE2B 288556d874e895778a11d52fd08e26f543cf937fdb0074816ba4792c6c722bd2e725a9f752270dd6ad0d44585a4b75a9eaa6b7668cfea83d7bfb6beb104bfcef SHA512 74c0ec0d214375eeea7fb4d0b74fa5f5db355d2c039f27056a7c9a573669f318ddf61f163bed6c2c07c2becf5407709cf8f7e33240d84739b88e18714b68d290
+EBUILD kjots-5.1.0-r3.ebuild 1632 BLAKE2B 03c08e13fbffc35a191468b994df1e3572c2af0c325a300f998e9142a510698e3bab43b44f5f086b66d395cdc75ce6eb852d3b8e06be6d1298b7085b1b88e9d4 SHA512 83e3c63131c7e74192583154758d4aac76f21927b9b99b330cc61f00366392eda3074395f5f2316ad5f09419be2ca9aef5608b652aaf265d42185987b50f1d32
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r3.ebuild
index ade68829883b..19a1d1ab13f5 100644
--- a/app-text/kjots/kjots-5.1.0-r2.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 KDE_ORG_CATEGORY="pim"
-KFMIN=5.82.0
-QTMIN=5.15.2
+KFMIN=5.102.0
+QTMIN=5.15.5
 inherit ecm kde.org
 
 DESCRIPTION="Note taking utility by KDE"
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2"
@@ -26,11 +26,11 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-20.12.2:5
-	>=kde-apps/akonadi-notes-20.12.2:5
-	>=kde-apps/kmime-20.12.2:5
-	>=kde-apps/kontactinterface-20.12.2:5
-	>=kde-apps/kpimtextedit-20.12.2:5[speech(+)=]
+	>=kde-apps/akonadi-22.08.3:5
+	>=kde-apps/akonadi-notes-22.08.3:5
+	>=kde-apps/kmime-22.08.3:5
+	>=kde-apps/kontactinterface-22.08.3:5
+	>=kde-apps/kpimtextedit-22.08.3:5[speech(+)=]
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -43,7 +43,9 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-22.08.3:5
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-unused-dep.patch"
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 92a1b6615193..235c2eedb3c5 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -94,6 +94,7 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
 DIST markup5ever-0.11.0.crate 34667 BLAKE2B 7a4e9c860949296912616fab105b688fc5ad86df012f064efb3e5125aae57869b4e63f4a551fc787e65987e5bb8c0dc26e2ff99651a2e56fa67237796f5967e8 SHA512 c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e
 DIST markup5ever_rcdom-0.2.0.crate 222948 BLAKE2B 2105ceee730f5fbb3c14ddb7bfe8ee5139febc870e37e9ea169f107ac8060ee4f5782b185310bada5f646600c2b8bb7fbed144c056e5b437133443f62a04ad99 SHA512 bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4
 DIST mdbook-0.4.27.tar.gz 1518389 BLAKE2B 6eb386a48d631eb246871fe5269e0a49f008ff8395fd05a3948de7b10d663c64ca22e3ee96aa79afbeac37a0f732c988ef7620359da2c25f563859664c8313f3 SHA512 30d78b11dd1c4302c156c5a2df7b3e32de7a9d8074d9826b555c4c1cafe43692fc80273ead9bce26c85885e16f2d99c872f89919239820d420048b8a56a09193
+DIST mdbook-0.4.28.tar.gz 1518890 BLAKE2B edabc227d28e7e4e38299e5e9e1973dd8f6cf533e9f21bbda01a5357376032da2319bc86bc2077b85ddb65317c4cd5e6d03e0dd67cdf51dc10e15426febd0330 SHA512 91c82aabd9b422c3714257a2de415f74b5091ef114586281e1adfdfa9d385e416c483d4f2c2ef052e9bd86234ca78f63f26ad24abcaeae05abebac0483f824ea
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
@@ -221,4 +222,5 @@ DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a7046
 DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD mdbook-0.4.27.ebuild 5189 BLAKE2B bcf3bae20f23e573d68554139e065abcb3a20816bf0c9ab948a329acd7b910a0f1eeb3d33ca790073abeec57012ab1d246a94e42ed239570af708807e9d7a767 SHA512 cf9304d30b699756a4aae5c8a7f5fa0af97ea7e57e2fa501513664d7c5ef4338967fbd80c75de5e61a89d4ce17649845be26e2efb3934721113a2777b1648751
+EBUILD mdbook-0.4.28.ebuild 5190 BLAKE2B 99d4f2729258ef71bea58059ac2f555729d07920b58e6c7609bedcfdfe166bfc154585727741472888f0918cc081430cad76521b9674f1503e9f72974282a48c SHA512 ec7a36c2f91289ffbe28adf2f24d0d0773c1ca189851e762e011eecb9fc3702cf51fae8d198ff91d0f98f4eb049919344d9874e5701f120c600a0fd1095cc0c5
 MISC metadata.xml 327 BLAKE2B bb56613ec49f3b00a39b3131534cb064154ca05d46fda58d4e1d0c601e49561b4d73bc3d075e378e7ab2df720560d169fbe9fd39b40171184aa8e88d8f7291a4 SHA512 e678a70558e83d27e5c0146174d9e740f3ec2e6bdbbb17e61b71fdea6879d61b7babbd9437ee9928dc0322e65a0863b3909bffc7b3ad9313566c5de5baa17f62
diff --git a/app-text/mdbook/mdbook-0.4.28.ebuild b/app-text/mdbook/mdbook-0.4.28.ebuild
new file mode 100644
index 000000000000..8ccef7d9ff34
--- /dev/null
+++ b/app-text/mdbook/mdbook-0.4.28.ebuild
@@ -0,0 +1,262 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.20
+	ammonia-3.3.0
+	android_system_properties-0.1.5
+	anyhow-1.0.69
+	assert_cmd-2.0.8
+	autocfg-1.1.0
+	base64-0.13.1
+	bit-set-0.5.3
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	block-buffer-0.10.3
+	bstr-1.0.1
+	bumpalo-3.11.1
+	byteorder-1.4.3
+	bytes-1.3.0
+	cc-1.0.77
+	cfg-if-1.0.0
+	chrono-0.4.23
+	clap-4.0.29
+	clap_complete-4.0.6
+	clap_lex-0.3.0
+	codespan-reporting-0.11.1
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.5
+	crossbeam-channel-0.5.6
+	crossbeam-utils-0.8.14
+	crypto-common-0.1.6
+	ctor-0.1.26
+	cxx-1.0.83
+	cxx-build-1.0.83
+	cxxbridge-flags-1.0.83
+	cxxbridge-macro-1.0.83
+	diff-0.1.13
+	difflib-0.4.0
+	digest-0.10.6
+	doc-comment-0.3.3
+	either-1.8.0
+	elasticlunr-rs-3.0.1
+	env_logger-0.10.0
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fastrand-1.8.0
+	filetime-0.2.19
+	float-cmp-0.9.0
+	fnv-1.0.7
+	form_urlencoded-1.1.0
+	fsevent-sys-4.1.0
+	futf-0.1.5
+	futures-channel-0.3.25
+	futures-core-0.3.25
+	futures-macro-0.3.25
+	futures-sink-0.3.25
+	futures-task-0.3.25
+	futures-util-0.3.25
+	generic-array-0.14.6
+	getrandom-0.2.8
+	gitignore-1.0.7
+	glob-0.3.0
+	h2-0.3.15
+	handlebars-4.3.6
+	hashbrown-0.12.3
+	headers-0.3.8
+	headers-core-0.2.0
+	hermit-abi-0.1.19
+	hermit-abi-0.2.6
+	html5ever-0.26.0
+	http-0.2.8
+	http-body-0.4.5
+	httparse-1.8.0
+	httpdate-1.0.2
+	humantime-2.1.0
+	hyper-0.14.23
+	iana-time-zone-0.1.53
+	iana-time-zone-haiku-0.1.1
+	idna-0.3.0
+	indexmap-1.9.2
+	inotify-0.9.6
+	inotify-sys-0.1.5
+	instant-0.1.12
+	io-lifetimes-1.0.3
+	is-terminal-0.4.1
+	itertools-0.10.5
+	itoa-1.0.4
+	js-sys-0.3.60
+	kqueue-1.0.7
+	kqueue-sys-1.0.3
+	libc-0.2.138
+	link-cplusplus-1.0.7
+	linux-raw-sys-0.1.4
+	lock_api-0.4.9
+	log-0.4.17
+	mac-0.1.1
+	maplit-1.0.2
+	markup5ever-0.11.0
+	markup5ever_rcdom-0.2.0
+	memchr-2.5.0
+	mime-0.3.16
+	mime_guess-2.0.4
+	mio-0.8.5
+	new_debug_unreachable-1.0.4
+	normalize-line-endings-0.3.0
+	notify-5.1.0
+	notify-debouncer-mini-0.2.1
+	num-integer-0.1.45
+	num-traits-0.2.15
+	num_cpus-1.14.0
+	once_cell-1.17.0
+	opener-0.5.2
+	os_str_bytes-6.4.1
+	output_vt100-0.1.3
+	parking_lot-0.12.1
+	parking_lot_core-0.9.5
+	percent-encoding-2.2.0
+	pest-2.5.1
+	pest_derive-2.5.1
+	pest_generator-2.5.1
+	pest_meta-2.5.1
+	phf-0.10.1
+	phf_codegen-0.10.0
+	phf_generator-0.10.0
+	phf_shared-0.10.0
+	pin-project-1.0.12
+	pin-project-internal-1.0.12
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	ppv-lite86-0.2.17
+	precomputed-hash-0.1.1
+	predicates-2.1.5
+	predicates-core-1.0.5
+	predicates-tree-1.0.7
+	pretty_assertions-1.3.0
+	proc-macro2-1.0.47
+	pulldown-cmark-0.9.2
+	quote-1.0.21
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.4
+	redox_syscall-0.2.16
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	remove_dir_all-0.5.3
+	rustix-0.36.5
+	rustls-pemfile-0.2.1
+	ryu-1.0.11
+	same-file-1.0.6
+	scoped-tls-1.0.1
+	scopeguard-1.1.0
+	scratch-1.0.2
+	select-0.6.0
+	semver-1.0.16
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	serde_urlencoded-0.7.1
+	sha-1-0.10.1
+	sha1-0.10.5
+	shlex-1.1.0
+	siphasher-0.3.10
+	slab-0.4.7
+	smallvec-1.10.0
+	socket2-0.4.7
+	string_cache-0.8.4
+	string_cache_codegen-0.5.2
+	strsim-0.10.0
+	syn-1.0.105
+	tempfile-3.3.0
+	tendril-0.4.3
+	termcolor-1.1.3
+	terminal_size-0.2.3
+	termtree-0.4.0
+	thiserror-1.0.37
+	thiserror-impl-1.0.37
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	tokio-1.25.0
+	tokio-macros-1.8.2
+	tokio-stream-0.1.11
+	tokio-tungstenite-0.17.2
+	tokio-util-0.7.4
+	toml-0.5.10
+	topological-sort-0.2.2
+	tower-service-0.3.2
+	tracing-0.1.37
+	tracing-core-0.1.30
+	try-lock-0.2.3
+	tungstenite-0.17.3
+	typenum-1.16.0
+	ucd-trie-0.1.5
+	unicase-2.6.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.5
+	unicode-normalization-0.1.22
+	unicode-width-0.1.10
+	url-2.3.1
+	utf-8-0.7.6
+	version_check-0.9.4
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	want-0.3.0
+	warp-0.3.3
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.83
+	wasm-bindgen-backend-0.2.83
+	wasm-bindgen-macro-0.2.83
+	wasm-bindgen-macro-support-0.2.83
+	wasm-bindgen-shared-0.2.83
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.0
+	windows_aarch64_msvc-0.42.0
+	windows_i686_gnu-0.42.0
+	windows_i686_msvc-0.42.0
+	windows_x86_64_gnu-0.42.0
+	windows_x86_64_gnullvm-0.42.0
+	windows_x86_64_msvc-0.42.0
+	xml5ever-0.17.0
+	yansi-0.5.1"
+inherit cargo toolchain-funcs
+
+DESCRIPTION="Create a book from markdown files"
+HOMEPAGE="https://rust-lang.github.io/mdBook/"
+SRC_URI="
+	https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+S="${WORKDIR}/${P/b/B}"
+
+# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
+LICENSE="Apache-2.0 Artistic-2 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+	cargo_src_compile
+
+	if use doc; then
+		if tc-is-cross-compiler; then
+			ewarn "html docs were skipped due to cross-compilation"
+		else
+			target/$(usex debug{,} release)/${PN} build -d html guide || die
+		fi
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+	use doc && ! tc-is-cross-compiler && dodoc -r guide/html
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 8794b438c495..0af1f60a463e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,10 @@ DIST poppler-23.01.0.tar.xz 1847492 BLAKE2B 8dd85767a0c101b3d7166719374658a233af
 DIST poppler-23.01.0.tar.xz.sig 833 BLAKE2B 46c3910627fd69930fd428397e739e3fe41c9b835379dfe7abbdf421049a77b33ce1cf6a44bd386278d3610ae2547d119ac6da4c3bfa7f348c51fbce7319a878 SHA512 0cebaac1846e6b3944175bcb28b49592d562738c009a97e048abe9f6677718c97bea2b470ea503b8dd083fc5f154e71d539cf1e3bce08363c6979d268dcdfd3b
 DIST poppler-23.02.0.tar.xz 1847612 BLAKE2B ca5187432c5088372f0b8f4fcd39a93998b28e505d214964de99cd03db555f8f80b05de19874264b1d732d2c45388562faead50b2b82116bb6031690419abd8c SHA512 0765319a1b106da740c7300172866e774ccbeec0bc0e938f009efd1a106b35ca2e5ab60a523e1d1dd5682b30499de4dffed0a1ca129c770263a096f781337a2c
 DIST poppler-23.02.0.tar.xz.sig 833 BLAKE2B 48b46b92d8d95f25a0619aaa50c29c652e91ba99c5f8d5f30cbb879a2145e3a21df0258585ee9e44d036f4a8c1d54023e1bb22aa0d90bf69403b37c601b37ef2 SHA512 68fe9d46ec6f7f1b6d0d7becf96675477454af9218ad20ad159d8a06def73f08db59915adbb77b520e3e43091aaf895e045c7ccaafb57d2b2b9390e84e70a963
+DIST poppler-23.03.0.tar.xz 1849324 BLAKE2B 1247b7cf62466f65c46b739f0784e8ba97911940e04f91a7db28bf0663c8fe182f79066aa3925cb338580ccedbf17aecd2a2d2795e859680d1fb721390a1cbe0 SHA512 1c370d9262141ff5b720a4c3cf6f01573047398f8950295e3e99f32700946e3241e26e3d909cf78a278fc402306811fd87977d0f86a744f3eaedb4f39b8e8a2c
+DIST poppler-23.03.0.tar.xz.sig 833 BLAKE2B a8a07aac9068a3edc6cdce4d59c2b5d3d792dd6addcd420d5b92f013041cfd934c0da04a21eabefdd25167fb89b940945f8ca03e7a7280d03a47b6df8490bdf4 SHA512 3d950ff4b1a368b6edd8333677d1d125f60b4b1a052e20a2be6a0d38489e7af393be8359fc2c75010b2a28673e201507da4bf4c8458904fa712247d8ebda4786
 EBUILD poppler-23.01.0.ebuild 3697 BLAKE2B cb47f67742bd07faa89a68d0128295bc1b5a21a1b2716c2af58cf88393da79ce5eb60f1cc327a15daa0a18193150d67615ae18d94637eeade2d3ec5456cb1cbf SHA512 00699421e072ce5bcdda3ab9b4c6725c72cefcc211a00a3dfdb17362bb1a1af541c356b3afaa6781ab53db4d210698c12be793202f1d2fc8d6682042d372c3a6
 EBUILD poppler-23.02.0.ebuild 3705 BLAKE2B 42f662364ef1bad66807f095c898799aef5b5e013bb9b0e289fa439c4f61de05ff16b4acbaf6d822dbc5da9c0bbbaf61a943d0ab77143fbf63469e5854e14ba7 SHA512 36aca9e21798fdf3bef1e2b1ef0568a1e767747c83781e49b9283b8ba8b6bf8cbe364c28f93f3b1e112e3b8438deac44b00416d8aed5064a636e3c341c54569b
-EBUILD poppler-9999.ebuild 3705 BLAKE2B 42f662364ef1bad66807f095c898799aef5b5e013bb9b0e289fa439c4f61de05ff16b4acbaf6d822dbc5da9c0bbbaf61a943d0ab77143fbf63469e5854e14ba7 SHA512 36aca9e21798fdf3bef1e2b1ef0568a1e767747c83781e49b9283b8ba8b6bf8cbe364c28f93f3b1e112e3b8438deac44b00416d8aed5064a636e3c341c54569b
+EBUILD poppler-23.03.0.ebuild 3705 BLAKE2B 42f662364ef1bad66807f095c898799aef5b5e013bb9b0e289fa439c4f61de05ff16b4acbaf6d822dbc5da9c0bbbaf61a943d0ab77143fbf63469e5854e14ba7 SHA512 36aca9e21798fdf3bef1e2b1ef0568a1e767747c83781e49b9283b8ba8b6bf8cbe364c28f93f3b1e112e3b8438deac44b00416d8aed5064a636e3c341c54569b
+EBUILD poppler-9999.ebuild 3751 BLAKE2B 5175e37cc317e793ae6745af23f7d52d5de82dd732bfbc26dbab26227247fbe8cf2ea3bcb683ac9812c873402fd663911a8e7060ed5bb553d24158d8b476ea2d SHA512 ba2b06b0e955b25e72d28d48ddb676bfccf20086eed0936351a8bd4f7b41dc7029326f974bc077eebf2cc44d65c2ec75ea3290685401604de280df9290091091
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-23.03.0.ebuild b/app-text/poppler/poppler-23.03.0.ebuild
new file mode 100644
index 000000000000..750ab1f52a57
--- /dev/null
+++ b/app-text/poppler/poppler-23.03.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+	inherit verify-sig
+
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/126"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.13
+	>=media-libs/freetype-2.10
+	sys-libs/zlib
+	cairo? (
+		>=dev-libs/glib-2.64:2
+		>=x11-libs/cairo-1.16
+		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.49 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+	boost? ( >=dev-libs/boost-1.71 )
+"
+BDEPEND="
+	>=dev-util/glib-utils-2.64
+	virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if tc-is-clang ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DBUILD_MANUAL_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_BOOST="$(usex boost)"
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 750ab1f52a57..96f13351c75a 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake toolchain-funcs xdg-utils
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -92,6 +92,8 @@ src_prepare() {
 
 src_configure() {
 	xdg_environment_reset
+	append-lfs-flags # bug #898506
+
 	local mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT5_TESTS=OFF
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 28e96b77398e..6db5705ad2c7 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,6 +3,6 @@ DIST recode-3.7.12.tar.gz 2399126 BLAKE2B 420ba6f96d532da4ae0e1861b512c39ad59f1f
 DIST recode-3.7.13.tar.gz 2400432 BLAKE2B 457ba7855aeb5ae8b0cc32ee82b5b61b1b46ba2908406c0c10a76ae242343f421e81038b9bb6784089e8e3e687ecc0f61a6263c24f6b234962f94853e9359734 SHA512 af86754ed2ed1dc414f1dd7ab3564d606abb309766fb02bf085e56241527a74ac7141617956d01b0797e8e426cfb39ec597bd221d8ad58d9246e96b228e65b00
 DIST recode-3.7.14.tar.gz 2297471 BLAKE2B c353c287f0eb8fd461f1a98b47bb6e24067051edf4ef40badb5598b242aad4f560d1097ea826db8dc7f24206a86cc58207090fe746da2be6cd11e5b3d5961567 SHA512 ca0e9aa392f0571cfd1cf9566a15d7651a80edf40d603eadaa4c4ee2d7843ffa9d6074be30a21dac2ab192fe601f8581721d719d055911eeccb455acfe112596
 EBUILD recode-3.7.12-r1.ebuild 1521 BLAKE2B 84538445f6e9b827abf55fd81ef8e8837be2b8d5d99eea64225b50caeb14c994f50ce588ee460f592cb3597d3320add94bb777706bba77ea85f2eb3070ae23c2 SHA512 6010eda50d6b05d8d3f64dbd7705957aab182404650fded118b193b65daf26a417cfaece49bdf8f0405727ee3429541d8f0588e3575b75efe5ddb8d99a5f5a58
-EBUILD recode-3.7.13.ebuild 1576 BLAKE2B 3beaf48c31d26bf6e901088d3bbd41b90bc9ba39919bec27b58c45216a61c685169b18b08f93b26b8c7653835c687658c22324b6e996b621d63c5e46697aa70f SHA512 ce91a6e0116142aa8382f813387d4b975786c3dfb0c2aab8db99c54fce6b7c8b1a839ceefb9dfb0b85e7773e4194a2134ae353b574dce5fc9c03283c3006a768
+EBUILD recode-3.7.13.ebuild 1572 BLAKE2B 2a20e2cedf12ada6e017444e8206bd32553f68fb84d289f08af417727f81ae096d19154fec3e8f0117c34dddad4b8a163bf86a6758c22aaa11085da61781a440 SHA512 066dd36bc7729fc8186ecc197b3d47081c9341e3b7af4dc245b87ad4cfbdd9ddf1b8ff17e3753249359f50075e4e4abf9a56e772a4b0cd6817919e6ec2b61784
 EBUILD recode-3.7.14.ebuild 1505 BLAKE2B 8c9d89fc8fd8165823fd51e75198588bcf7cd34d8c0379820bed691ed5c4ca857c5e6c28577439bf2c5c09f22afdfff1694bec0e10db005044cae5281dfcd666 SHA512 fc2110f3a4c8af432ee948a8a2882d7ba373f8cb466fb8154f681ebc9fad67a8ba89ecc96d9f641392cff2a9067981263b0d587cca3c56fd25f1532bb2af9af4
 MISC metadata.xml 431 BLAKE2B a2f1b90590a30ec6d561845193e29d2fde7254ece1cc31b777bc5d3ed85aae53a6abb23cd9a00f9fd07ac4e13ccabd35e2fc71816106e46c89ff0607e869419c SHA512 388038f9e95b0491e8061def1c405facb327e8feefeca08d7b425b143db03d4f7745c6b7515cc000f42992b97cc9e82aac7660e313a2159d324883792d6d85fb
diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild
index 49973a51466e..a9904d251fe9 100644
--- a/app-text/recode/recode-3.7.13.ebuild
+++ b/app-text/recode/recode-3.7.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-3+"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index f0ad72e6767c..2de971c5ad86 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
 DIST zathura-pdf-poppler-0.3.1.tar.gz 9259 BLAKE2B c1131d2acc0cf69bf9266969839f6fb4e043664a0a4648d033f9338b1219d75e34576a03380daf54bc8fe52cc8bd2244a93394e15f8ff0bbb980fb903749affc SHA512 a6ea7d61f05cfbc6229ec81580c539841916b44085aeb168668cfabd41aca2e5321e88605f092caaa3efc30bec25a2bb319c687920a22b1f7f53e4b1e470ec34
 EBUILD zathura-pdf-poppler-0.3.0.ebuild 767 BLAKE2B d4955dc86e748ab9710b15b17c83cb2cff34e11d845eb3261efc854ba7b132a8d6a90c05b5b3001fcbbc6c6d128a1442272012388ff2d48fcbeaa6724e84822d SHA512 e9e573f14940d53d9627b782aabe16e1903044b7490cd03047d05bba924ddac57493b98449602bce074611535fef9d4f7a031f90a1a9f3347670ce2ea20cda0a
-EBUILD zathura-pdf-poppler-0.3.1.ebuild 772 BLAKE2B 401c7396ff2e8a6803d67400065d104839437d734897454e73058abdfd603c515a21827cd9efe5ef3e3fceebb9c359e17173eb0fcc6fcb00c201d71fa892b464 SHA512 e08a7d327ee0ccbbab0f2881ab8ead87ed28309b9f6e27b32014b9631ab1f9f95afcb9f286293ebcedecd8bb7d6480ad8a748fd82be12e5f952b7c1180b22539
+EBUILD zathura-pdf-poppler-0.3.1.ebuild 771 BLAKE2B 40a2f3416c4f939a2879bd430b1ed8d06c255989ee8428aca87d4603d136be47e2d8fc19a5c0388f7648f6aca4d0c6e889b4e0759c15ea4228d2729df58ab0ac SHA512 77c10c0acddc000261e6e7969dddf6dd8e7c10fe193bb4f0d1a1bd3b90b0d5cb8e75c4caf7c88589dbe3a52e58ea3425793087e321d6da4b2d21d00d1a45eab9
 EBUILD zathura-pdf-poppler-9999.ebuild 772 BLAKE2B 401c7396ff2e8a6803d67400065d104839437d734897454e73058abdfd603c515a21827cd9efe5ef3e3fceebb9c359e17173eb0fcc6fcb00c201d71fa892b464 SHA512 e08a7d327ee0ccbbab0f2881ab8ead87ed28309b9f6e27b32014b9631ab1f9f95afcb9f286293ebcedecd8bb7d6480ad8a748fd82be12e5f952b7c1180b22539
 MISC metadata.xml 742 BLAKE2B 25123046ea688616972cd2ef7347eaa72efe9136914abc7b54b2afbf3f85afdf487cc9e246cd1b2de45f2109998c34005b5f9041d6d15282389e9942b357beac SHA512 bddd3bf740e7ef9a6327ed9bd29e2224643fb7403486417b98d6e00b19af7405694d3d726de28090a00b0c469a238d721664240f6e524d3c9bfc816ff431eca8
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
index cda9cd6aa073..a2fea4d5caab 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="~amd64 arm ~riscv ~x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 41b633cf8ba5..87025a54c153 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -3,6 +3,6 @@ DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88
 DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
-EBUILD zathura-0.5.2-r4.ebuild 1478 BLAKE2B b797e92f70e32cee6f2b49d0a4b54ed2a602771e2530d2574edb72ff18ce75c81f18581fb678b842abd7abc7dd89a64e47bb6150ee720edd6f1066040b18174c SHA512 e9ae7ddb8fb8589a86b02efd3513c2381dcaf54e2a513c93498e5319ad97f307441723758cd9c9b837c480dfa3bd250f1ec65bbb6f8b5a931b53c68341c6a37e
+EBUILD zathura-0.5.2-r4.ebuild 1477 BLAKE2B 58e5681a0130a7b1d0c79180406845fe462d9f90f4b451bac63e799b776539fe0745eb0272f375818963ea8fd00784d0cb6227e6b2785a996760f741812a0937 SHA512 57644d7aec81e5d73f83bdc0f075a18cc6c3d52c6eebaf9e5cba321fe7bf6419f0d94f7eb46ec26fde833c971540e7f50d14c23105e4b8831f565c2f4a6eca30
 EBUILD zathura-9999.ebuild 1344 BLAKE2B 4963fd1b776f6028efc676cb1280ff7502c4f05de97a6481d397229bfde7e3e76c3fd58547af96a1e46d1e02581c653bb1823dc7f45e734b0a12b54629163cc1 SHA512 270f4ca7ce870b493504b6a26b9b3d31ac5788a442b0d44422a51a40e77fa03d46e032a1701c6a30a6cbe04ea34eefc992680bf0fb712f48da6022666da09cdf
 MISC metadata.xml 821 BLAKE2B 1e00497e754b684be18ced6966f830350bb6c9529a3993c4a1c17b9f0f6d3512e864dafc10966be8e5f338a8f4484335f2debe239914ddf2d0bc0ed99895bf63 SHA512 ff0cacc5dd1ed909ddd5080fc949dc997ffcc1b5ed429b9cf9d5e3d1447bfffc89ddce79371ef387c5064fd0df65f15d85c665ee2125d4269093e536a7b80c6c
diff --git a/app-text/zathura/zathura-0.5.2-r4.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild
index 6fe10b0117a9..77ba18c44786 100644
--- a/app-text/zathura/zathura-0.5.2-r4.ebuild
+++ b/app-text/zathura/zathura-0.5.2-r4.ebuild
@@ -17,7 +17,7 @@ else
 		https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-manpages.tar.xz
 	"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 58b2d8ecc953..7b3856b76f72 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index 8f47c235d080..e3540bed0b39 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,5 +1,5 @@
 DIST doctest-2.4.10.tar.gz 2297167 BLAKE2B e6d2af9dc9207a1a5d86ebdad16f29a4c4d860334e75f79ded596bf181ff0c334895b5606710993eb9bb1d8c76359063b5ce5c7faa5c371a4315ac53275783e5 SHA512 f3d7c5c45b12a13b5df359727328a519f7a17c92ab868274c8c89e58a573c886ab8da9213ed31634b62a9c92e792e721a71fcb42a3d483b6dff5f6ef7bb03d41
 DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
-EBUILD doctest-2.4.10.ebuild 594 BLAKE2B effd821a5eac499d9a18bef43add3fcc4bfc759397f37d554c70992617877cd5dcf9d88e65d5f436125907a9809a87feceb9bae75f3fbbdf437c6a97cd12dd6c SHA512 2000dddff2880066e975a386f2f998c340c494220901828d484a5faefb9a037ec6e5c15391878f7df34be7ad2ce785ad0d4b68d787ea069092b6dcbb30110b28
+EBUILD doctest-2.4.10.ebuild 687 BLAKE2B e35385d2c8b0a748c1d98be01c207816e6bc3a057aacfd292a6fb6d9b1e844f3e729aa4c3b3d618ae3c1bae297fca495e25b7243cb021f1586ec67b305187f48 SHA512 a473db364467a1b54c59a081b530acb8f82978b43a56b1d9b35639c18f055081edc5a6090be780c598d3d881348e5629d1cb16773630e09545e54e0bb3b754a8
 EBUILD doctest-2.4.9.ebuild 587 BLAKE2B eeaadb18066ff1f52907d6fb01625d72996e1f715640adc080b7f0d88ed9623d65f3baa9945657ea0991da3ca2e14ff518e846de272874e8f1de07577a0b205e SHA512 c16ece60b5c19a7b8c58fcc888942ffd6886f3c71154603df44d38cc491e6eab8bd17eacb20e29a6b4715ad71af48099a5b80e76b001dc8425be075686540dee
 MISC metadata.xml 471 BLAKE2B 530d91c53109b2e99bf3b5ef79fb1343f1cf37bc48aaae35da5468c304c8a2e38c439e79a43c139b5dca5dca8dd9231e7a9020b6f1f12d2074d92b95542bbf31 SHA512 5d143f4ba813a3de07351c5e45cec1aa66d395806fdbc9a04151c0adf1c74dff8192b7993d767e2e82da54090f7c3948ce33c747d6bd030333fc35329203083c
diff --git a/dev-cpp/doctest/doctest-2.4.10.ebuild b/dev-cpp/doctest/doctest-2.4.10.ebuild
index 1bfdf7c3187d..b2da0710bd8a 100644
--- a/dev-cpp/doctest/doctest-2.4.10.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.10.ebuild
@@ -15,6 +15,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	sed -i '/-Werror/d' scripts/cmake/common.cmake || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DDOCTEST_WITH_TESTS=$(usex test)
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index c9d2fa04c047..e7edebfa07ac 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -4,4 +4,4 @@ DIST kokkos-3.7.1.tar.gz 2305103 BLAKE2B c94493077190c1e5d2681d0e138012fcd82f91a
 EBUILD kokkos-3.1.01-r1.ebuild 1263 BLAKE2B 93ef4adfa0b71df2e57d324007d80f3617ca325b5e563eff9366b3204a69cf42ca1f83b65aebcde4e1022686d0c69097a9f2255308ec81ae0062820c81798b20 SHA512 286c9d2071ea2deb1d9f6ac1cb653eb710e2a45249cfc9c680313f13e93d754a2bd359ae28b52de7e6f6aadd06fefd146833b31cc3be31dabb4340816d3ddfb2
 EBUILD kokkos-3.7.0.ebuild 1286 BLAKE2B 01a2b841849d2b3e6e00829f779dcce4c9bd78059b7b3fb7a05c3c84e3bbaa6fc08ed27e4e6925e86dd01dadd711c438a42b79bdfe6be75865117323c944c282 SHA512 7efa2612300f61e3def706fc6fdcfe4c4c2949c47ad6d8e23005f90b24e00110f4074e281625d94a4b82d839b1dad67f1647e88530303463cf2729a3120c484b
 EBUILD kokkos-3.7.1.ebuild 1308 BLAKE2B dc5d1d7251615092dd920c516c60ee137a88f7813bb6cd334ed73814bad353e428f2270d02089f2ae1c19ce4c508fe914b62fe40ff22d97d21b0d379bdebc521 SHA512 47b34bb19939f7600a79fa5bd8e76eb90338c49c2cb184e36c059034ad71a35a42f0d034b8ee7e5d187bbddfeea3ec725647cc20577b63e028d2d0ea42d5740e
-MISC metadata.xml 362 BLAKE2B 42b6ce0648b9d2ec257dac9edb312aea7d13428e4989a5d627a501b7b572e0a2a928f07a8b5fec068b8e4f537ee44cec3f7c2f220b56872fa965728e86663723 SHA512 68a5381258ef869b7fe17ed928d5ebb2994ca55f9f543a9e9690c5eb7512f0cc2051389eda82492a7ed3d2888df17fc8df7989aad36fc960d07e8a60e104da79
+MISC metadata.xml 248 BLAKE2B cdc66ee780cce8b539d2c619893b5a5121982e3cde1ea6308f7795eac4b3d2247922b5900e7908213297c90bec9a63118312ee9349394becfc67a316aa3f5ca9 SHA512 276b07770aef3fc094cdf356ec54c492c34d515e426d47825a8a2df2331e71876b8a0f87f9549d279958e58a6624c1452092d9b185b4233a973096e1d1bd0301
diff --git a/dev-cpp/kokkos/metadata.xml b/dev-cpp/kokkos/metadata.xml
index 3f0d6861e854..41492a48020d 100644
--- a/dev-cpp/kokkos/metadata.xml
+++ b/dev-cpp/kokkos/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/dev-cpp/random123/Manifest b/dev-cpp/random123/Manifest
index 19d108f7698e..9fba7cf951ba 100644
--- a/dev-cpp/random123/Manifest
+++ b/dev-cpp/random123/Manifest
@@ -1,3 +1,3 @@
 DIST random123-1.14.0.tar.gz 318306 BLAKE2B 23248741359f0158fbb775ff723693c37c085b8acc1e162968555a5109abf0ac4e028f7731488b1bca385659f8f50f5c91b381f3ee6d1630ac7c62c41fadf2b4 SHA512 1c7d139193f5404e5d14d229f55e0a14b11de596a4cfbf0a39c1419f5ae146055dccc61e9430f724a2d7c1efb8bd01edb72866d4f4705508fcc6ebda6e90e91e
 EBUILD random123-1.14.0.ebuild 546 BLAKE2B 4a33ed0fe91d7513e865686eee86298e4183671b334a9c4193d96b54af275f47de29643ce061fb576282d8b9f51cdc9272731118dd776fdba6eb7cfb2e771348 SHA512 e64da0aac9268905a360b6002e563d15c2a2db6229fa594001b04cc8d5e4b0fd24cae3fd6fd5bec316d15dddcf68611ceddc67c53af34ce6bb31b594221e6198
-MISC metadata.xml 368 BLAKE2B 41a4fdcd35d6ab16960378ea85a83bd575875f47efd542967a0385dc259237dc774d0af238546b1a68f105e5181d4d96e441ef6e8a25d0e7c9ba40a0634a7c2f SHA512 728a27ced9c287be3b8647603d958330416cb601eb28c974d1b6ed95a8b611141ff272792cb2a098d931f9743f7a9cade84369017c982fd1a3bbdeeb69c1a02d
+MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/dev-cpp/random123/metadata.xml b/dev-cpp/random123/metadata.xml
index 125513d74f67..c0cd18916a93 100644
--- a/dev-cpp/random123/metadata.xml
+++ b/dev-cpp/random123/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9c9f85223509..67726d110f28 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 47af89f8c985..edbd96548bc9 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,3 +1,3 @@
 DIST pgcli-3.3.1.tar.gz 446637 BLAKE2B c7c946b905f72e18b06100012c32b332c278fcf6dab2bdd304972b5bd4936a2d3d2c1b2be23a9fd5f986afa14ed8a8f3b6a0a08703ec6142ee3bc3d1a2ece68d SHA512 01286ce62919a8845ca55b40851ad8c3832dba58d523ce2d953d555a60d2785b0129b76361e854574340cb1c0933c7b83eb03d7c2a7df81fbc4231dc42e45357
-EBUILD pgcli-3.3.1-r1.ebuild 970 BLAKE2B c40e4462b005f8a06c28eafc5792fa970520b8aadc74ba9a2a41bc9f12cf8d99bd56d3b0e600c510b0ed7f80f71e638af9a34d15425e7deb98b513ecb58ccf26 SHA512 72aaedff898dc26eee2eec77feb8e4defce6c9389394ee85657541ec159c3119c174bd3510f1ccdf616fde5ddb37b90506253197b571c867f42aae4b13ccec6c
+EBUILD pgcli-3.3.1-r2.ebuild 1002 BLAKE2B ae0b35cbc1e119f85752fee610b57f96eb8c98de46e289562d93cf7b0a285c872841197896fd271135ca67716fada9f51d0be02253955148aa2d8c1f5cc9b3ef SHA512 2f83dba7149914eb29b0572ede37046e2d6169fd1278cd6d0be573ff9a42089963ca69c19d1304ce752af76cf544a28e1a96a0b270554e61e0c5f96d0899a977
 MISC metadata.xml 359 BLAKE2B c8107f0af400492e5365311f645a91c0a56448f3f2983c470c8e8eb08126202f2b5895978971f5f77eec87bbe29e4f198d954dcd87b14b2cfa019fb98dbfe272 SHA512 bca1ac9cb841c4b17c07b6a581d54f860fe384ce139b9894fcdb442024f75ef7996ea55535be177472dc5149e1dd1cf4859181210bbcd637f6b82b8816334cc4
diff --git a/dev-db/pgcli/pgcli-3.3.1-r1.ebuild b/dev-db/pgcli/pgcli-3.3.1-r2.ebuild
index 924b39e0aeeb..65af71f16b94 100644
--- a/dev-db/pgcli/pgcli-3.3.1-r1.ebuild
+++ b/dev-db/pgcli/pgcli-3.3.1-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index a72be2951086..ddab8dba86a9 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 79b6993afa5c..1d6910ee6cb7 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,4 +1,7 @@
 AUX gputils-1.5.0-respect-flags.patch 4608 BLAKE2B 064b50907a9e403e5dedf1bdba947f235d2b66b62104494de2b1b3badcb02bd15f5df3c66dddec6580cacee46ed52bd12292bef8e98fa1da4f27cab25314a271 SHA512 ee63f6ec3a4f44bd10edc35cdb0c2c9f63d63cacd21a3dc5eb531776d0688f2865d1466fe143950fc8f3a878a7e7eb8f40eec343bfd6f77b7baa0eed90a8c7da
+AUX gputils-1.5.2-fix-invalid-operator.patch 908 BLAKE2B 56572734e417ce425542952b0a67aa13dbe0280e026d31b4a6775c7cb9eb8c8dcbb9b07e48719b45b5fa73baa6fba77b0c1b8384e5905a39d2d6c0320e22bdf0 SHA512 81152bb1138902907d496ebe303d06d3534382d0bc277a65fb38f53417cab04fe4f37caa373f281e16a8f8a7d4c522274ce3013e68dedcbe0880e0f09b8ff2de
 DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
+DIST gputils-1.5.2.tar.bz2 7231711 BLAKE2B c52bd75ee408b2ff98f63679b18834e8e41b5aea4f2b4b659860acb8fa4dd3f922aa6307f99ae0fc024a4fc6f56d3be262cd873cf112ebac444d41eeca635d3b SHA512 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc
 EBUILD gputils-1.5.0.ebuild 809 BLAKE2B 55f69b85e0ad845bd1f2ab6bf16d9267e09a66bc7b258b137a541aa0f2096445a528275eb2e2f8eef5a73813f84756ec295209f5baaccd04b313acbd7860d787 SHA512 cc30ee6fe9c71e6a8e2a42f5faf91e385c6713e6833abc25115ab347bff09f64a2729516aa1a56f59d1a265bbfa89c27b7e75c5b88189d01b829f0fe3735ac90
+EBUILD gputils-1.5.2.ebuild 992 BLAKE2B c06150fceaf6b6ccc9f7087f0d8b314e5e74032d12d163f65ab45b47b00a7536a5ff6196fa2b9c436520701ea371407dbbad300613359731bcd1964489b5b567 SHA512 cf747f7892a4357805d9dcd04d16800b7c8a73ad935fb9fdf0d6b4c0765f34991c012958fe4962a10d47a4080a8f32169dbe1f20acf765247f51634830fec2d9
 MISC metadata.xml 329 BLAKE2B 34b2d2759758806cc11494ac1ff80f04d307c4f825a7d4fac2c49cdc313f6cef2a73975c110a2ec2b5950d289812f14b3e7af29fb210c6362896054669813f95 SHA512 aa1a82ff6a8fc75841cce40006d7cb8a0a7e6b65b4135b31b69781820b437ac033f2fd32aa056557cf19bf107892fda0dc4e39f2bcaa95a96673c194f4dac776
diff --git a/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch b/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch
new file mode 100644
index 000000000000..ec2d8d425832
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch
@@ -0,0 +1,25 @@
+Fix invalid operator in dash
+
+Some shells, like dash, don't support [ x == x ], reporting invalid syntax,
+and silently failing.
+
+--- gputils-1.5.2.orig/doc/html-help/Makefile.am
++++ gputils-1.5.2/doc/html-help/Makefile.am
+@@ -7,7 +7,7 @@
+ pkgdatadir = @GPUTILS_HTMLDOC_PATH@
+ 
+ html-doc:
+-	if [ "$(ENABLE_HTML_DOC)" == "yes" ]; then \
++	if [ "$(ENABLE_HTML_DOC)" = "yes" ]; then \
+ 	  if [ ! -e $(DEFAULT_MPLABX_PATH)/mpasmx/8bit_device.info ]; then \
+ 	    @echo "Can't find mplabx installation; HTML documentation will not be built."; \
+ 	  else \
+@@ -18,7 +18,7 @@
+ install: install-html
+ 
+ install-html:
+-	if [ "$(ENABLE_HTML_DOC)" == "yes" ]; then \
++	if [ "$(ENABLE_HTML_DOC)" = "yes" ]; then \
+ 	  if [ -n "$$(ls *.html 2>/dev/null)" -a -n "$$(ls *.css 2>/dev/null)" ]; then \
+ 	    $(install_sh) -d "$(DESTDIR)$(pkgdatadir)"; \
+ 	    $(install_sh) -c -m 644 *.css *.html "$(DESTDIR)$(pkgdatadir)"; \
diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild
new file mode 100644
index 000000000000..11fb1036b9e4
--- /dev/null
+++ b/dev-embedded/gputils/gputils-1.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs flag-o-matic
+
+DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
+HOMEPAGE="https://gputils.sourceforge.io"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}"/gputils-1.5.2-fix-invalid-operator.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug #369291, bug #818802
+	tc-ld-disable-gold
+
+	# Their configure script tries to do funky things with default
+	# compiler selection.  Force our own defaults instead.
+	tc-export CC
+
+	# LTO currently causes various segfaults in dev-embedded/sdcc
+	# sys-devel/gcc-11.3.0 '-O3 -flto'
+	filter-flags '-flto*'
+
+	local myeconfargs=(
+		$(use_enable doc html-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	use doc && dodoc doc/gputils.pdf
+}
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index d6523c5a30d9..4b6c43d8d1d5 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -7,5 +7,5 @@ DIST rpi-eeprom_15.0-1.debian.tar.xz 10720 BLAKE2B c8915ebf859ebb1ea3a48af807753
 DIST rpi-eeprom_15.0.orig.tar.gz 29800286 BLAKE2B ceda9bdc412a32443d0cb3fa444d1091f0f53215a5be6c546384a11f7fa28592d43bdf23f04a33925601b5e76e510b054b214d262904f03aafa2b959fcb5fc1e SHA512 eddea0c8057e13991e3a6493146c8785607162342321d48048ba5760ecc7f1c6687a03edffcd0be4a5549c333cdbb20e88d407c4212334e18178fb86cc6cd0a4
 EBUILD rpi-eeprom-13.19_p1.ebuild 3027 BLAKE2B 323eab5c94ec1fac5fec8d406fe139591ce84efec369a767e4273e8ca0e50c86380761647e532289f22532cf2c5475768930271dbeb43ad415838ce2046729cc SHA512 5fd6dcd2b4c77205b5eaf4f09a7b15e04e763cbbe8626a6ac17e963a25c488aa3278c01ac608f9562ccd7d86102f3b3f10e0dab72224b3b8da047593ed65144b
 EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3026 BLAKE2B 72c61ab593f46f2487572c555f0a11c1041e1e3b4b757a6720f38c4a4f82702e0b910062fc64cf41ff54183e735c05b98e72d3ea414d44fc6f752470a0eb94c1 SHA512 12f1be8fc9dfeee1c42b9334c3a420d02e1ad1e416f701f032f75bc85e07015dce037c09e254a391615b9b57d17ee2b7b8d72bbebc648049185a319303975379
-EBUILD rpi-eeprom-15.0_p1.ebuild 3027 BLAKE2B 323eab5c94ec1fac5fec8d406fe139591ce84efec369a767e4273e8ca0e50c86380761647e532289f22532cf2c5475768930271dbeb43ad415838ce2046729cc SHA512 5fd6dcd2b4c77205b5eaf4f09a7b15e04e763cbbe8626a6ac17e963a25c488aa3278c01ac608f9562ccd7d86102f3b3f10e0dab72224b3b8da047593ed65144b
+EBUILD rpi-eeprom-15.0_p1.ebuild 3026 BLAKE2B 0a13aead8a68667d57fb7e1c8c6f56e295bb8af5e9f5192d5c48357ce04eedac1e1436c7152ed97dcebbf63e9aa52ee3c3de25711bdbcdd2788d2280457198aa SHA512 ea55d6f16ba4c41fc911f075236e59bac65080485d4cb39556843fb9f6f928444697b02ce4be5e75b125f69bcf802c1d33ed0e1f49118f1c611fa491ac089c93
 MISC metadata.xml 596 BLAKE2B 075812117456e8457ad55e184a322ff86f8bc18a8470fcd52d63ec20e88c81db064ff5f6b023e7400d51d603886cb154a0a1485613cb326b8897f99c5c06c330 SHA512 9ebe09182734a60c3ed3a9e30b2cf9b9433f546e1f4cfc9d75b48813e61dc875b71593300e6bc628650cfbae49fc722713cfc88c8e0a387efe0dd6cca991fa2f
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild
index aa705d4d9dbc..528bfc276e3a 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD rpi-eeprom"
 SLOT="0"
-KEYWORDS="~arm ~arm64"
+KEYWORDS="~arm arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-apps/help2man"
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index fbab09d7eeff..672a94c903ce 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,12 +1,16 @@
 AUX sdcc-3.8.0-override-override.patch 1078 BLAKE2B f1e1e135b9ee972e8f7f6a08af736de227c8534d181f160b00f6eecef0e7f4366e39fc5a8f6034bfffa64531423d28377c778055d6be8671527971ce183ebab5 SHA512 fbc13832bea859409f2ae525a82927424dd474db9c6077d1311b9775d0a4a8728d79db7465c928271faa54221b53982ee539537e4fe8a70209c0f453b95105aa
+AUX sdcc-4.2.0-link-tinfo.patch 916 BLAKE2B 7930cf615dbf0be6f44581e0e59d5c8ed59d5ae204153b2b08a2bfb6af8ef69b01fa1584c95dc194881d843edad8bc39dc85ca8b597e120828e49ae30b2c6c74 SHA512 b4ab00ed63be3dad5c0250ce8cd3301830ac2a65f4b8d9034151e285b93057357249a19b9d521f1cfd62173d97baa37a69c7e56d1b0423f9edc2e84b368fcad5
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
 DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff
 DIST sdcc-doc-4.1.0.tar.bz2 991207 BLAKE2B fd1ab82c8cc65031a8231bc4aba1e0562ed4b3178612a4d915568cb5600ba9159d89f905e261e860da9e0f4aa5a24fbd7ab1364f2f9f7b3078bcf3aa01d71ba5 SHA512 01686e590d0168108099d3c6c9bdb0885a25abccc9b6c87739eafec7103054424da1a5960a8d4566462dca9bf00cdd8b103ab6026523833d9aaa4d4bcdc5b620
+DIST sdcc-doc-4.2.0.tar.bz2 1244684 BLAKE2B d6ee4001ee0d2dde61dd1e8567499909fa6373eac93f3731fa1d6628f6e488742cc0798b1ebb908769d4cc52e091d4d685b3891d7c15a519294240643e528b02 SHA512 8494de35991e9a38ca138545b7c2396d353b21d67a4f321afa9187a5c117c6ce7d3c0850e95c981ccc7a3c8fa1e470f5e2351b84ccbe1634b1f8bf085cd45f76
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
 DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c
 DIST sdcc-src-4.1.0.tar.bz2 19400609 BLAKE2B 9754d70026af595a5456f0d7c1b375df2716c6400ca59affcadbfd3588f4d51c45a3d52c235d6efc9b7512b5f94f023d8d2964cc0365cdff4586edf71fc51af1 SHA512 a9c3fee427cbc66b56a286c8d66b2922f79c9dfb42d2ed2843b2e192a6b314a04de4c82f1083d8625b49756b5f1d99f8fb706402b5f1284110760ec346303779
+DIST sdcc-src-4.2.0.tar.bz2 19662367 BLAKE2B a11d6b3af2552e0508bb1d0644d3e6db385634237fc93079716a5e3aa710bac25fd888e10dce76e6891ebe524f4d81d8318492001d8ce9ade0ef16d114adf14b SHA512 7ca4037d526b5fed7bbca4433835d0299ced7315dd69c1ec66cff873ec7caa41b69927363bf5850e2ad4f27ef6286e57f9ccd40bb6792308be6c3073c5238cba
 EBUILD sdcc-3.8.0-r1.ebuild 3186 BLAKE2B 4a0842eb50c5f77947fef50a36482e47e76c25b4994833f5c14e42018c7b5ea3ab77768df15d49886c1e9250ac19e630a95d78a6241cd87e02bbbdafb4367292 SHA512 147127a0e997cb3ce1a53b0cd0990992d6837016dcde7368bf44a2fd35b6647b43224dbcd309660e454e6bcd26921d41d642530e616e5bc2fec4a0eeef8f8d28
 EBUILD sdcc-4.0.0.ebuild 3469 BLAKE2B 04dcac4dba5a07ad9cdddf14e7d313a27f4b28db7903364af17e1cfdf1ef704cb03ac0d2eba980fc97791f3c0b5ce355fa36cd60e0adae45be41d35f94de790d SHA512 65402da6ea8cbff4101109cb9ee53319f770b0603572488ff7c71e60812ca7a2c7868e19275217738fea161d0babb6c44ace3483276236671ff8d710ea580121
 EBUILD sdcc-4.1.0.ebuild 3625 BLAKE2B 983887350f4251ecf1f6d327fc7630e027804439763ab94e765064356f6edf2274ac2f2de363b57fe3a1cb553bcdc55dfcb3f1c6ed49f6355a9c7bbaa4c00811 SHA512 6870daa87d27afa8f196d96e76e2a81eee2137c523389f1955b4b623750f3372c430cb24dc66adb76bf482b14219a373b9c43441230e45306e2a047243e8b2bd
-EBUILD sdcc-9999.ebuild 3625 BLAKE2B 983887350f4251ecf1f6d327fc7630e027804439763ab94e765064356f6edf2274ac2f2de363b57fe3a1cb553bcdc55dfcb3f1c6ed49f6355a9c7bbaa4c00811 SHA512 6870daa87d27afa8f196d96e76e2a81eee2137c523389f1955b4b623750f3372c430cb24dc66adb76bf482b14219a373b9c43441230e45306e2a047243e8b2bd
-MISC metadata.xml 2702 BLAKE2B 5d7eff47a0c5a01e9653d127679cfac908d07a95f720febd6ffece94e0877c43023737ab286dc5f1361a51b1c85eb4e0413757c3d76f28e70359e8469333321c SHA512 1e01dbeefb8ba8565b89807cf471e3fbc9f167d2411d87908b6813cd7aa6da39d2a6357a72fe69fb9c41f80e9c4cc37e8c42fa26ccdd02157184a82ab3d6be63
+EBUILD sdcc-4.2.0.ebuild 4003 BLAKE2B 073c89d4206df22ea4be8893d07249d742e6c217a0f1af358abd659cd0a0578af3e6bf73dc9cbc1fc7717f2ea26128004104fb0ca500dafb7b992e2afb13a617 SHA512 4b0a8e632a72ddcc64642d7f22541bddc0b41627ae78b3316365e6b0ba8e243ed308fa4559ac517f4d56600f38ba71dd08f578f966aa4421808c7996218b6dc6
+EBUILD sdcc-9999.ebuild 4003 BLAKE2B 073c89d4206df22ea4be8893d07249d742e6c217a0f1af358abd659cd0a0578af3e6bf73dc9cbc1fc7717f2ea26128004104fb0ca500dafb7b992e2afb13a617 SHA512 4b0a8e632a72ddcc64642d7f22541bddc0b41627ae78b3316365e6b0ba8e243ed308fa4559ac517f4d56600f38ba71dd08f578f966aa4421808c7996218b6dc6
+MISC metadata.xml 3045 BLAKE2B 02b5834889994a4b1426244e087a7593b29de3ac0c29004492e4f466c76980fd448c15258d0bd29cddfd691a5f78ba653fea1bc1f42ad4d5b31afb83ad403b3e SHA512 55ecbf5774eb8b58304d97db64875984d4e016e9ba0476d4a5df94dca28baed1bd4eeead7e54885a33d9b9bd1ebbcb47846ac99f62fca3f11adb03d68880da47
diff --git a/dev-embedded/sdcc/files/sdcc-4.2.0-link-tinfo.patch b/dev-embedded/sdcc/files/sdcc-4.2.0-link-tinfo.patch
new file mode 100644
index 000000000000..a8f4ae7565bc
--- /dev/null
+++ b/dev-embedded/sdcc/files/sdcc-4.2.0-link-tinfo.patch
@@ -0,0 +1,24 @@
+Link -ltinfo for ucsim
+
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: /var/tmp/portage/dev-embedded/sdcc-4.2.0/temp/cc3R2ckl.ltrans0.ltrans.o: undefined reference to symbol 'nodelay'
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: /lib64/libtinfo.so.6: error adding symbols: DSO missing from command line
+
+--- sdcc-4.2.0.orig/sim/ucsim/configure.ac
++++ sdcc-4.2.0/sim/ucsim/configure.ac
+@@ -405,14 +405,14 @@
+   if test $curses_ok != yes; then
+     AC_CHECK_LIB(curses,nl,
+       curses_ok="yes"
+-      CURSES_LIBS="${CURSES_LIBS} -lcurses",
++      CURSES_LIBS="${CURSES_LIBS} -lcurses -ltinfo",
+       curses_ok="no")
+   fi
+ 
+   if test $curses_ok != yes; then
+     AC_CHECK_LIB(ncurses,nl,
+       curses_ok="yes"
+-      CURSES_LIBS="${CURSES_LIBS} -lncurses",
++      CURSES_LIBS="${CURSES_LIBS} -lncurses -ltinfo",
+       curses_ok="no")
+   fi
+ fi
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index 573753d73430..c4bc3f3380ae 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -6,12 +6,14 @@
 		<name>Embedded Gentoo</name>
 	</maintainer>
 	<longdescription>
-SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the
-Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
-(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based
-(hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit
-3000A, TLCS-90) and STMicroelectronics STM8. It can be retargeted for other
-microprocessors.
+SDCC is a retargettable, optimizing Standard C (ANSI C89, ISO C99, ISO C11)
+compiler suite that targets the Intel MCS51 based microprocessors (8031, 8032,
+8051, 8052, etc.), Maxim (formerly Dallas) DS80C390 variants, Freescale
+(formerly Motorola) HC08 based (hc08, s08), Zilog Z80 based MCUs (Z80, Z180,
+SM83, Rabbit 2000, 2000A, 3000A, TLCS-90), Padauk (pdk14, pdk15) and
+STMicroelectronics STM8. Work is in progress on supporting the Padauk pdk13 and
+MOS 6502 targets; Microchip PIC16 and PIC18 targets are unmaintained. SDCC can
+be retargeted for other microprocessors.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sdcc</remote-id>
@@ -35,6 +37,7 @@ microprocessors.
 		<flag name="r2ka">Add support for Rabbit 2000A</flag>
 		<flag name="r3ka">Add support for Rabbit 3000A</flag>
 		<flag name="gbz80">Add support for Gameboy gbz80</flag>
+		<flag name="sm83">Add support for Gameboy SM83</flag>
 		<flag name="tlcs90">Add support for TLCS-90</flag>
 		<flag name="ez80-z80">Add support for EZ80-Z80</flag>
 		<flag name="z80n">Add support for Zilog Z80N</flag>
@@ -49,5 +52,7 @@ microprocessors.
 		<flag name="pdk14">Add support for PDK14</flag>
 		<flag name="pdk15">Add support for PDK15</flag>
 		<flag name="pdk16">Add support for PDK16</flag>
+		<flag name="mos6502">Add support for MOS 6502</flag>
+		<flag name="mos65c02">Add support for MOS 65C02</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-embedded/sdcc/sdcc-4.2.0.ebuild b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
new file mode 100644
index 000000000000..dc4655403f3d
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
+	inherit subversion
+else
+	SRC_URI="
+		https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2
+		doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
+	"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Small device C compiler (for various microprocessors)"
+HOMEPAGE="https://sdcc.sourceforge.net/"
+
+LICENSE="
+	GPL-2 ZLIB
+	non-free? ( MicroChip-SDCC )
+	packihx? ( public-domain )
+"
+SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
+SDCC_PORTS="
+	mcs51
+	z80 z180
+	r2k r2ka r3ka
+	sm83
+	tlcs90
+	ez80-z80
+	z80n
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
+	mos6502 mos65c02
+"
+IUSE="
+	${SDCC_PORTS}
+	+boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
+"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=
+	pic14? ( >=dev-embedded/gputils-0.13.7 )
+	pic16? ( >=dev-embedded/gputils-0.13.7 )
+	boehm-gc? ( dev-libs/boehm-gc:= )
+	sdcdb? ( sys-libs/readline:0= )
+	ucsim? ( sys-libs/ncurses:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+PATCHES=(
+	"${FILESDIR}"/sdcc-3.8.0-override-override.patch
+	"${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch
+)
+
+src_prepare() {
+	# Fix conflicting variable names between Gentoo and sdcc
+	find device/lib/pic{14,16} device/non-free/lib/pic{14,16} \( \
+			-name 'configure.ac' -o -name 'Makefile.*' \) \
+		-exec sed -i 's/\<ARCH\>/SDCC_&/g' {} + || die
+	find device -name 'Makefile.in' \
+		-exec sed -i 's/\<PORTDIR\>/SDCC_&/g' {} + || die
+	# Possible alternative: Patch the following files to not pick up the
+	# variables from the environment:
+	# - lib/Makefile.in (PORTDIR ifndef/endif)
+	# - device/non-free/lib/pic14/Makefile.common.in (ARCH ?= 877)
+	# - device/non-free/lib/pic16/configure.ac (${ARCH:-18f452})
+	# - device/lib/pic14/configure.ac (${ARCH:-16f877})
+	# - device/lib/pic16/configure.ac (${ARCH:-18f452})
+
+	# Make sure timestamps don't get messed up.
+	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
+
+	default
+	eautoreconf
+
+	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+	touch support/sdbinutils/bfd/doc/bfdver.texi || die
+	touch support/sdbinutils/bfd/doc/bfd.info || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		ac_cv_prog_STRIP=true
+		--without-ccache
+		--enable-sdbinutils
+
+		$(use_enable ucsim)
+		$(use_enable device-lib)
+		$(use_enable packihx)
+		$(use_enable sdcpp)
+		$(use_enable sdcdb)
+		$(use_enable non-free)
+		$(use_enable boehm-gc libgc)
+
+		$(use_enable mcs51 mcs51-port)
+		$(use_enable z80 z80-port)
+		$(use_enable z180 z180-port)
+		$(use_enable r2k r2k-port)
+		$(use_enable r2ka r2ka-port)
+		$(use_enable r3ka r3ka-port)
+		$(use_enable sm83 sm83-port)
+		$(use_enable tlcs90 tlcs90-port)
+		$(use_enable ez80-z80 ez80_z80-port)
+		$(use_enable z80n z80n-port)
+		$(use_enable ds390 ds390-port)
+		$(use_enable ds400 ds400-port)
+		$(use_enable pic14 pic14-port)
+		$(use_enable pic16 pic16-port)
+		$(use_enable hc08 hc08-port)
+		$(use_enable s08 s08-port)
+		$(use_enable stm8 stm8-port)
+		$(use_enable pdk13 pdk13-port)
+		$(use_enable pdk14 pdk14-port)
+		$(use_enable pdk15 pdk15-port)
+		$(use_enable pdk16 pdk16-port)
+		$(use_enable mos6502 mos6502-port)
+		$(use_enable mos65c02 mos65c02-port)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# Sanity check, as gputils errors/segfaults don't cause make to stop
+	local libs=()
+	use pic14 && libs+=( device/lib/build/pic14/libsdcc.lib )
+	use pic16 && libs+=( device/lib/build/pic16/libsdcc.lib )
+	for lib in "${libs[@]}"; do
+		[[ -f "${lib}" ]] || die "Failed to build ${lib}"
+	done
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt
+	find "${ED}" -type d -name .deps -exec rm -vr {} + || die
+
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -r *
+	fi
+}
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 9b5bf53b05db..dc4655403f3d 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
 	inherit subversion
 else
 	SRC_URI="
-		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+		https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2
+		doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
 	"
-	S="${WORKDIR}/sdcc"
 
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
+HOMEPAGE="https://sdcc.sourceforge.net/"
 
 LICENSE="
 	GPL-2 ZLIB
@@ -29,11 +28,10 @@ LICENSE="
 SLOT="0"
 # in order of configure.ac's AC_DO_PORT stanzas
 SDCC_PORTS="
-	avr
 	mcs51
 	z80 z180
 	r2k r2ka r3ka
-	gbz80
+	sm83
 	tlcs90
 	ez80-z80
 	z80n
@@ -43,47 +41,45 @@ SDCC_PORTS="
 	s08
 	stm8
 	pdk13 pdk14 pdk15 pdk16
+	mos6502 mos65c02
 "
 IUSE="
 	${SDCC_PORTS}
-	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
+	+boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
 "
 
-for port in ${SDCC_PORTS}; do
-REQUIRED_USE="${REQUIRED_USE}
-	${port}? ( sdbinutils )
-"
-done
-REQUIRED_USE="${REQUIRED_USE}
-	|| ( ${SDCC_PORTS} )
-"
-
-RESTRICT="strip"
-
 RDEPEND="
 	dev-libs/boost:=
-	sys-libs/ncurses:=
-	sys-libs/readline:0=
+	sys-libs/zlib:=
 	pic14? ( >=dev-embedded/gputils-0.13.7 )
 	pic16? ( >=dev-embedded/gputils-0.13.7 )
 	boehm-gc? ( dev-libs/boehm-gc:= )
-	!dev-embedded/sdcc-svn
+	sdcdb? ( sys-libs/readline:0= )
+	ucsim? ( sys-libs/ncurses:= )
 "
 DEPEND="
 	${RDEPEND}
 	dev-util/gperf
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
+	"${FILESDIR}"/sdcc-3.8.0-override-override.patch
+	"${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch
 )
 
 src_prepare() {
 	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
+	find device/lib/pic{14,16} device/non-free/lib/pic{14,16} \( \
+			-name 'configure.ac' -o -name 'Makefile.*' \) \
+		-exec sed -i 's/\<ARCH\>/SDCC_&/g' {} + || die
+	find device -name 'Makefile.in' \
+		-exec sed -i 's/\<PORTDIR\>/SDCC_&/g' {} + || die
+	# Possible alternative: Patch the following files to not pick up the
+	# variables from the environment:
+	# - lib/Makefile.in (PORTDIR ifndef/endif)
+	# - device/non-free/lib/pic14/Makefile.common.in (ARCH ?= 877)
+	# - device/non-free/lib/pic16/configure.ac (${ARCH:-18f452})
+	# - device/lib/pic14/configure.ac (${ARCH:-16f877})
+	# - device/lib/pic16/configure.ac (${ARCH:-18f452})
 
 	# Make sure timestamps don't get messed up.
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
@@ -98,60 +94,65 @@ src_prepare() {
 }
 
 src_configure() {
-	# sdbinutils subdir doesn't pass down --docdir properly, so need to
-	# expand $(datarootdir) ourselves.
-	econf \
-		ac_cv_prog_AR="$(tc-getAR)" \
-		ac_cv_prog_AS="$(tc-getAS)" \
-		ac_cv_prog_STRIP=true \
-		$(use_enable boehm-gc libgc) \
-		$(use_enable device-lib) \
-		$(use_enable non-free) \
-		$(use_enable packihx) \
-		$(use_enable sdbinutils) \
-		$(use_enable sdcdb) \
-		$(use_enable sdcpp) \
-		$(use_enable ucsim) \
-		\
-		$(use_enable avr avr-port) \
-		$(use_enable mcs51 mcs51-port) \
-		$(use_enable z80 z80-port) \
-		$(use_enable z180 z180-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r2ka r2ka-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable tlcs90 tlcs90-port) \
-		$(use_enable ez80-z80 ez80_z80-port) \
-		$(use_enable z80n z80n-port) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable s08 s08-port) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable pdk13 pdk13-port) \
-		$(use_enable pdk14 pdk14-port) \
-		$(use_enable pdk15 pdk15-port) \
-		$(use_enable pdk16 pdk16-port) \
-		\
-		--disable-doc \
+	local myeconfargs=(
+		ac_cv_prog_STRIP=true
 		--without-ccache
+		--enable-sdbinutils
+
+		$(use_enable ucsim)
+		$(use_enable device-lib)
+		$(use_enable packihx)
+		$(use_enable sdcpp)
+		$(use_enable sdcdb)
+		$(use_enable non-free)
+		$(use_enable boehm-gc libgc)
+
+		$(use_enable mcs51 mcs51-port)
+		$(use_enable z80 z80-port)
+		$(use_enable z180 z180-port)
+		$(use_enable r2k r2k-port)
+		$(use_enable r2ka r2ka-port)
+		$(use_enable r3ka r3ka-port)
+		$(use_enable sm83 sm83-port)
+		$(use_enable tlcs90 tlcs90-port)
+		$(use_enable ez80-z80 ez80_z80-port)
+		$(use_enable z80n z80n-port)
+		$(use_enable ds390 ds390-port)
+		$(use_enable ds400 ds400-port)
+		$(use_enable pic14 pic14-port)
+		$(use_enable pic16 pic16-port)
+		$(use_enable hc08 hc08-port)
+		$(use_enable s08 s08-port)
+		$(use_enable stm8 stm8-port)
+		$(use_enable pdk13 pdk13-port)
+		$(use_enable pdk14 pdk14-port)
+		$(use_enable pdk15 pdk15-port)
+		$(use_enable pdk16 pdk16-port)
+		$(use_enable mos6502 mos6502-port)
+		$(use_enable mos65c02 mos65c02-port)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# Sanity check, as gputils errors/segfaults don't cause make to stop
+	local libs=()
+	use pic14 && libs+=( device/lib/build/pic14/libsdcc.lib )
+	use pic16 && libs+=( device/lib/build/pic16/libsdcc.lib )
+	for lib in "${libs[@]}"; do
+		[[ -f "${lib}" ]] || die "Failed to build ${lib}"
+	done
 }
 
 src_install() {
 	default
 	dodoc doc/*.txt
-	find "${D}" -name .deps -exec rm -rf {} + || die
+	find "${ED}" -type d -name .deps -exec rm -vr {} + || die
 
 	if use doc && [[ ${PV} != "9999" ]]; then
 		cd "${WORKDIR}"/doc
 		dodoc -r *
 	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	dostrip -x /usr/bin
 }
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 942402d9df94..a00bbf90290d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index d39f403eb502..9e785994920b 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,5 @@
 DIST byte-buddy-1.12.21.tar.gz 1931819 BLAKE2B 6b37b21d5f31c1564a3cc4d30870a7eca3c4c0512815db881a20602dc7ac970145dd9cc2bd6af4f2fdca0ff542b43dc675376c91f7ea7fdf3ea306112eba842b SHA512 9513caa9a5fc0924aea46e8de21ad2ad90320a582ad17be93f6305eb27f98d3af2c3fa09565083b5d97c0d9f0a1b0a9c7105738c4b65616e78bf2e7657c4ee76
+DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
 EBUILD byte-buddy-1.12.21.ebuild 4845 BLAKE2B 1464adfb8d4e25f149a6125e95b2b1befceb4963f66df40d42546fc39874aeb70b93949616afee90098b2b473daa8e53cb7c2047399ff9bbf74902ca00cebe8f SHA512 4c1a8dec6ea9a423b5dd45926322c431347631ec50223cae1a0ba63b9667d361c44dc3118b5a2da4a9c6dbc7a5070b0b6e04adbb2fccf48a429169dbb36b5a19
+EBUILD byte-buddy-1.14.0.ebuild 4849 BLAKE2B 72a46c884f59290637f485db774fc112e61aad43d47d6740df11e9bfede3a1ac6bda8816ea0f43f3c52060f4892432478ec5db2b786553dfd948ca314125e816 SHA512 59b2a36dc62527739442a201363536c6a92860968990c3562af97caafef0dafd387d5f708e14efd6de0e0ca2b42922a1499a75f27fdb03e5ac795917fbc9f54f
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
new file mode 100644
index 000000000000..f1f274b658eb
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/asm:9
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	dev-java/jsr305:0
+	test? (
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/byte-buddy-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+	asm-9
+	findbugs-annotations
+	jsr305
+	jna-4
+"
+
+src_prepare() {
+	default
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy.agent {
+			requires java.instrument;
+			requires static jdk.attach;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			exports net.bytebuddy.agent;
+			exports net.bytebuddy.agent.utility.nullability;
+		}
+	EOF
+
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
+	local exports="$( \
+		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
+		byte-buddy/pom.xml \
+		| sed -e 's:^:exports :' -e 's:,:;:' \
+		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
+		)" || die
+	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy {
+			requires static java.instrument;
+			requires static java.management;
+			requires static jdk.unsupported;
+			requires static net.bytebuddy.agent;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			${exports}
+		}
+	EOF
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+	einfo "Compiling byte-buddy.jar"
+	JAVA_JAR_FILENAME="byte-buddy.jar"
+	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_SRC_DIR="byte-buddy/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		rm byte-buddy-agent/src/main/java/module-info.java || die
+		JAVA_SRC_DIR=(
+			"byte-buddy-agent/src/main/java"
+			"byte-buddy/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+	# @Ignore one of 4 tests, https://bugs.gentoo.org/863386
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testIgnoreExistingField()/i @Ignore' \
+		-i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
+
+	# @Ignore one of 39 tests, https://bugs.gentoo.org/863386
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testNoParameterNameAndModifiers()/i @Ignore' \
+		-i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
+
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+	einfo "Testing byte-buddy-agent"
+	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy"
+	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+	JAVA_TEST_EXCLUDES=(
+		# all tests in this class fail, https://bugs.gentoo.org/863386
+		net.bytebuddy.build.CachedReturnPluginTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg_dojar "byte-buddy.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy/src/main/java/*"
+	fi
+}
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index fca8d6cc5fbc..6ac3f8c4f4bf 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,5 +1,7 @@
-DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
-DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1571 BLAKE2B 735ce68ad35184b309031f339deb652161acd3491fe0de6cc3c57a3b214fce63d6aa24517c5d30db4df42bf17822324c7e731dea2ccc247d98287a46569d6dc0 SHA512 aa726b74aefbba61c8678cba3edde77930f6747dbd999860262e3fca731bcc337eab792ba35136116da965fb61d6434dcf1af11f814b1be564de258c29b90cac
-EBUILD jakarta-activation-api-2.1.0-r1.ebuild 1043 BLAKE2B bb91273f1543ede3541b5f145c00c5af91b40352228b96b1552d6a5f22dc9b03b34c6bfc1490d4f7f45922581226298e978a6866e722a0e78b5b103c10a578f0 SHA512 2c80f897c060da4ee53e817f2e08ce54a585ddcc979c83d48468dfd4d04c9373410192e9bfc8fb68004031ef7dae3c8a6ed8fa8bc167b4396006c275db59c62a
-MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6979bb48df7a84d5a2f302ceb56d21f4242042eef2408cfdcaccdc3fe76b78d5c417e49010885b7bf0a8955b080647cece175 SHA512 753437cfeb03ad15a66ec6895a992aba453cb4eea84042f31ed50c0b59b1299578bf1a8341d29fdf6bc5619d3a40233bf29b66aa5203ed54f295dc321a3fd6aa
+DIST jakarta-activation-api-2.1.1.tar.gz 127696 BLAKE2B d0f89e64a02fa88e251ab6f5eafa1001c987147c2163862e270b36e86c7c811bb32bfbab1aba32c8c4b8e7eab4eeed7478618974191b2f5386a0194a6a556a19 SHA512 95dd5b6696cf3ec66ce843334375740057c37dc5b4503173f607c95bd6020e8d0b8f87ec13b6d9be4d397096300cc0acb323b5700ad7ff0428a178272c1da41f
+EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1318 BLAKE2B 71bb89fe608cd872d7e64983e23fb95d872c48b15c084578e1b9ee75fa3d0f082d683b3cd1cbe37878273c1dfd2a41ff503f4386a22bd02b29f2fa5e061b6417 SHA512 0bbc0afb65d84e25ee3fd9ea64fc9c629581f7553cc22c0b5c09a91cf272e4c60b7a6d352c88c4f8441d139849edbfd644b05f4595353f586578b80935df16fb
+EBUILD jakarta-activation-api-2.1.0-r1.ebuild 701 BLAKE2B c2db36550fec9ac2ff7cd6fc12d8e3fde9d9763ab8044844d339533374593306f86e2ab1e5817a9441a6eff9aebdcd670e17317d3f25d72a3fd9daa99d73d8f3 SHA512 0cbfff8f7e559bda9b6ec241c0c17624d1cb7b932396c580db35d670a5c83de65472f277b5ad357b97290d35297efd3818671f5d1331dbf894eb04c339f4d730
+EBUILD jakarta-activation-api-2.1.1.ebuild 685 BLAKE2B cf9bf5c347d2ee9fb967c94bf1b986a0638f24c178e43ddb632ac4713daadef55f17a9e988feee0742bd60369945b68b349117e7061cbc99a26b993f4d545746 SHA512 ed4f4db86ca59c4d2643f197c36e3f7463bcea76c68a0855251dd4177282746716b8fff9addf813a6498153504d035ca89a1119d51e171157d904dac7af31f32
+MISC metadata.xml 364 BLAKE2B 448ad0f93216312753658b97fd1cd9ff50754cec6a892f36e228e515be0a360318fed182eb99b131d3ccece5e65bc09a0ec9ab6759a412e0a5f9de68b2c1557c SHA512 98caf2cfedd7ec5bbd34d650db5377ede7e44c3d2f359cb7e86f0412c2962f7a677761002910db9692cba6831a108e819888dce270eb63ed75d73d4835a580b3
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
index 459fa0f06282..20b19ae30fba 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom jaf-1.2.2/activationapi/pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-api-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,8 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -25,7 +22,7 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 JAVA_ENCODING="iso-8859-1"
 
@@ -33,7 +30,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	# these files are not present in the upstream jar
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
@@ -45,7 +42,6 @@ src_compile() {
 }
 
 src_install() {
-	default
 	# we remove the implementation sources so that they don't land in sources
 	rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources"
 	java-pkg-simple_src_install
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
index 2b6b9f6729b6..91741f54c08c 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
 
 LICENSE="EPL-1.0"
 SLOT="2"
@@ -24,12 +22,5 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/api"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
new file mode 100644
index 000000000000..bf58d5636275
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation API jar"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation-api/metadata.xml b/dev-java/jakarta-activation-api/metadata.xml
index 947a81e39af4..26d86f56dec0 100644
--- a/dev-java/jakarta-activation-api/metadata.xml
+++ b/dev-java/jakarta-activation-api/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
-		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+		<remote-id type="github">jakartaee/jaf-api</remote-id>
+		<bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index b56f5689e71c..1c4a33113aef 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,5 +1,5 @@
-DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
-EBUILD jakarta-activation-1.2.2-r1.ebuild 1590 BLAKE2B 8f97fe4b0d557e37c4c808af4c7f8bb52895af54c23c0f1f3af447af34c3ec0ac0213dd8cdba588f9f3dab3c1346dd4a84b2a5e3bc676f7d033bc87148e6b497 SHA512 95691423ba5596fa56ad1c18453644f1cd22de91d667d0d88a47fc4c3fb6bb4a34eb009123146984544d75ab49cf9afa68afaf23dbc91b9862eeaca7eb4bc48b
-EBUILD jakarta-activation-2.0.1-r1.ebuild 895 BLAKE2B e28c54f1f86ab0376c0ac5abcc03941c0239868a8bf92bbe4bb6e72498e620626c480085f60961c0b5605935e3668bc154870ce610511779db7f3caae5e6c37e SHA512 229cdd0db6e0691fdcef006d1aeb50ec465b3fd7fc9071f18b7fb49c22b0dede4c98c4eb99454fa936d5ff945ebc91aa024335a405270e507372a5efa6b780fa
-MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.0.1.tar.gz 133817 BLAKE2B bd74e3df8a2d75c137cd3e25c9689296c4827f626c86455da4e10dd8b743e8ffbd5c502162f4f1f7399c4f1e1f2eab6632e9a69e67f017a7f8f111ea4a2ac836 SHA512 f5672f20588e894e7fb5248da7c69c1c8cebb3053342013f713fd58011a2ef069e9abfff8948613b19fd3404151f950d083aeda77ab6a79baaf673658016bfd6
+EBUILD jakarta-activation-1.2.2-r1.ebuild 1353 BLAKE2B d5bb39b3a1e6ab97363f818d5067d68f3fbe570156adb22729e844fe6f30203e9ad1d26c9dfda7b0645d029d9e31f2e226834ba8e7b21093b02cb7742738060c SHA512 17b17e4134faf4e837605e2f18cbf10c39377544431eea20c712bd788c32aac4938579559c2383d69d789b47ca84c977b2f087b98cda654ff22aecdc8fdc631e
+EBUILD jakarta-activation-2.0.1-r1.ebuild 633 BLAKE2B 0b2b9305738f91907ad666b0670548691b4132950799d0af7c5c0100cc70fae3685e1a69b354177af320ec85922a587bc7394f9be9b33312516f9a27cde9dc62 SHA512 e4cdb98899920ef0c19c59dd76d57afd3b12165c3f23e6ca2516c6648a42f4f7ec66c9a5777069ac83c0a1f07cc22dd409a882c3564a907d57d56245c48e5f3b
+MISC metadata.xml 364 BLAKE2B e6d9974b98d8675d21e9bad7ebe4d05bba1855171526218e8aaa403d0b48ec993689dfd7fdc3bf902b1ab9ad51669998d821b29a39cd3d7bc26e627b4803a027 SHA512 a7e1932872dc0660e85faa6371c9026e7325ef20f83e2a5938586f5a1fc2d28db7738f8897c01888277671f01aae2580d5ed33d88dbdeb5fc1d777349c1fe427
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index 0a83f80926ed..1483a29bde02 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -28,8 +26,6 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
-
 JAVA_ENCODING="iso-8859-1"
 
 JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
@@ -37,7 +33,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
 
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index c409f44c8000..7b2fc15669ec 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,24 +9,16 @@ MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/jaf-${PV}/activation"
+DEPEND=">=virtual/jdk-11:* "
+RDEPEND=">=virtual/jre-1.8:* "
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation/metadata.xml b/dev-java/jakarta-activation/metadata.xml
index 947a81e39af4..9641aeda8c6f 100644
--- a/dev-java/jakarta-activation/metadata.xml
+++ b/dev-java/jakarta-activation/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
-		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+		<bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
+		<remote-id type="github">jakartaee/jaf-api</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index 9b6c30aa710b..48e64813b220 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,3 +1,5 @@
 DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
+DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
 EBUILD jakarta-mail-api-2.1.0-r1.ebuild 2293 BLAKE2B 1ec3e487f4e1f8792d0d7c8076d4a13360ebb75fcb7ec2c5f92f2d040b773986be280cf5ed900f63482b6f385d261d38120da6b863d8670f464f480eb95e6d75 SHA512 f3066baed89428e280d1e543077dae08c838714c88e3d7509edbc900f8b03e1b3bf8d3127296ff6ecf9d7456bb28f5e17fc9da847c51175a18ac70d90de5d52a
-MISC metadata.xml 461 BLAKE2B aee5455f74a9b1f4befdfca703827933b8684cddb067d08298f6c5697c7d958d421be7e23d48e72979420d42b6d77d1880ad96a6bb6630010b2696f145be5839 SHA512 e13f30a91e3e0f825fe9f32c26747af78c3592eb4b08bfd86f40ba346f1d1f9d66c2ae77d49be884b142885d637af52f1922806262719e4c67ea19d077cfbbbe
+EBUILD jakarta-mail-api-2.1.1.ebuild 1964 BLAKE2B 5c4bc9a5de3f822fa7655f86d60bcad23e8fb174049f637fbbc637a6bcf8b9850b4a13b933509da39c5a4f2ea114c0bb87bb6f691c872a17f4deac12414ab373 SHA512 273ee3e9b98ba740ceb44fd60b5c332827231c3bdd1487f942003c26dd77ac76ce1764bb80bf45090ad960c4a4cd80a565158e152bf6f16580ef61742d448e8c
+MISC metadata.xml 541 BLAKE2B 4cef0be3e1f59957b3e9c4d1fcabd325f72da186319c5637c7c39f77e1413a3d93c8735bcd197d9bb9503affe9a9fc3e1ec594af0c1007a56b63a97061b11d5e SHA512 834f676928f44a0d0a72c3726a90f7992ead5678e0215e5706501facc75e50fce4b630b09640562329417676a82e8b1c1a357c512517d72d28c37d4d8d939eed
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
new file mode 100644
index 000000000000..11bc903425a9
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API 2.1 Specification API"
+HOMEPAGE="https://jakartaee.github.io/mail-api/"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/mail-api-${PV}/api"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-java/jakarta-activation-api:2
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/angus-activation-1.0.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="src/main/"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	rm src/test/java/module-info.java || die
+
+	# There was 1 failure:
+	# 1) doesNotExist(jakarta.mail.util.FactoryFinderTest)
+	# java.lang.NullPointerException
+	#         at jakarta.mail.util.FactoryFinderTest.doesNotExist(FactoryFinderTest.java:55)
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/doesNotExist/i @Ignore' \
+		-i src/test/java/jakarta/mail/util/FactoryFinderTest.java || die
+
+	# These tests need to run separately, otherwise would fail
+	JAVA_TEST_EXCLUDES=(
+		jakarta.mail.internet.ContentDispositionNoStrictTest
+		jakarta.mail.internet.WindowsFileNamesTest
+		jakarta.mail.internet.AppleFileNamesTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.ContentDispositionNoStrictTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.WindowsFileNamesTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.AppleFileNamesTest"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-mail-api/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index bb9bcf723eb6..42164ceaf82a 100644
--- a/dev-java/jakarta-mail-api/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -8,6 +8,7 @@
 		Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/mail</remote-id>
+		<changelog>https://jakartaee.github.io/mail-api/docs/CHANGES.txt</changelog>
+		<remote-id type="github">jakartaee/mail-api</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 29a60e8ed519..7cc4560ff73f 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/cfortran/Manifest b/dev-lang/cfortran/Manifest
index 605580ba87a3..8b67fceb7e69 100644
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@@ -5,6 +5,6 @@ DIST cfortran_20210827.orig.tar.gz 94493 BLAKE2B 9ba0a22d1231702d04e484c21b56696
 DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
 EBUILD cfortran-20110621.ebuild 1559 BLAKE2B 81947a1b88493e41e745a1dca5eea75806b01e8a86befd1d57e05c7e2430d588bd16b68964c0182626b15f1f9d31fc4073a48338e8690ff2053285aeec93b8a4 SHA512 ac393c8d1ffc01ad86678e563d8249f40aa28ce951dcdefb6636302028819bdbbf257f7bebafc5e95026f6941801578abdd9a737d756d61aafde89f089d1b424
-EBUILD cfortran-20210827.ebuild 1666 BLAKE2B 9dfac6658b71780c00cf8a666ae9cdc66a808192cbcbed0ef162bf451bb55c7f7f6c6ba606351522480412b46e6ce205916876a8f271ddabf3932ff9c03a4109 SHA512 1dd742635ef9f2d53d6d25199e35a77faadef84819a5288de9fb6e355a781149873328435d34c8156a1a1d9f2c0948fb3fb482e6e52dc3568d91c7943c4144a6
+EBUILD cfortran-20210827.ebuild 1665 BLAKE2B 50dce2fc1c98ce8fe90f6a49809c3da4a93442e470b1656e2a0db001cb3dd847d738e58a0fc1e9bd5c85c91def1855160075e6e5d600eed4426b5f30540b09db SHA512 5fba14c50fbebcde2211bec601d85951ee3821c71232ec9fee57ec2ae648d8cabde5c82513cd1a6f7e7dc2953c33b73019ef737f016407ba609415b9fe32510b
 EBUILD cfortran-4.4-r4.ebuild 1120 BLAKE2B 5ebfb10a8132ed0aed7dd5182f2adfc9451bf645256c33546e5e3669d71e23a099ef3bf9e4585ad4c5799aeb4ad1059011ca51b012a43f79adfabb72a01eba5f SHA512 d25efdd1033b1c431927108b1a0df7c9ec31897caa091dd30658b434ce9bff3f2e6f2f131cc762f58a92d03fd54441dddd7cc052fe0d46dd6c294671869fd22b
 MISC metadata.xml 591 BLAKE2B f28360bae3f043699eb9b95347d7c816db8cc5d15c8bfaa8a4b5eac7b69bcf653b4307fbd62e1d6cc935b1c7ead60915a8f78c142ff4cf48bd92f6ad0990b150 SHA512 bf38bcd48faab6b142525d95ad3257fa99dd4b65441004d1cd9503f1814e516c7526bbf4e0d595eada753ef1b9e628d6fdcff39b0c8d14e65b2bdb95ea091951
diff --git a/dev-lang/cfortran/cfortran-20210827.ebuild b/dev-lang/cfortran/cfortran-20210827.ebuild
index b198977780f4..feadc03d0c45 100644
--- a/dev-lang/cfortran/cfortran-20210827.ebuild
+++ b/dev-lang/cfortran/cfortran-20210827.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index fd2d567270bd..d0a4d8c772ec 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,14 +1,15 @@
 AUX eisl-2.63-Makefile.patch 996 BLAKE2B 972f8fd7d0005a97d9390be4957a46b2f36881e95447d6d71fb46a1c704ae0554d8e98d78cb64234b72e23f9846aebbccf086472722a42235e69b6784bc323d3 SHA512 6ae9bdde343bcd2050ea47cbed5278d16b41cf73f98606e3e1936713d28cb4264002fcbfede4108097f198ded9a7065120911f5242ee1999957481ab66184e29
 AUX eisl-2.65-implicit.patch 270 BLAKE2B 3c3e8b9474d7eb4647b9982b27a0bb34f316abbf780ca8bdd78445a4401e96743e8e299d518deeb5ce0903f892684bc9b96f36888a3663b5bb54d221735bc279 SHA512 fd69358726a1226dfc9197dd6e861ee36ee974050ba2455c6d29ecb82efd8128cc7b787dd18c2f686431ba5d8161ae5f8242675f2c66e10725a4985e5c52c181
 AUX eisl-2.67-Makefile.patch 981 BLAKE2B f237f8757f527e8d2e3fb9a207cb0ccbc94427c77b0c0a0df12cea5f32ea8975277a427a017e32071c3dd050596fa3c4719068bebd00a16080ba01199b750537 SHA512 eedc5921f166093d48ed62718028bfca76962b6525d17c9cf2e392942b313bcd5b07a6ceb2782cfaa7e0065e37c68a0d21f546586fa61cb53b0f6b5d56d96502
-DIST eisl-2.63.tar.gz 2004974 BLAKE2B f563c28ebfa6f45b1d5ace1087646fa63e99b98a6f44f42ed74f2bc4d7e29083bc1ad6c4e5234b5cdaf391fd07900fb309c153107a12e553b7636f978084a776 SHA512 fb2cead1cddb98ce63d471ef04f31cda3a8426d627f7d333fa5dc74401a075d923060dfb98ee9d399116535632983e649f2a99440157825f0528da03dae5d051
+AUX eisl-2.85-Makefile.patch 510 BLAKE2B 772f4f5cf20b9a2c76650e287b320e02b7431ee12adfbc3a0cb308dd922fb5456540880f95035059a6fd416965e5a956f1f7bfd7b28007fd11b767bf40fd7be8 SHA512 cac759fe6442eefc3ac41fad3e0e5a6b728161b3962c849006229a9ef6dafa0e3455ecd03abff662e9dae4aa830562a7e7f31ebf4c3664c467e46f0afca5f662
 DIST eisl-2.65.tar.gz 2025074 BLAKE2B d4703b696ea28dd5113dba199ccaf6a37955ca27297efaff4fc7c575fb94d0adfca1a3ae3b2f2baa8fc17ab04cc1b0a5ee0eb2059743a0828b81d6a324a574ce SHA512 7e2f64b37211b119e8a12975403ceec7b0861826a5de0c5e776f1140323f5ee73c75443f2e3438dda4d4cf7e1a8738c6883b1ab6d579558813fa5ddbc6be7898
 DIST eisl-2.69.tar.gz 2124476 BLAKE2B 8aa1c63f669f7fc04ca9d3f751cb298d3499d52007ccee7f6bc7d1a0cf6d4539e6d6dd9e76d2fa2ff887a26235ffcaa545d59d2c6c045b8d5f44913798e683af SHA512 3131f917408f768df51f488aadcc168705c118970a984ba5d72a5beb1a39cdd1327d3bc282108ec865df75110ef97c7f25ecfccf3fd552b5cdb0539ca3ca33b5
 DIST eisl-2.70.tar.gz 2126647 BLAKE2B f9bebd32a45cf73d3b58598e2f7683611426dc97c4e6411549e49f19c9e843dd24d90e9bdaf9ca97bc70fea970068bf2dfd532a861fd444b9f8b17f76666bf07 SHA512 9aaf75244515d74d40d5534e20d108f7723e0fb9cf01ecc618d32a4cd2fdd2f7132445ed9ce020e0c9ea3a05bee614e78853ac0554ee189946ee3d220ba082ec
 DIST eisl-2.72.tar.gz 2124119 BLAKE2B e0a1216b4e9c301ec965d0dc7a6fcaa5acd91fd611193959fee698a27523c0c4832e7960652af14af3e7f5846131d81f0ae9db7030511e051d5384ba573241ae SHA512 80998239b9cc421f42323f24ffbc5f518a2675c314580284309d127523bab328db21d294d8d32dca413abd63d279a2c857ea34ec35548da15459235eb0f3da2b
-EBUILD eisl-2.63.ebuild 873 BLAKE2B 7438f1e9c6324f10b90b6189136f0ca049870ee2f475fdd451b0e3abc679c8d528ffdbe2021715a002beb0cb21e302622ae0586e4eae9b6172db144f8c457977 SHA512 242c39416e07b29855c84e9607cebfba81ee36c0d4fcc035a26371d84bc0a934c32fa8f6a11d76c5e06aea74011149e7907db4f35baec3ea5ba51c9ef7ddd2b4
+DIST eisl-2.85.tar.gz 2126779 BLAKE2B b95735cac70a1bae0277f910ba0b69746ca44979c08b4c19c5642d1d998e0a248827cf6cc0bac9f29c620c34ede2558e7723b7ab8b841fadbf366fa9047e6a7c SHA512 4b09e0faa126e30e44d0d23cfb79316289631da1ae8069989c58852f14c4b1f2e28539698fc8a1f433ff11e0be7a63efd836d0978965eefe42a7620c11b56c54
 EBUILD eisl-2.65.ebuild 921 BLAKE2B 284338cf256ad5fba4e3adba1b2a5b57b170be4bb14bbb687e093e7542147f1fefe04e6240291c487b25268941aba8635c5612c46ec2ec4397249acf60694889 SHA512 1222fa6d06550da7ccb45999f3cc339023f844db81404abaa38ca90de5bd64beefa8c90598bc57f89ad8e90c2fac185bc75d7c2a4d072e80c42e84e04b8e1a9f
 EBUILD eisl-2.69.ebuild 921 BLAKE2B bbaa420166c20be9151fc3ba5f3d2896001b0bf701d66e6066a61e2d14028c54a2fe217c4ad2dc176aaf3e18daad61ec41c600c180fa915af6c1cb89bc49f80e SHA512 f4dbfd02ad131befc7730ade32eb76ab66820b530a53a1a6eb1ad3124ff9fde6494373cb93441d223a0a0e2044058b3159904e693f5b93ea7fd73f9af816d164
 EBUILD eisl-2.70.ebuild 921 BLAKE2B bbaa420166c20be9151fc3ba5f3d2896001b0bf701d66e6066a61e2d14028c54a2fe217c4ad2dc176aaf3e18daad61ec41c600c180fa915af6c1cb89bc49f80e SHA512 f4dbfd02ad131befc7730ade32eb76ab66820b530a53a1a6eb1ad3124ff9fde6494373cb93441d223a0a0e2044058b3159904e693f5b93ea7fd73f9af816d164
 EBUILD eisl-2.72.ebuild 922 BLAKE2B 609337bad49c86c37ffbb0822540de1a9d338989a061701ee9da461667b0358cedb6f2c58db3ff16fba47063a88d41234ee1821bb3d5d0ac669b8ad371cbaf4e SHA512 a983fb011d2f7f0ed850b1561b138e6309a77c3d186a9bc7da486de22643b2489e0b3dd2a00269d5064590acf75d159faed878f5a893ee9ebc7a103082acae4e
+EBUILD eisl-2.85.ebuild 874 BLAKE2B de0deca1b9189f01308d8cfceea57d6974245b162345ef10fa0ba0b9fe8ece14fa2de485dc3185094a569528b298efe0a9929480588f95f155b20eab46681c94 SHA512 dac188cbac69da559a3fcd6efbd4d8c95fa93cf8b95b9b107de5c2c48b22cec82c8a32493bc2e8d352786c917bc59f97e50cfc9b3edf77fdb5d2167fe5273b07
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-2.63.ebuild b/dev-lang/eisl/eisl-2.85.ebuild
index 8f1958272ec6..90b033daee8b 100644
--- a/dev-lang/eisl/eisl-2.63.ebuild
+++ b/dev-lang/eisl/eisl-2.85.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sasagawa888/eisl/archive/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"  # Tests run cppcheck (and fail)
 
 DOCS=( README{,-ja}.md documents )
diff --git a/dev-lang/eisl/files/eisl-2.85-Makefile.patch b/dev-lang/eisl/files/eisl-2.85-Makefile.patch
new file mode 100644
index 000000000000..ee33c5bd66c2
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.85-Makefile.patch
@@ -0,0 +1,23 @@
+--- a/makefile
++++ b/makefile
+@@ -65,7 +65,7 @@ ifeq ($(DEBUG),1)
+ 		LDFLAGS += -fsanitize=undefined
+ 	endif
+ else
+-	CFLAGS += -O3 -flto -DNDEBUG=1 -DWITHOUT_NANA=1
++	CFLAGS += -DNDEBUG=1 -DWITHOUT_NANA=1
+ 	SRC_CII += cii/src/mem.c
+ endif
+ OBJ_CII := $(SRC_CII:.c=.o)
+@@ -83,11 +83,9 @@ ifeq  ($(shell uname -n),raspberrypi)
+ 	CFLAGS += -D__rpi__
+ endif
+ ifneq ($(DEBUG),1)
+-	LDFLAGS += -flto
+ 	ifeq  ($(shell uname),Darwin)
+ 		LDFLAGS += -Wl,-S,-x
+ 	else
+-		LDFLAGS += -s
+ 	endif
+ endif
+ PREFIX := /usr/local
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 1642a0f720c6..ac6a927c1243 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -4,6 +4,6 @@ DIST go1.19.6.src.tar.gz 26549360 BLAKE2B cbf17c3dc744aec67b440718488e6acdcf6385
 DIST go1.20.1.src.tar.gz 26172675 BLAKE2B d6daccbebfe3dc014675499ad319eb9a6ae1382feaa42e7fe80d2e4a49bd7b3eccc3144f7cbd18c7c478e557d0e512eb1030d654a894929803838f192d551214 SHA512 57453419fafac8af10f4037b0162326555aab0e87cd1d246d5e977246c075a0504c23022d5c14bfcae9ca1c3250652ddd7c6fcf2209a926525e5f7d0d40ab52d
 EBUILD go-1.19.5.ebuild 5054 BLAKE2B d8ae0f910b26fb09c6b35f7ac3ba012a7bd855e5db5c1a590c4d571d3510b3f84d9869b7634b296075d85666a53bb565fd2c39f1a95bd733c9bb709b9a6469fa SHA512 810931a32380752fcf4d218e32cefe5756a29fca8b53349662ec3d85ae863ace4d34d7e2405219b489cdca80e4ce85d3bf63cdb51d28cbf354a75bcc8bff85ff
 EBUILD go-1.19.6.ebuild 5234 BLAKE2B 0f22f352bd08fd9bf42884746b9e73ada984fb3a1019e8e8a04bedc68ad38b1d1ac7d655180328faa7b36aba7ec4e36dd0ae7b4775f6f3aff001d3602e48b965 SHA512 29b2bfef16d3b8fe8af6215d4ec276f70a3081424d385abb3d7bb82a17bd705ddc5b62c255ef6e2642d4a56343b887e4ffe7ef294e2c8fd7ae20ffa3b56f5e55
-EBUILD go-1.20.1.ebuild 5140 BLAKE2B 6901fcd675e6dbef883a62c6ade4c87629f3cb794c025ca5bd5b7d6399d43c3cee26a93ea22f9681e2c77eceb5ba89b6bbcc6b752ac088092cd492aab4d74010 SHA512 bd128289404d2fbc9a8312d02c1bd3dddd0fbb4fffd3c51e04214ec747502b18314edacefa596c9fcf3d33933e9925912719df5e5e4651369d1c578733053026
+EBUILD go-1.20.1.ebuild 5139 BLAKE2B b3111ad21f51e6e632a19be903916726614c2915f932b6693bf79c70afc7ea0b412c1e08780c3b0299b98ad011b48a9fc288228a5c96e5bd48229d5dc57a6592 SHA512 790bbb503547f4917cf270aa0fa8818741ce61497babe7c916b83a5d35c16cf7f416d2bf3860fbf84721601a9d2b189b7797bb49aeab6a27048c47acbcb74108
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.20.1.ebuild b/dev-lang/go/go-1.20.1.ebuild
index 8b8dd50b5ebd..6cd0652f924f 100644
--- a/dev-lang/go/go-1.20.1.ebuild
+++ b/dev-lang/go/go-1.20.1.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index 37ef456cb9a3..7d92f74e5b66 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -3,5 +3,5 @@ DIST orc-0.4.32.tar.xz 180340 BLAKE2B fca41f0fc46bb6a841eb37f0f403afd0850053f93d
 DIST orc-0.4.33.tar.xz 199024 BLAKE2B 45518ff948f794c5a0eb14ddd462b58760d178267da34fd449a20d1bef4f7d6378b499efe1c7782e83c55be060b6f67023074cf8134e6a5ce129921324562c9b SHA512 ae8adce5dd62f4054879e6f2db76ce8a7959fd32fef0fb99f73f450ff58c5237e15bca764f6780309a163e40afcf400345f12b0aed5b88dc698064e44f8eede0
 EBUILD orc-0.4.31.ebuild 1183 BLAKE2B f417e72dec8e15bdd4ffdef8cf7c8f3bf84ecbb31ba814a1f05535a8b92de410e2e0db25ae2e864beb13b62ded43f547e8ffac2b46f5acc3dc192d44cd32735a SHA512 4b70b2b82d107ef096714971ab9eebbe4c4a6c981bd26c0edf7751580dfba97b7db04cae401d6f7415bc36ee0905b3f7782b5d4e4bd446c20cfdd79d199a3cd2
 EBUILD orc-0.4.32.ebuild 1184 BLAKE2B 1a85ed2dcac98a9740863c45e4bba4fc9d5827b734e2bcdab3b4a37b12e068dee53a10c56e7b63eed451a2ef37091b4f9d25448c4b14bd5dd5abea2b35a1397b SHA512 69b730395708d67934c7c6eefe46bcffc7bdb507b6c4ba403d3ad298a85ff3f00b81a8ac1ae103de17293d0b37ef5756e55d129ed46643cccb24e1c747901311
-EBUILD orc-0.4.33.ebuild 1185 BLAKE2B ee735b385eb2a5e130bfd4d0fb925ddd231cea30425385ecea60d352e780fa2488987c6dd447352dfdaf913df46884783a1ece1215c5d6296c2ca8bbfd3bf043 SHA512 0602e1deadd3ab202e3d561f9ed8b4fb709f8f3b0e78dc2ff63a720e9420da5e8c04fa87fdeba163d616cc367b54c0976785ce650732233dd88bbb822b41af7e
+EBUILD orc-0.4.33.ebuild 1184 BLAKE2B a73eb593fbcdbe5d71e0011530186a1687b787ff1ddb47a5ba2fbd92dba24c7ce5a11f55505df2628e1c766ed67e673242c0be6719f45ba7fe87d16fd90458be SHA512 b9a83e27f8d94a57e4392e3ed8cb76d09de8ef0f8f98dcaccd98884c6eb6a37b9ebfc0c40b361d052d6986475d0ded5c4422afcfa9c39320ccf9427720ca3ba3
 MISC metadata.xml 265 BLAKE2B 15de31a2337fe8b9175ffe3fd29cb1eb24148d7463f772b18a7fe8b38bd4edb05005df1ce6996cf23dad21db879c18b95d245fa9d096a002b95155c01088f516 SHA512 78a0c7a2a820f7032f384cf68d2affdd92d6f1466778f879909d0acfcc1cdc3bd64eee700ba06979f561583981033aae59b5d61eb4cfd01fc71fc13e4433305f
diff --git a/dev-lang/orc/orc-0.4.33.ebuild b/dev-lang/orc/orc-0.4.33.ebuild
index 53383cef9d04..48e3fa0e78dd 100644
--- a/dev-lang/orc/orc-0.4.33.ebuild
+++ b/dev-lang/orc/orc-0.4.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 979061e09be0..ecf8fce4c7f1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -32,14 +32,14 @@ DIST python-gentoo-patches-3.9.16_p1.tar.xz 25564 BLAKE2B e6b7f20bb0457011d74f44
 DIST python-gentoo-patches-3.9.16_p2.tar.xz 26664 BLAKE2B 7176c58fd4bfe40489de33d67a0c106f9d170656e6ae47318b103ac45a4e0aca14e89790300c3881a3c9b8ca556996573621eb5dac0a71106ea0ae9bbf3e82c2 SHA512 792fcd53385d95e3ba5937b26099fcc19e62d3512783c25e734ee0cd153c8717e618dba010dd98b8647d3265bf94e40665e30494aae1a84181febbd7dbab3f36
 EBUILD python-2.7.18_p16-r1.ebuild 8612 BLAKE2B f6c315dcdc3df5d88b456823a2f18cc5fb9e63d8e7b3686a25a814e6222a0787a0b0e1a9373297b14eea9706aa68b6fa36c49a3a4ecf42d3967bf09ca4ca872a SHA512 8234c63e15aa33327bf9cf86f08621b319ba0d7e0826c1159a53b030eab02cf64cd13f1ddce4c250c291eca7a853e0cc420bb549085fd2d11a4dabc0a9d61543
 EBUILD python-3.10.10_p1.ebuild 13675 BLAKE2B a390612dc694d39f15b5b6765d3b417ddeedf28e62c3813799a6b07d47e077019315be52d692ef573b147f80c7aa4dcedd90e8662866d3f0349434f8f5e2b999 SHA512 c02a6f29d22cf2080d90b3ea711945a86477b35c41f9ad9549829fe271b61aeebedb4c49dd0493380863248f6d8ddc170de7be058d4a42d5bc9353f58678bb75
-EBUILD python-3.10.10_p2.ebuild 13762 BLAKE2B 5fdb7c01c832be2958d658f7ca7cf818f6cd032130a054cc3626e7c9974f465e8475263731eb0fecb68e615e932b3b62546b4d350958d3b1cc0f5873e44b715c SHA512 d68b3d9cfc36ae287b47b1f7c13e5893a49f20f8bdc82d4b18bba1eb1903ba7b09bc8b29cf23251c52cad6f28c354a5a5880134ea89784c4d269e3612c2fc0a0
+EBUILD python-3.10.10_p2.ebuild 13761 BLAKE2B 99c069ce2b15751b7fb4be9970b52e34debc555ac638ba8d737c0d3e9a0bd1eaf1c9ebe0aa44b9ee3c19f8978d3df016130d06aba5a21418552078439d651c45 SHA512 a6a096d3013c1609af0c8e9cc692fb98194af4c4e9cd9312ccb2ddca3727ab91296e9a6e87a815fae2ad8f473cfce0985b66d181b2c93525086dc74fad899486
 EBUILD python-3.10.9-r1.ebuild 13667 BLAKE2B 97f76ca53a0d507f0aaa524eff64d31299ffa81d62fc1b934d80bbddf612d354f94ae2468a60bff8ae3d9e299e1d53c2ce67b4c1eeb1275e0ea22c8ab7b73189 SHA512 efd1bfb9391acaadd9ce6883d65e68fa52461b5a4347df1d426c77748a273c3695469a46f92b80affca350f934fcf94bdc48406e9e348d78a0097f66e9658128
 EBUILD python-3.11.1-r1.ebuild 14566 BLAKE2B 4def0a2c1cf782045ba6a9ddfd0bc28d44facf6a731245b365a601c4d1b6d304797b710623270cc270c68018cc9ba1aa95c846b878de96e266cf6bf5d3a8e698 SHA512 ebfd298bc8a3608446425e4b0b579a7f33b0a12db39e5886743ca92087608ecd45a85b95e24cbfb166ce7b64d30758d85f79976fc90b7d679479f1ec9c792b12
 EBUILD python-3.11.2_p1.ebuild 14660 BLAKE2B 895780cc0e023adfbc356c434cc1252bc7b72f9a8f1bb3bbce1ce0558814ceaacd7f69eb87bf80368ac41fd45cbfda3a210a7f4cf7a76b976e9ebd9414e99dd6 SHA512 c874002811e15ddc002fb9ae05a60d5c4036986d97cd14a77cd0914d947d21bcd92ad3f4740c7902aa4ad81a711f9976a8ee5b1ad2ac15476a3ef7a16371f3bf
 EBUILD python-3.12.0_alpha4-r1.ebuild 14404 BLAKE2B b39e6adb6a688f581b42a5cb346814a65a6d09bb57fe621dbe8fb9377e3af8b50a3bac5283ea33ac7fbd08565c9f85aeb8242b5945e188f5928042b7369b8779 SHA512 fe66b3d77d4749cdc1b34d1f64bbdb0a24f9b17be16b078325b9276f55042a04d4fcbb2b5025f6bf4306ed92d0b3285e03bb1f9f484dceff3029b949b9306460
 EBUILD python-3.12.0_alpha5.ebuild 14498 BLAKE2B 022989f5d368207f6de069e6266354e4ed81f2307f742eaee0e0750d02c05cf8d0b0bc7f76ef731e6c2810da678c47c88d64497813d7a23a18ee5785ec7e8199 SHA512 d8f9367e9b08340fb1db1ffec1b8d129852d1e307257932d559fcc657723a0aaaec76de3904c973c40667b17acd6ddb6c7d991511acbf93d844cf094ae4cdb1d
 EBUILD python-3.8.16_p2.ebuild 12046 BLAKE2B 4ca7aeca3534a30fef821525ecb7a7d7fec1380fc9db88ff79313726aa8982e6b7baea60b1f7e453bcd259d41c8d5c1f761867d3b45f8353ea1afab5c05e22cf SHA512 17869a774bf16c2d85ccc0b2c95c526922e35cf5c7b0d77c5ef465998192e53ca3511dee7377cc7d34a61e9727ddb16a568fe44891c63dff98d0ee2dbcea1009
-EBUILD python-3.8.16_p3.ebuild 12142 BLAKE2B eec23717b98734ff27dd10d437d20a7dbf7c7e67cd12366764b4e29d51cebded65948545e1ec44b74f156a7eeb5070bd099785a8c483a5ee75ce99f62eff84f2 SHA512 5e76ab47e61380f8c894caa86f651815c8142e137d9af292aa1b0c6488c7c0d4b3d16c934b0737f62d641f28dd61eec4f303ed8eeb778b12864b1a2fd5bc6ba8
+EBUILD python-3.8.16_p3.ebuild 12140 BLAKE2B 769fca32eec47d0d05d15db1d26f2fb0feaf25e0e2cfba8306c627eb3847346102632e59849ebaee1d580bb14a01bf3c1b23490fb56502288ea187b5f69c999e SHA512 30117c5b477795b5ff3295ae14ccb73345217d4baba5e8b9d89b412938e5b6cbcef5a16ee00c615167f5d3cd95fc5fef2355cba2f777abc4e058e4cfb4bf5267
 EBUILD python-3.9.16_p1.ebuild 13465 BLAKE2B bf1a41081df421d5ddce77cebd8d3c5c732dde9587acaaeaadd3ffeb236d5ed8f6d5235a992ec69fe1cf29fe6b18cb06045d61956ec0d05c9411a0cc4c532ba2 SHA512 3138585b3e5826fba51811cca19b4c123f4e57943c5cbabdd024e7266f40403e6c86d69173dedfff35d9a781b6a6afb0373355a5a1f95a11fcd8ef59f57d60ac
-EBUILD python-3.9.16_p2.ebuild 13561 BLAKE2B 98143527681ab4ebb98fcea4ac4f46ecb2b81b017611734111a3eb53d418f2e55131b552a19e338968579f80a3b63196aaa40e388b0b357bfc2039bab8d7ddb6 SHA512 0cb768d4714a6847fc33adaf502ee7b08a65d262cfb5a07f2cb4392f2fee40c1fd00518b52581a56e7270f526f7eeea9ec5d70b521ff02f921963f9afbdc7a8c
+EBUILD python-3.9.16_p2.ebuild 13559 BLAKE2B fc026112db7ab3fd402c6519127c5b8233435910702fb2c0669a9d6871a6a399e0e7cb8a30759faa3762fbb347a6aa8ec62f3474ebc65fce61bbddfcea83f8a7 SHA512 349288948310ce013c14f2c03e1b5cc619438cb3091bc99e3f192e9a78d9fce8149d12c3619d3f030ec97c27422116d963385b5e889b89563865dfa7f0e56b20
 MISC metadata.xml 1436 BLAKE2B fd5ebcef153bc74aae02f8930dba67736ce44b1dd23418448e7d5bd22391845f5edf0ba8cdf3f43af9254c68734b95fbac9ee891f09c4584c9272ac4233eede6 SHA512 124a1e743cef7236f7936aa843d3aae739a420b1b6173f02c2ef787745616891142724446320d887aeecb95fac09e3620a9666e8e3e32085d79019fe71ff7da5
diff --git a/dev-lang/python/python-3.10.10_p2.ebuild b/dev-lang/python/python-3.10.10_p2.ebuild
index e1bc4f518468..3f45df96fdec 100644
--- a/dev-lang/python/python-3.10.10_p2.ebuild
+++ b/dev-lang/python/python-3.10.10_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
diff --git a/dev-lang/python/python-3.8.16_p3.ebuild b/dev-lang/python/python-3.8.16_p3.ebuild
index bcc6607cca46..76995741c69f 100644
--- a/dev-lang/python/python-3.8.16_p3.ebuild
+++ b/dev-lang/python/python-3.8.16_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind wininst +xml
diff --git a/dev-lang/python/python-3.9.16_p2.ebuild b/dev-lang/python/python-3.9.16_p2.ebuild
index 9a0a35177786..1796c12df3a1 100644
--- a/dev-lang/python/python-3.9.16_p2.ebuild
+++ b/dev-lang/python/python-3.9.16_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk valgrind +xml
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 54807c8c6fa1..47e513aad5dd 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest
index 43612b63b9c2..b00282693413 100644
--- a/dev-libs/castxml/Manifest
+++ b/dev-libs/castxml/Manifest
@@ -1,7 +1,4 @@
 AUX castxml-fix-tests.patch 950 BLAKE2B b4161b47cc611abaa6b62b7b657149854f505a72a0a0b611630f2671b8361ffe573e3b80004c2e26b179db9eb522ebe51a528e2aaf71b70425a666bc49547549 SHA512 b9925211ecc83695ee0effcd19c848379208c510d92e79ba41d6ca3d44fb928b10d2856f681e5f9c30f3ebe02c4808f3533c0f2c8b510f6c62f97c65cd4f896c
-DIST castxml-0.4.5.tar.gz 104158 BLAKE2B 7d1642442d6908a7d7e1dd8f80a37b55ec8652191c4c93faf7f45601d730653d9b0e5af601f74aca7bce8579c0006eab0e9a2a75752abe2acbec1cfbf1522645 SHA512 c35c5d60dc7487d5dddba34de92590122db8457659458ee4e735fe9936dc59473bd31ed602e05e73651780f25a55ef5554e2daec0923ffb5a7575904320f5352
 DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e
-EBUILD castxml-0.4.5.ebuild 868 BLAKE2B fffd6a76827b614afa0ba0d509a4ce662a685e4a96fa18c12f5347a4cdee9c52f6687b7c5e840b7d179da19baa77ff7bed0c34086ca3933832d08696d379fe47 SHA512 e877e50c7116eb6a30fb077c51eb9c2417c3d0402fa12a2141c8e495978bba430d08ede309a52c99849e6a14a6b88e998c1b3b034a8a7ed32552960cf8a7d5d8
 EBUILD castxml-0.5.1-r1.ebuild 1050 BLAKE2B cdcd6465f0e262f29207746ceab9a078cca51ee5d3ebc61dba4dc3e59211c1eacf1a3086cd2be4aecb5809c9946692f5f93112c5eb95edeac553de3eff38c263 SHA512 afef30f626dfca77c2822dbea14136f67f9f21d6869e6cf3e5601b96d2602229eafe359b8b00b36e7b8e1eb054ff6019ca687e86da99208ddc27e40960f8e187
-EBUILD castxml-0.5.1.ebuild 868 BLAKE2B fffd6a76827b614afa0ba0d509a4ce662a685e4a96fa18c12f5347a4cdee9c52f6687b7c5e840b7d179da19baa77ff7bed0c34086ca3933832d08696d379fe47 SHA512 e877e50c7116eb6a30fb077c51eb9c2417c3d0402fa12a2141c8e495978bba430d08ede309a52c99849e6a14a6b88e998c1b3b034a8a7ed32552960cf8a7d5d8
 MISC metadata.xml 423 BLAKE2B 27d86ef69d8bc39f4fc0a3d22a39b7be7e788b750d0c4b5e5bc3dac6166a4e4bb3569155c9d6e975e8b4aff23b68a33052c5255535dcabd1437838102e8dfdad SHA512 893ec7780b4964297cd62c034cd6029b857dca11315a8ddc623aabf2555b2297e5979240276467676950e3e895315a5cdd49536e5f0909d3eb10960feb81b4ca
diff --git a/dev-libs/castxml/castxml-0.4.5.ebuild b/dev-libs/castxml/castxml-0.4.5.ebuild
deleted file mode 100644
index 7eee74c7e25a..000000000000
--- a/dev-libs/castxml/castxml-0.4.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/CastXML-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-		sys-devel/llvm:=
-		sys-devel/clang:=
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="
-		${RDEPEND}
-		man? ( dev-python/sphinx )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCastXML_INSTALL_DOC_DIR="share/doc/${P}"
-		-DCastXML_INSTALL_MAN_DIR="share/man"
-		-DSPHINX_MAN="$(usex man)"
-		-DSPHINX_HTML=OFF
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/castxml/castxml-0.5.1.ebuild b/dev-libs/castxml/castxml-0.5.1.ebuild
deleted file mode 100644
index 7eee74c7e25a..000000000000
--- a/dev-libs/castxml/castxml-0.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/CastXML-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-		sys-devel/llvm:=
-		sys-devel/clang:=
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="
-		${RDEPEND}
-		man? ( dev-python/sphinx )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCastXML_INSTALL_DOC_DIR="share/doc/${P}"
-		-DCastXML_INSTALL_MAN_DIR="share/man"
-		-DSPHINX_MAN="$(usex man)"
-		-DSPHINX_HTML=OFF
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index b19da0274be5..843f05c93061 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,10 +1,6 @@
-DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
-DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
 DIST girara-0.3.7.tar.xz 60352 BLAKE2B 59515baf53d3ef46d98d5720437c253c82637df8380abe04a1649d4a2636124d6d0dfb001c9363d8a33a1bc496511e90b8c5365db34a29d489802fc780575d2a SHA512 9b91ef7e5047b3250327eab9280372f38615e9948884c108c3d1c5d3e81794f786adc827692b112d2bfdc2660e22206a143fafd5a814408df8ffd4c858148717
 DIST girara-0.3.9.tar.xz 60832 BLAKE2B e577c4273c2d8f4d51e0ee283184ecd2b5b48877996f95aa5cec83ad716efd4946508203d3108d451492ff5d118d965ca98d86f4e0d9b31fcc1cc0b2266b9511 SHA512 b5399b26389cff0c6aa6f70687b53a99243d38d66ec401f48de49391c88b31dc3287366819288c405051d14f4f778db952953d48be51ac47d90d9f3604c94708
-EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
-EBUILD girara-0.3.6.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
 EBUILD girara-0.3.7.ebuild 964 BLAKE2B 59a0adee901ec76751ab2df7fe9e4802281b52957f366bd7acbdce5640ecdc910a78c33fe310ffad5696167bca6b8a905c0cbdbfdfdee349cfcab99cc2ce0b73 SHA512 6d16decdf15865794c8adbbdad49d7de6b28fdc0a5231c393916269a735ae7c21f01511445d688be48f63e7c83bad4db13c48b5d2dd53a94b7bdbfbe219adec2
-EBUILD girara-0.3.9.ebuild 970 BLAKE2B 0a889eb37c75ab98ceb942847b32f956a3ed781834c68b75fa7d1f180aa71d938d8b0bdb362131c48decad03a84712f96c091fd60464de176bd66626f4bb842d SHA512 672c2ebf9a89e9b9965abced68d461e79d38f805a8075b1481c2aa9045d3ec05320c9e7f8941c5b12758af88f075f7403e45f7ae20fee59b0b424a433125f717
+EBUILD girara-0.3.9.ebuild 969 BLAKE2B db676783045c30828613ed7fcad1b3233b76e5a2648c31b8a552d4b7c98958bd7fc02c87c34b518ad821749dad7e88fd97d085642f463937e13ed8ed3bb0dde2 SHA512 c98cf5f22395464d32f8cdce8829185d34aab362f88672478993ab6a0d45ddc177c6239d2f9b8b2f0931552624ab76482ea4d129d20f6a9d0fb2bead155253db
 EBUILD girara-9999.ebuild 970 BLAKE2B 0a889eb37c75ab98ceb942847b32f956a3ed781834c68b75fa7d1f180aa71d938d8b0bdb362131c48decad03a84712f96c091fd60464de176bd66626f4bb842d SHA512 672c2ebf9a89e9b9965abced68d461e79d38f805a8075b1481c2aa9045d3ec05320c9e7f8941c5b12758af88f075f7403e45f7ae20fee59b0b424a433125f717
 MISC metadata.xml 667 BLAKE2B 67e62f5e585aa25094c1b1610a1c2796db659db5dc667f96aca37eb5900c9d079655b542b9bd2fe5a8e9a3a34c5e9c83fb2f75100f488847ef23305fbe92d9f5 SHA512 3449fc93878dd48d23f608f03e70a11b498a88a823555bc706f50ccff0612eff0de86bc832f4ac980b0cd46367efd8c382a3e34f6b944b8d80582c8d0a5fe3ae
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
deleted file mode 100644
index 67aab558816f..000000000000
--- a/dev-libs/girara/girara-0.3.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~riscv x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2
-	dev-libs/json-c:=
-	>=x11-libs/gtk+-3.20:3
-	libnotify? ( x11-libs/libnotify )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-	virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Djson=enabled
-		-Ddocs=$(usex doc enabled disabled)
-		-Dnotify=$(usex libnotify enabled disabled)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild
deleted file mode 100644
index 67aab558816f..000000000000
--- a/dev-libs/girara/girara-0.3.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~riscv x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2
-	dev-libs/json-c:=
-	>=x11-libs/gtk+-3.20:3
-	libnotify? ( x11-libs/libnotify )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-	virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Djson=enabled
-		-Ddocs=$(usex doc enabled disabled)
-		-Dnotify=$(usex libnotify enabled disabled)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.9.ebuild b/dev-libs/girara/girara-0.3.9.ebuild
index 88dc773e88de..7692f3879f29 100644
--- a/dev-libs/girara/girara-0.3.9.ebuild
+++ b/dev-libs/girara/girara-0.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="~amd64 arm ~riscv ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 6b9acedf2f46..b870f0f95727 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,7 +1,7 @@
 DIST libcbor-0.10.1.tar.gz 284393 BLAKE2B 49b224493b4743fab0352e139ed9e85873238beb25e23555cd31f2ef720f6eb9ac136f26a92be56778f703f240dab2b6e0beddbb88c5cbf7edf084db7e96df76 SHA512 fd662d59127cd86a7e13eeb87ba0b4a9280f367b77fe85f579e5c230503ad39a323a8b9dfb8c6a49f8a05d5b81460ca4526dc130c7e1d403fd0839c0f37f5548
 DIST libcbor-0.10.2.tar.gz 289450 BLAKE2B 3ef2d7fd7942ff32acbe59db6a4b68ad72dde3af4675ef2ee3c93666360554d6e9a29392dbc4fb3029f9ff821f536b90bfd1c522c9c9c2298ab511322fb53d37 SHA512 23c6177443778d4b4833ec7ed0d0e639a0d4863372e3a38d772fdce2673eae6d5cb2a31a2a021d1a699082ea53494977c907fd0e94149b97cb23a4b6d039228a
 DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
-EBUILD libcbor-0.10.1.ebuild 1430 BLAKE2B 25d3bff94e9ae8fd84791071be1b13753c2cff9c105086462b029a284319ff14b47b74cd9c782e658528988af058b659b8ebc57571e26f02d811fc64650ea3ba SHA512 6e19c01c002708899ceb8aa7873381f7c1abb1bda52fb0336fd0a1a60e939c82351219078677ffddbd2d895e0022383f721bf9b93e82e5c50f7575419d952bc6
+EBUILD libcbor-0.10.1.ebuild 1429 BLAKE2B 6e47e9c385520af1351ba7d562bc2b1e1a00651a4e96395a6cee09815d654c607b0bd257b7be4a2b893acfd00f5505a1ec7949fd86feaced2565db6e98baa9b7 SHA512 ebf51462c4ef40d872f904acf952e4148842375d07e467889a6af84bc6e4b38aacdf9db38352f058ac35713401230a082d2aa8185abe0e69a110954dea3ff51f
 EBUILD libcbor-0.10.2.ebuild 1461 BLAKE2B 80ae86186b0c1612df5f61b842331b5ed5751f22b7a518d1b48f7d1c4497fb81d5aadb11fc3b0da8609e7c81c387917a785690a432128fff6400459496a21438 SHA512 bfd090439e8d2289ec9bbbbdc6f09255245726196d008646d788e031aa6ec75c7ce6b963e40b8402935652e5165c8fa9d8bb697aa62649e39d98f36cf4fc7df2
 EBUILD libcbor-0.9.0.ebuild 1455 BLAKE2B f651cd08439fbd3fff20396b5292656845955ecb85c070873b0ca9535f2b0282c6b4521e9f0cc7928ad76fc6a55c2ea67073748096e90cfad78029e89efd2d4a SHA512 9a078bf458ba5cc775571314ada0b5d20d13164596fda951b9e001b9d4f05bbd8496d034d68575acae549d63b0a4865aed79815a80e598789966c3f44635ca59
 MISC metadata.xml 430 BLAKE2B f478d98c9495fbb0946ec5d193e489f8f8a3c0a4ecbbac58ed2e3a79124d65741a54dfdc1a73f41dad39c596511aa0873ea38d2ba22d45b75a9600a122886f1d SHA512 ae7788a8a66d6f5333ee22601ff1ac202d279a7dd2aa245231440bb8a48e83d64361d4c105e331c217b8be096d9cc6d76f3878d4132e8060bc1fdcb7e8a64b18
diff --git a/dev-libs/libcbor/libcbor-0.10.1.ebuild b/dev-libs/libcbor/libcbor-0.10.1.ebuild
index ee777d332bd4..2f7271072a52 100644
--- a/dev-libs/libcbor/libcbor-0.10.1.ebuild
+++ b/dev-libs/libcbor/libcbor-0.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 59b5462638be..a593c60a371c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
@@ -11,4 +12,5 @@ EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb
 EBUILD libclc-16.0.0_rc3.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-17.0.0.9999.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
 EBUILD libclc-17.0.0_pre20230225.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
+EBUILD libclc-17.0.0_pre20230304.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230304.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..93cce600989e
--- /dev/null
+++ b/dev-libs/libclc/libclc-17.0.0_pre20230304.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=17
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:17
+			spirv? ( dev-util/spirv-llvm-translator:17 )
+		)
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index ad250ea90996..78b5e4f74112 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -4,5 +4,5 @@ AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be
 DIST libfido2-1.11.0.tar.gz 624148 BLAKE2B ac123145f22260922e1d83653ba5781c5f41b410760f2c26b7cab7cb0871079aed66a8d9747393843738e4c2ed7ba8ba0292075516ef0354fd4328df967b7a6d SHA512 d9644453d67b84ec8385dfb63796adb3eae2d7f7cb47fbb1bcf9ca7f5cce400623738cc3317d629c2f0af630424cb2788217f8c7f20d1b52b7369c729052d572
 DIST libfido2-1.12.0.tar.gz 652326 BLAKE2B e206c9c76e27037c49d3b0e842487b0711559483eb9ae638590bb7175761251c6f60dae6c6dc6cc8b13e49b9f32432ce4368e709b4aacf71f43b760092e3b00d SHA512 ae8c716fe9b2fa52f191c4b3fe61442ba0b7a364a23c6c3a29afdba4f47c5eff89cb1d6c9fcacaefd7d4ebce641d35600527ee33934786c2096ac97f78e9418f
 EBUILD libfido2-1.11.0.ebuild 1079 BLAKE2B 92af2b2246a9d3fd3f90d684cfd1f57f87b6c3ed8bc4262cf91dd88c39698f184d28a54e743280ddeb206971dcaf1acd9d2f222dd4767f96fa149c86c27dabf5 SHA512 575639ed512a85fd5354350e550d678b20aa981a1099dcdfaa87e281df83a7d143580b71e6d7ffba70046b2b5701300cc2b07e2b48980a76268c69c875d51bc7
-EBUILD libfido2-1.12.0.ebuild 1075 BLAKE2B b473986277775edf3cd7f1db6e22568e0c3755ce29593344984097896495e3d6648a50f8913d4d1597e87f53bc9aecf8791034d4a9ba5a2f7f98abb18fcb2e11 SHA512 d39f6323c25df21afec250263d8249c00ed2779c617424960d12850f9fac80f539d0201ec909d6a2b384e44590193938668ea5cb53d6b4cf5aebd74b01691e1f
+EBUILD libfido2-1.12.0.ebuild 1074 BLAKE2B 015d5d3485e2b75e31a4e5857bcab69a14498d67c8c7cd548008d3d87afb7e953235bc9b7a95285b15bbc360e6569e2201580b89835e52f2afe9534bc8c16cf8 SHA512 56ad5e8620347e5ae3a7cd18e97e5ecd959462d0398b81ecfb83ac229cb36842aa7a047ab52c1f4ee8d44355c9ca78699deb1f7432e96cfa2096278398d144d7
 MISC metadata.xml 411 BLAKE2B 3b2e2850f194b8518267bb8125401bf7049f1b63158bdb28e63e63c03f1c50c918164911a7899790f12c2a207eee88970663a57ebdaf26fa601d77da299a0797 SHA512 dd6d40f9827d7dfb35548c201f90571cec364fe89e4b1811b37f34c1435d05c078585ed8254884370fe575a6fb58c4fb271b87007915c38dae8f945735c0b2ed
diff --git a/dev-libs/libfido2/libfido2-1.12.0.ebuild b/dev-libs/libfido2/libfido2-1.12.0.ebuild
index 21becab96b98..312758608b1d 100644
--- a/dev-libs/libfido2/libfido2-1.12.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="nfc static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 54497d4b8e83..9e464c7318b8 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -9,6 +9,6 @@ DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
 EBUILD libgcrypt-1.10.1-r2.ebuild 6237 BLAKE2B 0246702c6936eeb86f380b1e1757d7e98b25a88f0e287a68286d141fd085372b4b2b89a512be141db66edfc8117a918fb18d0e8958f91b7528a56e3db5487f45 SHA512 251f1389ffe471a63674bcc9329d6291dcf4cca5a0771a5b7748082efebd76f0247b433a460dae74630acb140a122708fc222e140c3d82e1d906ea5efb0849ea
-EBUILD libgcrypt-1.10.1-r3.ebuild 6294 BLAKE2B 8f6f929c8d62839eca4f74654ad24179c639e3f316ed096578f2bda24a3136fdfc9d7d8956d0f733fd517ba2f3ef2bb8be6f4e86d6a7bb9eee3c42745e60aa8f SHA512 f22e6d01a11611a7893c23ab27e7cf3d3a55823a327b075206cd6ce7b7a03c8b345be8cf58c1477b3a6360de336c074285c5ec1889eacbb0d34b0a530370235e
+EBUILD libgcrypt-1.10.1-r3.ebuild 6293 BLAKE2B 9f47b68103120114845947d408e5a9d0cbdc88c05963f93f94c8540a579dd5a31d4c7365de4a3b1629bbe24e31962442653341a992ca31c50b48f4484bca96a7 SHA512 394638a47263c787fbf25cce9e256cab047b5d00ed8f0bf1cb7868e775a3f85f509043fa990cae3f8ac6b8a9d25b6a45999cdc29f3c5e14d2f30d666fb869e39
 EBUILD libgcrypt-1.9.4-r2.ebuild 5282 BLAKE2B f86b756b1497055d15abbb53c603d144b368c18294d7fa48f18a26eba7edd3544f4c35484f9c9acacd63f1912536f64bb7071eb4bc52f919ef161ba3da003f1a SHA512 21fddd979d7529486278d9fa0b0b076dce1aa3219cfcf9af95e4ee1b6730546437ab83aca869b74a8e61413b421eddaa38495bb3e3a8aefad336a76ac5b72a15
 MISC metadata.xml 510 BLAKE2B 1c3a524d74fb388a17465acdeb777872600347779635e33b8f235b59a464690cfd2ecd690b8fc0080600f1180e98255fe367dbb0dab70d04bf546ad7839de72a SHA512 2d1f11194b5ee566ed7a787fa7e40ee2e14511e9f94467ea84b4b3a8395a908c0f95044bda0714dc7426f47d81b0ff977d15654bd06316cfd4a00424242ae900
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
index 02e3522aa1ae..2d2497903a5b 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e22f5fa471e1..d3a54ea198ae 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -2,5 +2,5 @@ AUX libinput-1.22.1-sphinx-6.patch 928 BLAKE2B a4028f31bc5caa22c0beafb48f2d014db
 DIST libinput-1.21.0.tar.gz 988650 BLAKE2B 54c63beeff8dee93a52774220b45321d8a94261687b463319fbae9246331b532be7995a5b32c30425b9d0708b2ba69d4b4e83e8dc7ecebe6fb1237b723a266b6 SHA512 510273d68f2d4cfa61564a706b1f334f6bfca0d1c8faf0bb8aa656cf3fbd5e38d79d6fbaa01a20d38bc15777c9afc341e4ed08d35ef367ef3803ce788cbc4a0e
 DIST libinput-1.22.1.tar.bz2 794829 BLAKE2B 253f840e45ab2293503a0da09ea914b982e643c35928af6762955325a002b5bf20bf8571e705e3a050663cd0e1e26ee0cf4952a6193659f9b27ad1080008e900 SHA512 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e
 EBUILD libinput-1.21.0-r1.ebuild 2289 BLAKE2B 919c4b10094449a3daf12bfa003f6375fa7d0d7b018315fdad95ffa3483bfa5660c8e14539226715a0d2c25a1d395fbe4717529530fcd5109f32eac7c1e83fa8 SHA512 f33d59fb989cf9daac06bae61f2b71c58212184595ac15da9b0307a6d38c216ff26a79117617d369763f8719cf6d9ab20d7ccffb7eb96e34e529dd850dd160b5
-EBUILD libinput-1.22.1.ebuild 2222 BLAKE2B 8a4e78886c765311bdf9fb633e44430d7f70234ed97a9edf90e01ec9ed7e83b6a3422f8c849872a0c2fb4aca98ba90640e6e5643d2636a36144d4a8d53032f86 SHA512 340d710e4ad1e46e9444930914cb7c3de152e1acd3308e72eb10e36ea2be77a71449d514de6e84bd901c99b803e78c61525b7a13d6b74bd488a4900143c107fc
+EBUILD libinput-1.22.1.ebuild 2221 BLAKE2B 4326b4b59d2b79aac50257a0bdc7cdcc1cc32ffbb76e314c77a28d2d7f821feb4ac02a2735e67b7f7766b787c8fa61f78d3d40cd693b5cb1a6267511b4392072 SHA512 90cdd5af9b81712ad5356c271e05a3490014f4b539492d167691fa3473640481faa0c1c16ac148673dc39a3f84d48d918361edecb01753f6eb026065e195809f
 MISC metadata.xml 339 BLAKE2B c649f0ffaad1b1dc76c3d3184d95356b2925f642ff6b96c3eba0c31a1d96c3d9b741c1348f8ec90d02428c30a836872fe4e42e7ab5f5e5197f4a787f9147a1a8 SHA512 e9aeca6cc4451ab5b622f597f8debaecfdc672244e5e0b687ac294c20009ba42fb2ccc45e7016a2427312e1c768259005e0a7ff53026087570382652ec23cb60
diff --git a/dev-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild
index da83df27d555..a8b231cd3216 100644
--- a/dev-libs/libinput/libinput-1.22.1.ebuild
+++ b/dev-libs/libinput/libinput-1.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
 LICENSE="MIT"
 SLOT="0/10"
 if [[ $(ver_cut 3) -lt 900 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 2c39aebe3629..18e0272da6c7 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -2,5 +2,5 @@ AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df372
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
 DIST libusb-compat-0.1.8.tar.bz2 32845 BLAKE2B f590afd539ad20613647b923d69b9fe8ea60b3f5162766a1d840f35e8f56a949f3defa8b1c40ceb8932cf0bf45b3b5097b9ac04a339242a2b906d4ba320e4245 SHA512 817a16a2c7268e0d73add97c06ec3f6e4fc4b8697bd3129bb6f907f138c2a5dccb662096c4cd0385341053b216afd398b21dfef14676777b906972c9e3af4e3e
 EBUILD libusb-compat-0.1.5-r3.ebuild 1097 BLAKE2B c40b3e590197a02fa915856f9815a392a9f66f0f057da8a12cddc890b7b4a76b4dd1789f94cade0344e59ea2f1e63dedbb398a61d4645fa276251ccbe3bb9290 SHA512 37bc0dd695b4b9b5f4891b011cb22c563e2f9b1de8c837fa05f4fe6f7dccc857949e4a001aa610c9f87a8b24f82247b8aa8ba1df68fc75fddc557bcbd1b68c43
-EBUILD libusb-compat-0.1.8.ebuild 1139 BLAKE2B 2341ffb44d09856747237b65014fbe70883952335588d7521ccb785ba91d20b17612d5cba50af84715acceadbacdb56297f8022932b727c8bcc9b467305c116b SHA512 86f91757c7d55789fdc5ac0c2c1fd5b3b7515584efc3e0d548e88a05bb08cc4e079fd045483aa2093c3dfef40688e285a98c1c9134a47f43816106c703fe0ca1
+EBUILD libusb-compat-0.1.8.ebuild 1136 BLAKE2B b9a032c11d3f046915e1b828874c6f2ef8ce80ff1fa14d47c43cddac0db03ff73f3ecdf55df12b3d6153a9e9510b9fc957fbff816ea312a20bc6c409721d9e8c SHA512 0d39e69c4fa37e552f460b6d9ba4afad7971566b07f3f3f80a12fe36864b566cbb995a1f682d5c11f74cc79680c7f6f4dd47e010b6115ef81c843b569def77f7
 MISC metadata.xml 398 BLAKE2B 7f22097243db16d87b86af0aa73d25834e168a1075df11ba2c49a7a288c7bf0313158b49af0ffbc456189ba4b8a4920f03ed45b233c3ce7b15c95ed207845c91 SHA512 0e81fc17b1323d5d2707dc24dbec8554ea2f49fdb178baa86da70834eeb4fc7b97be6ade5f83510c8720e64ab17d270c5a0eed074d4f71e3544df3f9b804c930
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
index babee754742b..84eadc48b96a 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libusb/libusb-compat-0.1/releases/download/v${PV}/${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug examples"
 
 RDEPEND="
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index bb0fa36979c9..ec29530518e1 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -3,5 +3,5 @@ DIST libwacom-2.5.0.tar.xz 109284 BLAKE2B cb9443aba276694eb64c6073488746ff4aff75
 DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26
 EBUILD libwacom-2.4.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
 EBUILD libwacom-2.5.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
-EBUILD libwacom-2.6.0.ebuild 1464 BLAKE2B 28ca35da5ce4f513f590ec059c8629b5b24ac58348a8196da741a2f111be0aab9d84c12b42562103e978cc896642f64047ed26d18e39dca534aa84cf9c986b63 SHA512 19f3ae5f000cce4cb44c76eb349badfa5fa1e9e134dc2eb7918ae82fa50a2b8b5feb3e3d6666a175d9806d86d467337947f0d2eb27a392a941a599b6409e35e0
+EBUILD libwacom-2.6.0.ebuild 1463 BLAKE2B d4cc4ecc0ab1bda47574ede18bccc0eeeb29f410fca5e289023d52a35fbf41956301582f2479563517be79695a388437d82008e930306cd217313ef18e86d943 SHA512 f67934725a02cc7fc3c73fa69447d9f0bdbfa496a0a92e47345ef08c04bf36172fddd5de45fe9b9f46a653fb48a9850e1ec8bb21ed5e48986acfababb89b66c9
 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.6.0.ebuild b/dev-libs/libwacom/libwacom-2.6.0.ebuild
index bff9d44c3fe8..d59625aaee58 100644
--- a/dev-libs/libwacom/libwacom-2.6.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 448f4ef3332f..81561f9b69ed 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -1,5 +1,5 @@
 DIST nss-pem-1.0.8.tar.xz 41840 BLAKE2B 6a210517b6f70a6a1a0351970811500c1364c6cbb0159dc4b7b3edeff7c01d3b643a5a4a4946a350a1a49898570141acda1e913fdc79d750339f5021445e61c7 SHA512 9fd1fa9203fd707668506752be6f99d26e53281b8b95d7c3020da33ab8cb287890b66c8a59f1ee952fe8d2a8a350d7c5b4214a523a2e1762e48989f02c408b33
 DIST nss-pem-1.1.0.tar.xz 41928 BLAKE2B 99dae611fd8caa58947fb518a68462c1fc779fd19bc3ba8d81aa81bc167b9ecb77830d9dd0b883996b2b62a49809f9830a989ae39facc3d421266c17af1c28c7 SHA512 0fe2b4a3f1fe1746845ba51fa246b7c21b3197e7533fa77851eba2c4163e07b53114ee84f8ad493542ffc00bc1dfe2bf93524f4fead4e3d7b1eed600f73c048c
 EBUILD nss-pem-1.0.8.ebuild 708 BLAKE2B 5bd516bb9d221609ae907e65eafbb224136e07e476900e2cf99c66f6a19bad2a9afb3fd9633d4a27db302793ede010a7deccb40d34e3f48489333197d98e0d20 SHA512 195bca3a6fd4b66a39589745ec28d22652725e4b7172d30ebf9874af3a36bb2df6aa637f127a1656cdae2490645fe9263b985dd772423e71275235e199fb90fb
-EBUILD nss-pem-1.1.0.ebuild 707 BLAKE2B aecf87d8f38223d22bdd64969b8912f94c5405eeac06b9180a4c4bb0721a1991f188cc158b9a055ec182deee7b2048729e2dddfc029f25bdf5c55170ef37c796 SHA512 3a1550af716d360b70efea8c0745ed0088e268c81d741540510b3b5592afeddeb1b9c8911a16ea0b964ea09a1761c7fc7b739ed446bc5c8cf629aff2b6e81082
+EBUILD nss-pem-1.1.0.ebuild 704 BLAKE2B f5b4970ba9d8c73f46c4055ca8e7ddef6b999b6d988f2550778720b267f8de5b776e2d5fe1c5cdf317d802e4106652a1cc4ca7cd8c38325b49f1b409baf0484b SHA512 0d01e60701b21536d667d506b11eaa72a042cd2b9f747af594a805bc13ed0abe82a36e7561575bc5989c9ff42792399fd12b7c51d973aa9eb3d06bba45b5fdc4
 MISC metadata.xml 334 BLAKE2B 7d88d82ca4bedbacb87ab53bc2a30e77ab13b062c439dacd1521f68a5677bad460310abf9f1e69826c44eaee4cade54bdb0d30923a7d2dfef9eaa4554288498e SHA512 c1a58a0c5e2401a1b75e4223f2cc6e0a25e8a3ead8c5c3f86cf96675ecf3dd813d0db4652fb6c68e0acbffa62ca6e4123dc74a4f565345cb1bba79e033b41922
diff --git a/dev-libs/nss-pem/nss-pem-1.1.0.ebuild b/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
index 363033f7db86..cec082186b56 100644
--- a/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 
 DEPEND="dev-libs/nss
 	dev-libs/nspr"
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 622fd873922e..7201b9863949 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -4,7 +4,9 @@ AUX pegtl-3.2.1-werror.patch 1486 BLAKE2B 86a1b3e9a40c19a5f959d9a3c100eb4417edff
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
 DIST pegtl-3.2.5.tar.gz 248904 BLAKE2B 008f7b058c5a62910911815bee671baead509e673ce8f67bebc4244edd1abed4c2467a03cb47e55e75c3be17b937834915f568a0a47066ba80949b868aa69494 SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
+DIST pegtl-3.2.7.tar.gz 249394 BLAKE2B d095ef337e1ff9e01692f07d0b110a685cbe447c36d7d294d0f18a15e076d15112b300232c5b4872b4a0b51d375799fc73261bff31c5b970a3d05b90b0ae6062 SHA512 e996be569e1c25377b13870c4f3e59f1935bbf24bb7c6edca0edc85b304fbe3d05db52a303839b0bd50c78769b773fc2237814787a703c58de8a79398210ee34
 EBUILD pegtl-2.8.3-r1.ebuild 734 BLAKE2B 0ac4b7b00fb7114acd879880a9ec29b05c69ec8ec918f3810b6664086ac9ff52b025ab1e8ef26f7f4e112eb99cce1b67c367569e4e7cb910081752326f00b50a SHA512 a2046d66fe48a82b166609772dce0b3c585b95704c250f43ad487eb6fb0e89faafb83dcf9977015d27b0c37102584e8d5ebc0e9000c2309a102b790ee1f2ed95
 EBUILD pegtl-3.2.1.ebuild 644 BLAKE2B f13a446fd6c4a49de02f678a2035835ab231c7a638de5ed37b0c81f565c3818de36687f3dfdf8c26ec63787270cbec90a26382309974eda7a44e78fd5620bd80 SHA512 bff8430db834d07082d0437909858730ff4e22863925b72d9f30186f08944d4bd9dffb75c19c31c901ef4f9ab926679f937d7972d8791d0bb8f602eb8c81af05
 EBUILD pegtl-3.2.5.ebuild 650 BLAKE2B f5193eb67418417b96bdf848bfdbd91e99868b72a3d7f1bb7cb3b527653aa6335f6850e940f60fc2092c03d88718228483e6b78ebab93cbdf505facd4b285981 SHA512 879957d860b814f3802df2f0b74abb994a1b02fcf22f1f4fb0455b353a553971a696fff469ec4b0d945197d1c0488b09cd22beb539cd8169186e9f6a54e13183
+EBUILD pegtl-3.2.7.ebuild 651 BLAKE2B 06f90ea9d13c0b35b566eb345dcf4409143b7c5402b19967bd41e578d9dfb9b49d144605c22d509e05f9a0930542c1f3616b5e7afd1c5eb8d952b050acefa4af SHA512 646457e5c96dfc96d8b76d85fd2929c93f1809734403ba02750a23d19369b450283c311f137287977a3ed82f900f7681928419142eb5bb894eb9cbe2e2890ee0
 MISC metadata.xml 331 BLAKE2B 12e6c4cfaaa53a618b8522bd05d8405f2a302d4e191350442839e393e2f97163444670d63b30afa6d103978d5f5218b40b4222a928cea413de52853108cba66e SHA512 b21bb068dca39dc56e95bf6ae50da18a0b9662e70bc3bc7896919b92a204c695baa7152312ad9a7db857bb42ca35b01cbdd78bc3e697a4aac617459dc8ae3e20
diff --git a/dev-libs/pegtl/pegtl-3.2.7.ebuild b/dev-libs/pegtl/pegtl-3.2.7.ebuild
new file mode 100644
index 000000000000..88a9c2105f41
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-3.2.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-werror.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index a3ac040c7794..1fc1a2d8fc52 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,5 +1,5 @@
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 DIST popt-1.19.tar.gz 596676 BLAKE2B 8f8965e2d339f0413e8d1da421ea7556526f39f089a822063d6fdc35b781a7c7ea84a91d6af3e25902c1f045f564ef956fc69cd4625e6cc008c9e3ca34923a9d SHA512 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466
 EBUILD popt-1.18.ebuild 1347 BLAKE2B 215f2acf0edb9fdc4f64baf8e40355f181cf1974e69daa4859150916eff994c772eb86ece98801dea8b814035a6ec3ec319c8f15a5f6b465ec0f9fb0ae3bf2f4 SHA512 15245c2721dd8f6a0ac05bafa347077578d571ee4b7da81ce7848b9a45f963e1aeb8121355354a1587637efed5781411e340e80c762e0f2144a8c92d462a0415
-EBUILD popt-1.19.ebuild 1512 BLAKE2B 6140bba917a1cbfc9ef49c226e3963c7496b1aa13709b13935c0275c3fc8506ee848122b332de50aa43355e5abef6ceb09086caf63af7cbee7e2a906ecafb04e SHA512 1f2e2b63e3d1c499bd164cf1463d213a4f1ae72e5e7f9003f7942c7f60794368124ffc80fb4f015bcf226bc855e8de3a96338c77a78348ae5ee028f6a85e3887
+EBUILD popt-1.19.ebuild 1511 BLAKE2B 39c482a54048329268c2e091a483cfd507ec78dd6f328d1eced75a760168269d466ac978a00aa0f632fc50326b89f07472de4d6554a6e7fb5bacf89dd85c824e SHA512 142fabcc6469c9a0f3961ffd939f8d9806774ee05f33253aa58281f40f7577c53a74bc337ffa58fc110aea8e477dbf133caf412a074e7ae748b1d2160e10e6ca
 MISC metadata.xml 412 BLAKE2B 6fc4208a8032652bfc2f48606c900686475617e828264bb8c4adca481c0de8f73a67b39e418143c6e75e8dec185d15f6050b3b7bf7e2f3ba14bffd17a59b2418 SHA512 aa4b2d96f2588e7fd24fc7a7f793209b431c9628e1ac05f79bdb52edd1582fcf21e93491e2ee241ed8b3aab2b83a1b047c819d030413e013b0d90d4cd4ba2393
diff --git a/dev-libs/popt/popt-1.19.ebuild b/dev-libs/popt/popt-1.19.ebuild
index 03a01a7b4aa4..ff3d464cc3ac 100644
--- a/dev-libs/popt/popt-1.19.ebuild
+++ b/dev-libs/popt/popt-1.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/teakra/Manifest b/dev-libs/teakra/Manifest
index b2a6b0a49af1..d989b5e8eadb 100644
--- a/dev-libs/teakra/Manifest
+++ b/dev-libs/teakra/Manifest
@@ -1,3 +1,3 @@
 DIST teakra-20220224.tar.gz 983295 BLAKE2B 79c399f2bd3358fd558b4e7558dbbfb95a74ea16d8c9e79037a5ae258066bd5dcab903bd776b2cd355dacb60ee4dfb5de2802ed318d12985a4655f87dd958604 SHA512 b8c37b9d82431b00bcd22554e3f507466f0e6823bcd0cb7c22d38cf5ffd63bf270dd6f70472063adf4db02cac3e4dbe85ceba2946d7ba0ca13b166bf7f197e02
-EBUILD teakra-20220224.ebuild 870 BLAKE2B 15edee8552d61e3bc40533a436e34518877dce56da84501771f3e3e4430fbb5b68d1dcd5692830fb2c03ca4982d9134af1965c19a88a417012dd166c31c45d0b SHA512 b3a3458b9730e0e4a8202438597726c5c249ed88dc80e1f8c25495b70f01e19ecb9454b85ccc5d96edf3dded5b78c87b8c9ee75ea354d3d73332b68779406bce
+EBUILD teakra-20220224.ebuild 921 BLAKE2B fe4a8bd32ae1c1e8132243be289cfe3a46c2daf9dc8c08513228502b4c3479224858a8db1985bd61cd032125f11e802fa9ff7d15edd807e62d6bbab7e01fec58 SHA512 d7658da13f155453af1c131000d72914a66f277cee0ad8c55a116edc39466ce1a0a69dc93d2f5255dd823c4976089016e5d49d73a5f3a679e5593fec93bf60ff
 MISC metadata.xml 399 BLAKE2B 4e2f75b603401bfe8ac3d275d343728996602ebf01cdbc834ca2338ea255a4a5ec314bc5ede4dc9442aca8f701e228415a259b077cb591d8377daf8fc223c485 SHA512 3e67a8e432beb3ff9c1a647c36d168e6cbc8fa150a9c137df425ef34f48df2fefd3bf9f69367d54823a0e32308cc782e5527de880eb12801f888fd1f0fffdc5f
diff --git a/dev-libs/teakra/teakra-20220224.ebuild b/dev-libs/teakra/teakra-20220224.ebuild
index 9553e9149c97..faf0cf67592a 100644
--- a/dev-libs/teakra/teakra-20220224.ebuild
+++ b/dev-libs/teakra/teakra-20220224.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=01db7cdd00aabcce559a8dddce8798dabb71949b
+[[ ${PV} == 20220224 ]] && COMMIT=01db7cdd00aabcce559a8dddce8798dabb71949b
 
 inherit cmake
 
 DESCRIPTION="Emulator, assembler, etc for XpertTeak, the DSP used by DSi/3DS"
 HOMEPAGE="https://github.com/wwylele/teakra/"
-SRC_URI="https://github.com/wwylele/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/wwylele/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,8 +24,8 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
+	local -a mycmakeargs=(
+		-DCMAKE_SKIP_RPATCOMMIT=ON
 	)
 	cmake_src_configure
 }
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index a45b859eeff5..295812de8d58 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -10,5 +10,5 @@ AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21
 DIST tre-0.8.0_p20210321.tar.gz 146294 BLAKE2B d740bd0e99f50f5e4d8105f5260e43a81b6af9857a21e386e437ab8d48a9e0de23eae03e96cf6b9f4d2d37f72d0fa73ef7343086271ea80f166bdba3f04475a9 SHA512 950c81f681970fc737cfdd6815445f05a018fc742b964cea3ce19f0249c677dd715ece4ff8e543fa9f3fd23b503eafa00aea00dbae063af9bc7e08dc1bc33aed
 EBUILD tre-0.8.0_p20210321-r1.ebuild 2403 BLAKE2B 0b631a238be1ec442760034fa209fc62754a68493bd4585a802be19dcfdb8546b7ab64743f15beb385c376271748442ad76c37f223062f13961738a1559783d2 SHA512 742e71d0677c0d285820cb26ede67c9adb8160dbd533b333c90686c1cf611547cc36fe094686d904125e2f2cf0ec1510a32e8e3ab3fa8226ba696b3c608a60a2
 EBUILD tre-0.8.0_p20210321-r2.ebuild 2182 BLAKE2B d063a1f9a818cf46cfe75d667ef2a4d4ac3258d771c5bee78d800f9b4be2b3a07fc0fc3ee51db9b9571ec2e3fab7373a4d501b83bfd1c9d53efd92d44f5e4932 SHA512 5987d873b55c4cb92c09789c9a93301e779857853fb35ce247b19c2f6d870e1ea4633de2863ecbc12c62d9fa66e3e165fad402c8878ad7e79d2f68e4eaca1edd
-EBUILD tre-0.8.0_p20210321-r3.ebuild 2228 BLAKE2B 6dccc5b7a3af87b06727138ca2c8294f2104d45bd6a74bc0b4ef5484a9471da57d4e4da7a65b1f156f048cb4975f8777b6c45d9d306170fc89918d643ef635e2 SHA512 1076f408a2eed32972f4c628371d5b4fc2df4c6c279b9e4a55bda3e4bc33cc3ac76643bdd8eed5bc3c7bcb6d9f07da46fe7438bbfe5c344d6aa766e1ea31bf9a
+EBUILD tre-0.8.0_p20210321-r3.ebuild 2227 BLAKE2B dc88511e44f3a099b10a085dfa37d2cf99cb272444f75d037a68bc4c5b5c5515bf27c0568b95d9b57121ec15e48da30a2d406b2ed65f498b1f943661181b971c SHA512 0ce9e25a67cab9ca66ad5ea8ee7e06003791c5cfb24ab5479d087534157db7f744a405af661bf66d699ff23b580a38c0464a483eea7eb701d76e8ff3a6a269c1
 MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
index c301f16fa145..d540591832a0 100644
--- a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+agrep +alloca +approx debug nls profile python"
 
 RDEPEND="
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c45db1f11a68..7e6f0195ed03 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 640306dd2b13..7bd1583caf1b 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
@@ -11,4 +12,5 @@ EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc9
 EBUILD llvm-ocaml-16.0.0_rc3.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0_pre20230225.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
+EBUILD llvm-ocaml-17.0.0_pre20230304.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..aee649edd10c
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/odoc/Manifest b/dev-ml/odoc/Manifest
index e184813b3c9a..7319439e5f5d 100644
--- a/dev-ml/odoc/Manifest
+++ b/dev-ml/odoc/Manifest
@@ -1,3 +1,3 @@
 DIST odoc-2.2.0.tbz 1548871 BLAKE2B 251c823e5f93e8080d52486e9d048a0c31651b6ea9d4bfdc3202488d7bcd750f9c2899189b943500253bf1e6041cf0283ed5e57c34d1a7d538c7c3710fb9a260 SHA512 9f8fc2ee6b25629474e8aa69dd460becab9277261578af0f7b97f7f779cc5f1056d1b5f14ab583b9b94ea097e5df2d6e35040f2a4887021209705486f9d44a22
-EBUILD odoc-2.2.0-r1.ebuild 567 BLAKE2B 2e4dcc03b3746d6ffa1fb484669eb24cf9db47adbb68918e65eed974c59af0ff57063c16e90de34c438ffcb0b50441fde664930ef50872994700b7cf8b2ee703 SHA512 c1f9292c3758fa145f10625af013faf70009f6f193ab0b1fb9268505ff0a3822db2eda526596d254223d6a5eadfcc3d85d2e7eec632849bb2707a6fa6f574a58
+EBUILD odoc-2.2.0-r2.ebuild 584 BLAKE2B 663ac5582b30ad58555bf5bd69a0b2c60fe7f1b0be4eaa844926fbbc0ce96d3ec992097949e19b73d6582e0bd1290fd6f37fe588732f815b7b5e71979c692999 SHA512 bcc972d027c14203daf7f2c05ca1633618642973d9b7bfc71e39fa616721577ead3c6b2f262fb371eaf3139bdaaa4a0d15d6f3f44fa4e6442afd1aa7c094580a
 MISC metadata.xml 522 BLAKE2B 04acd17984b96b5fdf41120b46c1f15ab1a2b9ccac7312ee27e41da5985cbed08786aa9349cec268f224bc660ea3fd902874bd029f37355685b2fcc8b7093b07 SHA512 d969745657f9335411b45ca5efe110da0d017dac7efe5d5357bdc6f99852c279d116aaa02101b443ef45229c1b9c809db65cfcd719ae48ddf198d5b2923b9f57
diff --git a/dev-ml/odoc/odoc-2.2.0-r1.ebuild b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
index 5028b9801081..24702587b03d 100644
--- a/dev-ml/odoc/odoc-2.2.0-r1.ebuild
+++ b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="test" # ocaml-crunch not in the tree
 
 RDEPEND="
+	>=dev-ml/dune-3
 	dev-ml/astring:=
 	dev-ml/cmdliner:=
 	dev-ml/cppo:=
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
index 0fd66534d797..58a07a82c218 100644
--- a/dev-ml/zed/Manifest
+++ b/dev-ml/zed/Manifest
@@ -1,5 +1,5 @@
 DIST zed-3.1.0.tar.gz 45535 BLAKE2B 8c8898f01add91807fa282baae1c5ee34e77c5234e87e4c79c17a9f55756d3b4c2af5f0b01deb9414a657f63ea6cf6db44af7249adb0f2b147e923b4112a7dd7 SHA512 d4457af15f970adb7b1ed543017e590fa0ecc47171d6dd520a1397f21ce0219caa30a9db7bedb76c0602d4f6d0f0684012cc33feafe18b848d3261a460dea10a
 DIST zed-3.2.1.tar.gz 43683 BLAKE2B 311fc78674116df9e1f9119102dbd6a882b305c22db0e6b59332d1a71f5a85f7169ba860f7064a72c0825e745e1f0a14f6bb247403a90ebc66a6bcec6c0d25fe SHA512 a1de65684d04d5d44ca4396365c98bfa070cf7c78318b53c3ad3ecca2b411450158ef7644b235490d879b37fe983f1707fef527b69af0c2958e45fd1e7a30f11
 EBUILD zed-3.1.0.ebuild 481 BLAKE2B 601461c875758a110f37dbae328bbd1d60bd83aa3716c367bb5cfb293b41f643f684c1ad2d6575a550986befca0c77aa7e1de33b4ff7cf843bb2507ced796588 SHA512 50b8d34ecfab53c921fc4c03afade28de347d77adc074c6cf6de757894cb7f9aeb21b7123b20904dcfda4fc744bdf190bdbfcecdc11b8ed7a494125f7101f1fa
-EBUILD zed-3.2.1-r1.ebuild 517 BLAKE2B 9bc6bdde6aa282d65eb1c117f4b2f989151fcb78f32cfdde03cb95b04ccc4db448e15feabf877ef1a182359d6b8ed6f1df27b54f1493515c85fce2a26ea629dc SHA512 d774b958a780f4a1853638f53eef11f1cf4ccef0d8dde0ac11f99bc38359fce1dfd4fb2cc82083dd3a5b2fb4930233061b95aaa32d46fc0fb52d6348fdff2efd
+EBUILD zed-3.2.1-r2.ebuild 534 BLAKE2B 80956cd106eb1140378fbe2e2f7c82a1572c4b2da7782cbcf33a7291af8b17535f1d98afc4fe647127d5bca50da65999bf4e14a365154387b2228a06ba9a3160 SHA512 134e118d35f86a6b540d17799e16e2b73f1f9ab43f61affd4f1a69a15cf4e7fe65d52e4ba11d274401dcf42c15111a72e58cb6ef9271374776a80e3f051cb914
 MISC metadata.xml 954 BLAKE2B d34a05ffaf2d7469b3ae6b65399a316279748536b93b9868f83484d0d719db9af3f1ec7fd834c7fd06902292231c3a964df8d94ad7c7b1044c614bbfae41bf53 SHA512 a44ecc312b950eeb782987e69bff55687be570ef304ae8689c8f1d5afd29d3990a54245a0229c1cff1964cd42e343350350fae30037b8f6856dd254893af8690
diff --git a/dev-ml/zed/zed-3.2.1-r1.ebuild b/dev-ml/zed/zed-3.2.1-r2.ebuild
index 3caadbbe9b7c..066ffd88b927 100644
--- a/dev-ml/zed/zed-3.2.1-r1.ebuild
+++ b/dev-ml/zed/zed-3.2.1-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
+	>=dev-ml/dune-3
 	dev-ml/react:=
 	dev-ml/result:=
 	dev-ml/uchar:=
diff --git a/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild b/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild
index 71179edc5534..94dde3f81613 100644
--- a/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild
+++ b/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Apache-Test/Manifest b/dev-perl/Apache-Test/Manifest
index b94b39e2eb58..6291471df204 100644
--- a/dev-perl/Apache-Test/Manifest
+++ b/dev-perl/Apache-Test/Manifest
@@ -3,5 +3,5 @@ AUX Apache-Test-1.400.0-phpclient.patch 909 BLAKE2B f109642536a1253245e55332e084
 DIST Apache-Test-1.42.tar.gz 153621 BLAKE2B 570c61e4b5f17c97376ba9f4ab3cde0b14df367f06b665e31dba9c6675972ad4d1bebe46b08416b0f4749d723a6b909430c9bdd1e5d3b1c6b21d209635f1236a SHA512 ecd78dde1b0db562d591990bcd50fe880d724dce9bfb20dceea3a51b81abd89d40889857e5e7714b586a093ad6f101dfd79c6aa33d63c906c41c532305b6584c
 DIST Apache-Test-1.43.tar.gz 153745 BLAKE2B 10988b293d2e4a890451971c98c3c59b262683c65974475e97b5db76bf019f276a264a53cd68fd1bc94fd21e3e6da3d0ad55f01d2b9bf3f9791db572987943dc SHA512 910001c1ca01536ec6f364d9fedf2a9a3a38ebbbbab4ec7d43829e1066317168727a50712c5474ae4bcbde53a1eec6f20f052d74c39a63c4f3f5b3202c48c64a
 EBUILD Apache-Test-1.420.0-r1.ebuild 2378 BLAKE2B 8798268b009bc70db2b9c7ec683514691cced0b6d93f92b4e2da413074742c189a87294d2db037c4a849ec63d0bac5432d1fb66c56fd19335062fd2bb4ec47a4 SHA512 a2baf1dfaaee2ee0bff2540530a5cac787785875b256a0d12ca5822d5086d93a4ae9f83f9c9e3d1dcd35cb9d51e3d050ff149169de7ba2c55630fd267899e87c
-EBUILD Apache-Test-1.430.0.ebuild 2386 BLAKE2B 215f33a3920a26e8e5bf3a012a313a76b30cc7524589f2ec9a2e90729b9c83b1da7f98ad7324922429033221430e22b87462f48cfc56085b0273ad2d476a2b13 SHA512 33e586e03bf6911a40d420215803cd356540965253e572c9ddf49c6fc77a5a6716834da2740b2e26598ec5fba2a3fd1bdb10df85b61fa93aff41c98e95591db7
+EBUILD Apache-Test-1.430.0.ebuild 2385 BLAKE2B 23b07a52fd23a2c6e1bd244a6f76560df8629dc33763a8c7c1da42beefdca5072ef8de9ef294bea751449ca38705474888df3716bbfbdea50d31ecf9f7798614 SHA512 aa94b81ef8faf614e54b303679bb5c130a2dfcb69e94f6cfafaff8a792bc665b88a5e8fad43792096a2277fa3bfd30102011d98d8869297313722dc73c7ea089
 MISC metadata.xml 2859 BLAKE2B c61ecfbe2e9cfd8817108b87463a78fa09d89bbe2eec3758f47d32500c76475678ca16c3273cd2b7cd515541d8e344f885e6c9806a3d3d41289c47a79bcbf399 SHA512 a9339164478ccb3d53a6aa1b2e6d036c50b2b7bf50eed3ea6057fad9a4f787b12ec9b4eaf93b741aac6be91d3b1fdcb300b44388a04d6edca06e76d1fb13e047
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index f652c7b86d5d..29916b81e365 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="additional B helpers to check COW status"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/B-COW/Manifest b/dev-perl/B-COW/Manifest
index 4b0520d17b09..005e6f44e0f4 100644
--- a/dev-perl/B-COW/Manifest
+++ b/dev-perl/B-COW/Manifest
@@ -1,3 +1,3 @@
 DIST B-COW-0.004.tar.gz 18295 BLAKE2B 7fcba80755dd7ca425f4f4caf2a39c4b813036d9538cb93f05e4eeb9fb15042c3f185d795da78a9d89c75a969b6f9a181506dcc3d072c390c0bafb514c866544 SHA512 97beaac8056e4aaeafb535a8e69f103632eb3746fa815313f84612414081155ab640299c18b4cb7b9ff0f61263cc1b9ce25de3313bbefce318163902a4503292
-EBUILD B-COW-0.4.0-r1.ebuild 597 BLAKE2B 9a54fe93bc9450d775a3dfe6bbad99864be63e836756c019948363c3813edaa4e650177ebcd0dde9b0b788b2980c781f59b29d29784d6b5d7f9964d7cb45d33d SHA512 aae0162f924ac7ad088e0e9d8a993c28908ffd3d64466523e9ed527087b27581543f1e04871b27bb40bb0b9074de0734b51014bbbe13c5a8e2dc0948561c6594
+EBUILD B-COW-0.4.0-r1.ebuild 596 BLAKE2B 5ea84a09e491c0c303d78c66fd74e7417cb60df33e19be8bc2addcb53b3f4087c0aa751c709329e44701b7e23889897e0f52904364de1ef1ac68fd4ffd5bd6e5 SHA512 fcc855322020a8c769c506eadb57a97d8c2e91c5c6c2c7e7cf961af39cac98aba78f1c3f9e40dc37562177368d46509897f7ae0a50e2e678f0085c321302e520
 MISC metadata.xml 383 BLAKE2B 09f5fafb87bcfc6077ab11ed2c6109a62127803363e07c5adf9749b3c57c697688b88d7d02cb0faa65807dc4f9c94057550b49b8b9a567e4c5fe1f44b1e87ffe SHA512 d16e7f1b2de163d06d901bc30119c07e25242c170741038e3de1c77852862abce215a9223b1fc2701209832914a7d236d9bda5bf4f7c15732bf4db496cd5a350
diff --git a/dev-perl/Clone/Clone-0.460.0.ebuild b/dev-perl/Clone/Clone-0.460.0.ebuild
index 7263d754cb1c..3b313190114a 100644
--- a/dev-perl/Clone/Clone-0.460.0.ebuild
+++ b/dev-perl/Clone/Clone-0.460.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index 7d48bccbe236..f02a8890696a 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,5 +1,5 @@
 DIST Clone-0.45.tar.gz 16130 BLAKE2B 92c4dd90e26b14754a77452c9e185094cb4604aecd06261783dc3d805e75a3d8e0a93492002c1e771b0e562b06a942d987e6bf3f2cf9e2450d5749146b98cb1b SHA512 4d91580fb60876cca7670411748e42e6af0eaba8fac25d60e7a50685ae7b1e697e12c8a2835693e3e4abf3c13c060a2740344eb804ec26ed274b895f599340af
 DIST Clone-0.46.tar.gz 138722 BLAKE2B a28f8b501972e1be29be39e0b08446ce369956a0ba5b9c82217e18214de70a2fab7adff0570ac78909026119c4cf05d6d5b5f98426c220b9bc50a1a945a8839c SHA512 f8bb1010364e94c7cc8bba25681cd9fd737ec2935a8be960ac53099359729fc679190a115dd082fccd239b35762dee2b3be3adbddce37e4ceae6fe934fbad545
 EBUILD Clone-0.450.0.ebuild 552 BLAKE2B 578d903c09d14fe2d7479722b19045d6cc644dcdf837696c3dede160cea7fb4e042842d4ab9456b631711d494bbadc8a144e16c039bfedc6d4ba59b2245df5bb SHA512 b988f622a139c05358db27ab75deb63a7a822037231bfcbcc4032a29f527f2863747001aa7150c732e5d6ce3d1d75a23611fca748fa40319bc096549fba4dab8
-EBUILD Clone-0.460.0.ebuild 445 BLAKE2B 88d06adada6f7d0c657cfbcbafc456c1cc146854ec74ce04f20bd8ea0d2a860147404cf7d088fed4a10623f56c8856241b5d4853614d4edc33bf8b833fe5de3e SHA512 c135c65c0101de3172cc5d0317e3555dbb56812e12fc420797753215c14ddf41b39d5808017b205ce3e50a7afb7cc8d3ecffa920e0e6743a45dd43c184308907
+EBUILD Clone-0.460.0.ebuild 437 BLAKE2B 9c5d6f4f32dccdf2cfadf951ac6a62f9991596ce80c1306c788c61f6122fe3501dfc96ddf3cd842b9bf8184b51ad89b39530dff3fc785930d3fe9784c081abcf SHA512 a5cca9bdd9dc90bf311d331a809112600da41128ff548e78b7e44ebc58b97ce0a35121c3e589b18d887e7471db5235dc13bd13275df8bb0052a682b246b29be7
 MISC metadata.xml 434 BLAKE2B d7c52e9bb5ee44da144fe85e5d4e08dcb95935b2d1437faaa2b6a32392850ae91db757b8fe0a1bbeb8b74e1cb530456fbb03d1c2e9da4abe9d264c6961814544 SHA512 c0156121a7820f87eb47174adc6f59e59e0b1e0acfc986ee46c7ec11f6da8db704c86cd8551273a859e52fc109a32008fda94bb34e168e6bc584f16c9de84aef
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild
index 1db8703d63a9..b97ee71a9923 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL pseudo-random number generator access"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-libs/openssl:0=
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index ef16bd35c2c7..f9a5ab0ce619 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,4 +1,4 @@
 DIST Crypt-OpenSSL-Random-0.15.tar.gz 15506 BLAKE2B 4ed167082904f814fb5484e2c95c0ac881530afecf7ff170041261eebcf3f1227ba8cf98b375a0cf2b18376c7f849340f11ae673ff9638a4c5e4f38db995b9b5 SHA512 bba8ce86b97ce2d6271be503efff6e6e0ff60a797282a2b7cb9c6c0592b69cc43344f9738b4790e5fc165a7273ff01e35ada481cf8c4dfde38cb7ad741d97530
-EBUILD Crypt-OpenSSL-Random-0.150.0-r1.ebuild 762 BLAKE2B a808cb19664720912f961fdfa90f83e1e2a32774e44fa3f878bd5d5425afa176977a25b177b80dc4a07bdcbb53ca35f9eef5cb4bde6815c732c3575bf976273a SHA512 903455ce067bcb1aa1dbe949b6bf9bc4c8140bbcdf5e049018d2dbf8a29003ea5ceb5ac1db5f412d67a990b8bc2b3d42a9776c570dba4c49c5da509717d56e66
+EBUILD Crypt-OpenSSL-Random-0.150.0-r1.ebuild 760 BLAKE2B 902f8c512e39c7e71cfd66341d78d914b3c25086891dc7eca4bbb20635b301b11caf0010914045bc7ac0f8f24a7dee18cac7eefdf16985aa69ec760780440a1e SHA512 b3d7dcb570337bafd0bae088c493a4700223ef3710773f45669fa6580343a9770ab597467f7ba758a111ec04ac100dcea7ad48c3bf321c8785eae52e5d573e08
 EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 719 BLAKE2B 677ade72e22667d5d4f1f8a61387d72ff811fce7d8d1638d62e3f173b18a464a8297f2b136eb9010c7e7717804e615db4c6f06b44f7b57aba8b9e4938199d155 SHA512 7e1573cdb7c4c0862c5c0fd63c273a0661b021ee437d270fdbf24b7349f303e3abb5f316bdb6b592d16cbf3bca14028d1b0ce6c8fc303fbeb2864265131a80bb
 MISC metadata.xml 414 BLAKE2B be7f19857edc392c52ae48ea1920fab20783388c4e2f4e5c0f12ed026c491a3fa786b25cdc3b2c0a9bab4eb05e6938297bcbe29e5ea174093b74935561853087 SHA512 207b77107c939cd53b20b791d47f1bee7d7300d932edbe2c4edd795cfd41213dd2aef085afbf50fec4e506b876657e761cc92242b995f49d8c26ca51f1988685
diff --git a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild
index b5aff0d2ef17..728d3f30d458 100644
--- a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild
+++ b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Add per-file per-year copyright information"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-perl/DateTime
diff --git a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest
index 44924130fbab..c6c0d23093fb 100644
--- a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Manifest
@@ -1,5 +1,5 @@
 DIST Dist-Zilla-Plugin-AuthorsFromGit-0.006.tar.gz 5308 BLAKE2B 809e3ef501b6269e002cb8b5cce87553e241b77867937cb4a156d7f3155c1f28558162147f4c16052a915f4521f1c285ea090a82f4c908c4e33e5664ed318752 SHA512 e140102881905d722bc8d9e2aa82807271020ee43f771c2bd1350549b782eb21050a4c9721cbe8d5c27798f106f69f9317a026b274b4023a27aa8a1fe81e572b
 DIST Dist-Zilla-Plugin-AuthorsFromGit-0.007.tar.gz 8148 BLAKE2B 08051a0e3530d57a8fab5cd6c03ca42147ed50efa48cdf28ca90a0a6aa9c8729d2233bd3b1a55c7840be43ba1af10829475c098516434daa5afa8e6dd47a9177 SHA512 002fcabe59495f0e7443b639004a8dd6dfc027c6298b06e2ffa1de8922a8450edbc2b3b3564354bf345aed231c6ae637a644876c133a2086edcd966b42dc0e8b
 EBUILD Dist-Zilla-Plugin-AuthorsFromGit-0.6.0-r1.ebuild 539 BLAKE2B 1d1908f5d42236b367e6cc8a48b1ed5692f26903ac19c0d733714be1a45b7b6cc68d4b0555166748a5113d675f5417f569d2ad7db3fa0527f8d426644311745d SHA512 108f3865f807aaf55d5c0badcd51b444a270ca77953750bb082f27391e8d4e4ff0dacff28c899d182c3475d9310ef1e03d1fac50ebb29628c35412df8f33255a
-EBUILD Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild 540 BLAKE2B 8b295e9b19aa927c8dc7a843b860c2c2caad1ba6b837924fba14f7bdd3aac9fdcc7cb32913f4ad73bf1c8b865412f68440dcf2e81398d7bc8862c4e9391e032c SHA512 c7175f871f6a655c87220b1be4de7fa865bbedbff15ab0606c5e3fda39c245948d9ad677a82f789904aeb2eca193cb4d23c4d17daefa6c8990ab283a497909d5
+EBUILD Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild 539 BLAKE2B 4f60aaee168ba48243c8cb8427415b4e330e18179ab673b8b378274ad993de0fb5d2a2dc06fcb071da43c5174663dbc2f3f1948c32a696985632af939f33999c SHA512 0fd3a76e48571694fad561cc2af10963a4ef9b1f60f3ab40f961a7c2b269e096e0306e0723e0cd8f0e49685c70526cff03f02527e02dad61f2acae5d6cf6413e
 MISC metadata.xml 439 BLAKE2B 14efec7b237dc0dfb2e828d3b273f394540bc97a72a34ccddde8d549cdf6354063c8107b69e95da64328467729bfa5843b08d1f33f3a6af699dc59c2dfceb5d0 SHA512 1f1e0b589b1f432fffda2df996ba76d69d0b878829585320df7c599f4b8a747346d3a673185abd20556cdb483a175784ee13e4a64e475dba3491ee74ed5824b5
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild
index ae77c682dc2b..fb4db20b16d1 100644
--- a/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-Rs
 # Bundled files make for some weirdness
 LICENSE="GPL-3+ GPL-2+ RSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=virtual/perl-Getopt-Long-2.240.0
diff --git a/dev-perl/File-RsyncP/Manifest b/dev-perl/File-RsyncP/Manifest
index accab7af8141..3eecccb3d80b 100644
--- a/dev-perl/File-RsyncP/Manifest
+++ b/dev-perl/File-RsyncP/Manifest
@@ -2,6 +2,6 @@ AUX File-RsyncP-0.700.0-make.patch 980 BLAKE2B 997e84bdd3183c324e76df69279fa00ec
 AUX File-RsyncP-0.760.0-clang16.patch 6046 BLAKE2B 5d388247096dc604cdf0dac5f070b69826fa4bd106b791d5ea29cdc0d2cf66545926414c5cda37ce9afac64dda862aefe87edeadb39fc0d63c084b6d95890e9e SHA512 a64a38ef191361cb2429a9a7101333e4631f264452825359b0006baeb89517960c86a4bd01b3647c8c4b3f7962782961ff968341c1d1362a21fa6edf492c3e7b
 AUX File-RsyncP-0.760.0-lto.patch 1788 BLAKE2B e297938568837ee271e63aed2c520334317e11c08a3481ceae27e657586221f5a813b55e3f2e6a2a1e09cb9a364d80a0236117aeff88fb6a0caf02492d4640e0 SHA512 ab70725cd8503fb59b5df57e66a056f78ef9b6a699e92c76f121decfaf959b51b8804a122af8be66d11ec141f03b0c2eeb1e77eae10ed745d6c2b47622bda065
 DIST File-RsyncP-0.76.tar.gz 167744 BLAKE2B e718a8cd18f3bf7c3d8b9ceb440c19b9544c232f2889532a15023ec1da6947085d4d07efb7edf7b1366830005f784e03b76bb9526d5ecb0072b3c0ab5fb88494 SHA512 b81d9ce63181605939e8aff87c9e56ab276899f019f44eb3f149e7ee0d44a94fcbee771381ebe6ca8281c2de0d57d9cbdbcb972ccb7406a0aefd920040603bb3
-EBUILD File-RsyncP-0.760.0-r1.ebuild 796 BLAKE2B 4469308eea6a11273ada2b7a82481f1b071fd30f22d615f7e292655c4b08e5e6b03c042f6351662f529b80e8765cb0a3c8334fb627b705da49b478123237f2b1 SHA512 b01c716173b5f0e656134973c6482055fa27d1070ea82606eec233e4e31c408382f9c6ca99f69b4959e25bdcd95026e8e53a611ae73e0e108be4072c2b34e96d
+EBUILD File-RsyncP-0.760.0-r1.ebuild 795 BLAKE2B 2657c315597598c4bab19ed620038893d644992f3345dfd64de152942b27bb8a0fa342b0bcfcf9d6a0e93bd90470f945549ff235b22932b19eee8832fe6f78ee SHA512 e689ff8af8318c9383111c8d7c3109fcadc1c19881a6d0e710a40231a70ccdb0738df889a6e37bba4c9a9edcc655d2c20c0e2d60f4db00ded58f8ad8900a66e8
 EBUILD File-RsyncP-0.760.0.ebuild 712 BLAKE2B 3192b8f7eac3447540d27012d25b8aa322fe3092567d88db1582764f6baebdd43849803bb2189464ea052251f046ceec6ff65e79eee17711ce0e599fe6bd70d4 SHA512 6c4e7d15e2e178c57d353eb896a93342bd6f5b7909cfbc0808f372faa407683a135bf4c7ec9c1ba80b5c074d8aa20e3910f65ab07d465ea123f77fa724ce5937
 MISC metadata.xml 654 BLAKE2B de95af5a50340b4b1235613c8874a6ab53824c8d4c2ef7253fc58a349d72a63afeef797944da7ce8195e0314247f3904aaf61a42bfd02940101fadd7edad7c92 SHA512 9e8b272c3d070616e3434e597e014a3ccfa77a1749790708453e03ed29dedb993ebab52e178fca3dfc064db335e28524ebd22adc879ead7b6e3a3473e8ed72aa
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild
index 0ae98e9e4aaa..9c0be6e7327d 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index ab61984eae65..2e2267615a93 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -3,5 +3,5 @@ DIST HTTP-Message-6.33.tar.gz 89245 BLAKE2B 4a200c634c261ca7c5721bb786277712b15f
 DIST HTTP-Message-6.44.tar.gz 94897 BLAKE2B cbfc3cdd68ba52572156340a3303a24a6d02078b7cac887e84bf4806546867479d4e1ba15582bb835b04802a897cd31afb097c8a161ca4854abae1c96a0ee0ca SHA512 515f3b91b4ed1b12c63149006651b8d60e3b4d3d842e2b997b2e8c67ce93cbdcb8eb5357f4c5bce20057aea22c1f84b5e02995b02e381c21d918032edb35a994
 EBUILD HTTP-Message-6.320.0.ebuild 1081 BLAKE2B f38d71071530731976faf35cfc33ace0545f8cfbbf12d6f2ce490a3d777b86054deaf927dec29b108f97d5cdc96e20a622cdaaa41d1a733fc8d4b7ab8545713b SHA512 8fe992ed0c36beaffcb4c6b64efcda04e5c1ae638ce6681736c2cb6cd8c88776fa987577aaa95ed3b2bc4f9719652d82ce33ec0b0ed32a9b3774f88899481969
 EBUILD HTTP-Message-6.330.0.ebuild 1053 BLAKE2B a18f9acd866b2f8f17b284ee1b8e66894d7b20dfc6dfc69e46d60453cbb563948c63a6d1a9351e158edf04a8351a872d655dba7ee02946526aef74e3d5af10a9 SHA512 e764f7687b77884e463d2d05eebd3bc9bf136689242b1e0212b4b775e76391c6028ed4af293b7a7ed41e1cf1f901ae9f067cd3fcbc5a69faee5f1be1d2ed7403
-EBUILD HTTP-Message-6.440.0.ebuild 1151 BLAKE2B 2cd6dfa0c022b32faa7d75b9356aa994997f300c06d01194ff039b700c5771ef6dbd8f2d7ab31443f3e49afbe181efb58f3249cce89c3c74dd754ca1d6148e60 SHA512 819259c6ad493d07c84bd91b8fb52c9529cb1f427bee65c43922b0103d7d6aa21867e609b74fb49fa34221dc0338ff35856cfa9011a75e8750e6bf88d5e6dd1f
+EBUILD HTTP-Message-6.440.0.ebuild 1143 BLAKE2B ec067fdd23a1a486f9e1b88a59d801aa4d2aaecdcb703fdfcfcca2a12cdd73517987a548799f71b9ff8c8f1852b2db0302b4d3816eb93a689bfffe15c2e7c4fb SHA512 6c760b40b289499f131e3d05fd06a877ffc94304626d4753e89dc3a6cfb4a3e048efba2260e37db5f79c5afd5be436875443a20558d24a59cb092b62597cf047
 MISC metadata.xml 932 BLAKE2B 438b88bc3420819cac276c499213c2492ba5826789e8ec46969956a90d00555a1caf65a99f60c2a91a9e8a029e8c06b21dd021644a31d7ba74cf58f838869867 SHA512 9870c1629ea3e3865f4bee3743a4c560f924b238c0c23d4cbb58b9dd388be79afe9567ae89e5f62ce407d372ec5c7caae9ac9626980f5806919a713bc9f3557c
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
index ea34e617d3a4..c294dae34ed4 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index 0c975e36eda7..3443cc8dd0f8 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -3,5 +3,5 @@ DIST IO-Socket-SSL-2.078.tar.gz 258997 BLAKE2B d343721810d032f0831a64318bf0b1931
 DIST IO-Socket-SSL-2.081.tar.gz 261773 BLAKE2B 2de31aa1886bdf9f7f8525e2486d8d2d6cd631a03a39f1b8f647b0e89abfdf95ad753d27672ed8f9ee4aa9c19d175fa3922ed4693dc5526fa5ce87be29db301c SHA512 309d02983a8a6c1440c2161189fd4648533bafb784a3271fb0d8671681ed606aeaeb5f0650de5f26869e1fd84e9c8bd94674988bbefcd0f424c94a387a548534
 EBUILD IO-Socket-SSL-2.74.0.ebuild 781 BLAKE2B 01cfec3868810a3793a5edc8ad3e1a219c6c6391213da5e1be25272fb4c6084e9bac8e82d6818f7258392a51e3ea920b2318067c7c60cb6b9ec5d151f9514b32 SHA512 167ae09f5bc153fc8d72185cbc142ef8a24c7d24f61f96996ba13fdbff340bd7881f7476c1fd2d07f7b92d06e86c8d7f6dce98e55d8f62d6d435e4d0b9ab1bdc
 EBUILD IO-Socket-SSL-2.78.0.ebuild 791 BLAKE2B e3e59f07afbbc6217350c919382b8135d12977e1e524f5b7fd502cb3e12dd21ee7eb1a2df4915e9af357550fde4a08c3dba71280a4e23f5877ac6c61d8dce422 SHA512 48fe36e8dee2f6297b2380a6947759dcf2b5335d9d78a6ae4a18bb33a106e7e4bb4337bbf52b3fd1c6b6cf15bf1c3f3257c122637807c72a93b81760cdee2196
-EBUILD IO-Socket-SSL-2.81.0.ebuild 784 BLAKE2B 16d98fc7de28d236507f02012d5d6fb44e82870cc377765f8f1faeab3a243e007e0a9c090008ecc24fe89122b1de275be2f13a4d9dcf0499d7fa0eeac7a7a2a4 SHA512 52f8e394ff41e29899f15a41c9ce9b0adb8f7606a8a5df179f6bf15f58d3721db7b37deec758b8c8e93aa31ef239ee15244196200c0dc996273377f84af55faa
+EBUILD IO-Socket-SSL-2.81.0.ebuild 783 BLAKE2B d7d7a8520f8da0e113c9fe781603eed69257b31bebf26a1456776227479231a6946b2256eea438bc9460d550203e0be7e72a003139f7f6bb78f7f990599c180a SHA512 a4937b229d0053f536b1e6e1b2f73e19ddc4f9544fb612276b1a8c18bf486f3c4ab29b8e425dd07f259a4171eca786320d6c8533d02d9528a060e41f7b596c1d
 MISC metadata.xml 1059 BLAKE2B 03679a47cf71e8d647d24d9513314414dcaa63ab0bdf090d35537805a4f2cf0c76b85dcedbf9ba0b2f74a035d5deedb68543d1833f19e16f6fd63a1a1479ae6e SHA512 53b16ae1b73c9513401845babd1f653084c76251b1090b17c14d9b0eaf25cd515caddf67ff297700e98412ffd3db21affd4c6d2346e5866bcddcddeaac044f63
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a3e328dfa204..bc8b5e2931aa 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-GMP/Manifest b/dev-perl/Math-GMP/Manifest
index 82f786a721a5..7ca469734081 100644
--- a/dev-perl/Math-GMP/Manifest
+++ b/dev-perl/Math-GMP/Manifest
@@ -3,5 +3,5 @@ DIST Math-GMP-2.23.tar.gz 33639 BLAKE2B 45cb7619928ca27cfa1bdd8cdfc34399d84f85b8
 DIST Math-GMP-2.25.tar.gz 34422 BLAKE2B 1a07225593463145bffc35386b556dbf5fec883dc6a4aee3c5d6cb8c98a2ea2bf11e1eb798960c5ae8a9914d19dcb709c5cb77efa59bdc4012fc2d33acfd21c8 SHA512 485c33dbcd39a747838f59914504fb99dd4b1433f617667e906189581fb5b5050c26d9bb2e686a778cb677352c2355340f999f76068c469e1561c60dfe61ff8b
 EBUILD Math-GMP-2.200.0.ebuild 648 BLAKE2B 411a8ce8035de301e4e8cfcad8f6ca4541e6973b5108b2783ca674a78badb4fd89b8501068c57041f2b92fd012f9b512e6329dcf129b97af13f292502e14fbd7 SHA512 48cb09d7d8dc05a64fa121d49b8bc6207801a3ea329c77ce29c6ee3c12864c2677c1cd8380507233bd78619d94c32d2dc5ada1e37aaadbae32e9f6078e62ae6e
 EBUILD Math-GMP-2.230.0.ebuild 610 BLAKE2B 8c0d0da0697dd90ab99c1986ffe25e47dc268b7c10f1cc6e16295369f6ad91f646d3006de99208f9a3fb2080238f1a01a081846f85673b8fcc2bc22566e1e79d SHA512 986b4404ada0cc01add58fe22916fc986fac87dbbcac09786306722fa3b5b309bcffffc7beaa34358e1c7de8e6b86b547a0a6f4ca616581c0c997725c97b4489
-EBUILD Math-GMP-2.250.0.ebuild 670 BLAKE2B 30ef7bd9bdbf1b23e8cfecebe00ed94fac90c5aa7795ea8d924ac9331589f9e2ad9be5b5600c5a2476ac301c4f02297e41a7914f9122f520997d0655b9af7bef SHA512 c604968ef6355a250e08e092691af92b576ca004469b69bec2c6f6cd9c0a7e8717983a493c772faa7f00fd630a68c372e407ba332942476e2def0a39647d56af
+EBUILD Math-GMP-2.250.0.ebuild 669 BLAKE2B d35beec94da4bb6193773b639fb5c1830590b40756c6d82971422fe18ce6f9850f4bdb0da5ed1b7e7a18a9b2fdde7d52713253cf125ab73583025733ee21e8b5 SHA512 09c4582e2c4908c44b060d1c49442010f2070e004795ea77039066530df5055813a340d69c180c4383b92dc5061af7fdc1cb934215deb94453e9afbe76f998c8
 MISC metadata.xml 389 BLAKE2B 7d6ca48961b3a31ba0df3223527a4f896b4d6cc733b4fb1027dc779b96ac8cd65cc7d80dc7eb60159d7343a4031d336baf97a766e97d1469860c6e24b94d40eb SHA512 b17c65047dec2c123e4a2ab1bc529cf79a14ec2da2ee3e75a38caacd1d2dd25ebba912d1c86d5c566f9e29fe392b2451ec4831ca639f9cf9666035419072af20
diff --git a/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild b/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild
index 8e2c0291da6a..6231ae064ca5 100644
--- a/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild
+++ b/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="High speed arbitrary size integer math"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc x86"
 
 RDEPEND="
 	virtual/perl-AutoLoader
diff --git a/dev-perl/Net-Pcap/Manifest b/dev-perl/Net-Pcap/Manifest
index 6880677a3cc3..8bc03b068ea8 100644
--- a/dev-perl/Net-Pcap/Manifest
+++ b/dev-perl/Net-Pcap/Manifest
@@ -3,5 +3,5 @@ AUX Net-Pcap-0.18-test-error.patch 1302 BLAKE2B 5b61333702676ace4b987fea8b3df9fc
 DIST Net-Pcap-0.18.tar.gz 94207 BLAKE2B 257e2b7c5bf6ad05936b64171db3ee530249f40d695ca2aba21d4bfe4796989e3a4aa955472b9c39e33aab5d67d2eebb26b43e173dbd359d01201926fa3a6b6e SHA512 63cc216345eb65b1e76efa657623c9d444d20f4b54ab0c75e787483baaa4f1de7e3a9294967aa7eccbdca04c60b089194dd7e0d19838f899b332c5881a8c7f6d
 DIST Net-Pcap-0.21.tar.gz 97984 BLAKE2B 6eeabc78542eceaef1f8aa6ba28b19de8c6f66af38179bd35fe346cc60c3c09f793eab6b5c0af514cb769c1154277de4c373c46c05bc4bfbb465b03eca5a11b4 SHA512 aab50ac82283b976db6a848b54c5026edd2f1608d2119a8bea7478c1b588a6ca8111691e7b4c0d2d24820fb5036727db9780966ea7270ef82a5e85b2bf612461
 EBUILD Net-Pcap-0.180.0-r1.ebuild 816 BLAKE2B b6c13c400f617676bdf5cb7f56661a6ce8ab7ff7a7e4ee9122a362c264e718492b8f08d04f0aa0c78c3cca3276ee39a5e0428f73e4be889e5d623df7bcc369dc SHA512 dfb79e87f108f85bc03078ca4b9f03d7a906d887919fee2fb2e749d018c2441d3cd19ed21406c2156ac20de4df702ca97bdd9138f43966d9a8531691669d6cb6
-EBUILD Net-Pcap-0.210.0.ebuild 692 BLAKE2B 35aeb4e7e91d55a95f54dd1aaf43d0445f9237d740ceaaa9257e1379fa9ad3ae3b44979bf072fa14768b20e8486f6eb94eafb6f5a568a76f48ef150f14dd57ac SHA512 7dd2a75a5e6e69b6ba10e57c81438608ea9a91f7fe9cdd330a8732cadb3db70d85d6a4d14e0449e925ff07ad56f89377e9327812b837ded96daf4118c7e0c9a4
+EBUILD Net-Pcap-0.210.0.ebuild 690 BLAKE2B a0a5f8c6e24f521e9d286a24e434baf6b67803f205e2178caf638bee33b82b135d42542cefb00d345a5150f070504e6243f9875d032c706150c8df0364f12d7c SHA512 566427e2865289fa49eba89e184cdd91af7d4ccbd61564690d47dcef0febddc315a9aba0b727ac27a0064e86d6dba86e726ef8f34f4a838e425b0743e09ccd1c
 MISC metadata.xml 389 BLAKE2B b7dca741c922d71cd4ce13ee71a1534b3c728096409d32088065dc7afc3735f9937da5052c93fd74091b7146d238816563dab20380a7b4dbb5f30e7cecedf804 SHA512 117d7ba2d6627ab14e414f262db9bc46d1d38906e19acb94190a06b986a53f3bacf80165f2b8d1358d81944f4f8e10d7f903f9bd778a5b1636a4c072f20993f2
diff --git a/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild b/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild
index 02b507e37a54..3920401a5b09 100644
--- a/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild
+++ b/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface to the pcap(3) LBL packet capture library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index 24e4e359357e..944953efe2b1 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -14,5 +14,5 @@ EBUILD Sys-Virt-8.3.0.ebuild 797 BLAKE2B 724e99fe9d274020ec2b9df941ab5b1cd1ae6b7
 EBUILD Sys-Virt-8.4.0.ebuild 1002 BLAKE2B 9338f433b9b2f5b7614f4184f55507de000a557d45449455069f0d8fe00d6b50bb2075a0baa78ff91b74128923d213063690995e14522883d0cd88a3934d4d97 SHA512 b29f9fe2758354c29e3b40a0ff67ce1486960370562f6475861dd70abb5d75233f5aa1daf85db6305ac0ce7fe4ed552c2a0c40c4c51662215909dd354e9875f0
 EBUILD Sys-Virt-8.5.0.ebuild 876 BLAKE2B bb3e423cf2cb21bc6be3bd7bf301fa88f88f252153823a130ba70faf22fde18754f78813f45c68b6ed281b504ffbbe7d3437e4a86d39f329d234cc882a0bd8f2 SHA512 6cda21c9aa72e535c609d1ce75a1e292dd4c0c0c2b527a18707a2dff24a997557fce7ba5b9b652d73b951e50603627ec91679e48f34be9fedb19d4552ab05ffa
 EBUILD Sys-Virt-8.8.0.ebuild 876 BLAKE2B bb3e423cf2cb21bc6be3bd7bf301fa88f88f252153823a130ba70faf22fde18754f78813f45c68b6ed281b504ffbbe7d3437e4a86d39f329d234cc882a0bd8f2 SHA512 6cda21c9aa72e535c609d1ce75a1e292dd4c0c0c2b527a18707a2dff24a997557fce7ba5b9b652d73b951e50603627ec91679e48f34be9fedb19d4552ab05ffa
-EBUILD Sys-Virt-8.9.0.ebuild 814 BLAKE2B 7716ec4d0712a38c939b797cbb0d5429e690301b913dd189eb5e4a8d5162bd8ebc695c0fb0f80f447e651a11fab2355f51edfd9c43d0f0bf71565ca1b42773a9 SHA512 45e83a287a4e4d667ed023b3d44404bed7b805c49af1f10208ac496f2d630bdb7af51e1392ec88695311b1689623ea3dccd0557d2aa9a26a4e35898621b95a25
+EBUILD Sys-Virt-8.9.0.ebuild 813 BLAKE2B 00faf3bafe0b3c8ce193bac08a4dbf4f63bc8e4bd89eeb7de0d0a69562eff8906d37e6fe18f46c29a0dcd02fd3fbc59bb867c16f2b1dc388860ad0f03a651edc SHA512 9a8306553e45a0c5d443aeb7cbf2f767d75d7363dea781573bbfb300bca98628a4d40b72b07007b24e244e027fb1563607cc09b2b28f29e76194f61f467c5636
 MISC metadata.xml 1206 BLAKE2B bf5ec8f97d105c95b3beee58bf6afe0839c2d20f4a841b2d2d85ccca4933558d873932bae65c357e5b6d27ceefd3bfdd1a14ef157f1ba0116234b1199ad25e80 SHA512 bb97e87838d117b95872c7481813455d0e1c5a188908ea8680342553396aa8e26a703670ed2fe06abed6ad10774363e0d4893906d036067d4c84a4be06b243a7
diff --git a/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
index 78165f6afb46..caddfe0079bc 100644
--- a/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
+++ b/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
@@ -18,7 +18,7 @@ inherit perl-module
 DESCRIPTION="API for using the libvirt library from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=app-emulation/libvirt-${PV}
diff --git a/dev-perl/libintl-perl/Manifest b/dev-perl/libintl-perl/Manifest
index bd50bc96b008..6cbd3ce18132 100644
--- a/dev-perl/libintl-perl/Manifest
+++ b/dev-perl/libintl-perl/Manifest
@@ -2,5 +2,5 @@ AUX libintl-perl-1.280.0-sanity-2.patch 2085 BLAKE2B a36355f8cec583a6daac07ad9cb
 DIST libintl-perl-1.32.tar.gz 598209 BLAKE2B 1aa9ef3e2d4c1c15eb5301880e2141864d53e3e8620656276ceb07f0946612d56801021bc78bb132fee910f3ce3e55e3a092cd0305831680a9adcd731249c680 SHA512 fca6c8863dfd36c7604bc80a401e825eb707bc75016521c09006c34c170a41b009d30ec93d7e2a7f61caa1dbdf0333511c3d515d4fdc0fea32242eca68a7e35d
 DIST libintl-perl-1.33.tar.gz 579631 BLAKE2B a6dae2fa18d6dd449e203b55e709dc3cc73e6150fb8b30ec15d0cca2e94d532ec4930a60c8532c29570b7b107bc9809235a180e81d31de6ee46738f520e24547 SHA512 494486d2e2f07fa8ee4c4b9d7b2576973772330aab7736488a692c54a6b250b0b7c06892d8cffc164346b9ebd3549141378fc84da339eaa4b34dc16c4f1a59b6
 EBUILD libintl-perl-1.320.0.ebuild 846 BLAKE2B f58445e5defb5a6ec97311e267db756841c3be73ce06df7308fcf74021b4ee940997ef23210396bb302e2bbdf0d1fc4bd971a25ea7f554b33e4a54c346f39756 SHA512 f512f982b813788ff8e27f399e2037e559e23fdb1cbe68ce41ca548b3d1a74287c6723431bfc4f3dfafba6b8469cf21f14b5b100bd745c3e947c2a9dcd05c071
-EBUILD libintl-perl-1.330.0.ebuild 847 BLAKE2B cde089f4be30b6a22563dbac0075e83194e4f632f3a85d46d8e3e8969aaa8026c423baafdf7ce8538b1fc0cf532a1f0e138f4e643aea7e441de61207b914141b SHA512 2f483a78c6da34f235fb36d6341b36d16c4a8a69c2796ba7f1ea53fe92d4db7e7ebf4a61397b304cf326dc441e5c42b7f70983895c6579adff6a8a1b792fbde6
+EBUILD libintl-perl-1.330.0.ebuild 845 BLAKE2B 4253d2c73117c85fa0b404ed2d9ed7be78a753afbc5e8b316e1f9a128a861a4d3e6781c5176a47c1964475317c34e5dc54a807d346b09ff7ec91bc3bbfb2a34d SHA512 d6e050a97c0170d927499a1a76373676b4b4900ebb6563665f6ee45837c152bc37bc033457abcaa87fa6522f6e716581afcef859e6f0e700256aa370a6ae7b49
 MISC metadata.xml 11485 BLAKE2B cb0d3e42ef7529c2dfc7ec2f6fb720f0b1c2c2e525753ae9f27cbd615b784f49b25d6c6aa2d4ff3a8902979089b4b4f26f4dbbd6fd46beb47e65715f5f2681ea SHA512 9e2348817ea4cae55b70f3642ae0cb087ac15622085c16fd8dc306d786c09bef5d583af6893558c668be0a940786302b0add9eb1c5b6a498193139748c74d124
diff --git a/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild
index 568b7851edd7..9b3492343889 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/rele
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b20493b25c9a..25dd2e268617 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index da8cc380cd8d..79cd5efc66a6 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,6 @@
+AUX argcomplete-2.0.5-test-install.patch 868 BLAKE2B 877ea4cb5f2793e0c641e306630dd6fe95cc68a71796a696078a78e5cb25940286f5788955cc6e0d2fdb7286757fc1b8d4198e6e31db9e2f5978690645f4768b SHA512 76e2527ba3afe0d66591ad0db24bde92481399fab697373d1cca0bb2e5a953078de5ec5fbba0eff592557fb90da4a3c3848204bc06b8609010df1ae7d1ed715c
 DIST argcomplete-2.0.0.tar.gz 54164 BLAKE2B 77da149b07d4019f8d6f3dda8fd9bbe9953c25b8461ab0746e1c2eb4d1bb51a9007c1f046ad9dc41dc5f8f248fbdf18ad7d921cf644fbc7580661084fd1427a1 SHA512 ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31
+DIST argcomplete-2.0.5.tar.gz 54665 BLAKE2B 33b3c1d6ba4b6fe6ac959db050d4944411a3ef6e737b9ae16f70d1e2cdd6cea0c2534ac4f4edce63df3606a18b9d8e16831a14db655cdd9cb4c2ad3afed60c72 SHA512 6354f2f67a5d0ff35539c2c4fa5ab5b78d3e57648ee2436da7b3916044d568d8558316a3e2b34581c97540c4a9f2191869fb215f0020ce09416d7b31377252e5
 EBUILD argcomplete-2.0.0-r1.ebuild 1089 BLAKE2B e66557e03dbc1a25ad16ea823cc43d35137ea0211519c7784bee1e4967c16c0c7afb16a09ac2e81b4ac4bfc2e5a7a7712aaf7ca6a8f524d8a63fb84e9d78ec57 SHA512 f631d7973f388954b0425ba824ba493d81c730a621b919a21ca89791b239d5ba6f2fde39cb3eb3f3584a0923b06260484e0a9b2b4ff54eb91a3e720222a5dff2
+EBUILD argcomplete-2.0.5.ebuild 944 BLAKE2B 735d5fe1ea7774901b13e38113c6485c0975296a3cbad400fc7091c24f6829174ac9f883955f4e75174723571c10d88427382130e755641fbe7e82f4f74f9ce6 SHA512 465b258daefedb95ad216dd5caae4ed37b788167b78db313ed147e397f85af5956a304f9bb0d46b1563b9b391185f12c70a21c2b1a42c6733a5578e1fa245cc7
 MISC metadata.xml 411 BLAKE2B 963cfdba9183fde9e97c534345164d26be569d841dcc6fd274601b18d5de2ae97fa837b0acfdc59616c5d19cc54ea368547ffd901f90239cdfb5ba08e8721607 SHA512 22db237979be34053ad7201f599d576a7756b71e6b75c40c2808d47f276cce6d3594ae46dcaec5aa5adab9e9e24e11d47bb9044a8b1a146163d66687965cf5b7
diff --git a/dev-python/argcomplete/argcomplete-2.0.5.ebuild b/dev-python/argcomplete/argcomplete-2.0.5.ebuild
new file mode 100644
index 000000000000..62fa0769c218
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-2.0.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="
+	https://github.com/kislyuk/argcomplete/
+	https://pypi.org/project/argcomplete/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/argcomplete-2.0.5-test-install.patch
+)
+
+src_prepare() {
+	sed -i -e 's:timeout=5:timeout=30:' test/test.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/files/argcomplete-2.0.5-test-install.patch b/dev-python/argcomplete/files/argcomplete-2.0.5-test-install.patch
new file mode 100644
index 000000000000..a710498d5223
--- /dev/null
+++ b/dev-python/argcomplete/files/argcomplete-2.0.5-test-install.patch
@@ -0,0 +1,26 @@
+https://github.com/kislyuk/argcomplete/pull/406
+
+From e6682b3e3e0c7882a3b93df2f0e466ef001d37e4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 5 Mar 2023 08:14:10 +0000
+Subject: [PATCH] setup.py: exclude test.* subpackages from find_packages too
+
+Otherwise, test.test_package will be picked up when installing via
+PEP517.
+
+Bug: https://bugs.gentoo.org/899628
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@ setup(
+         ':python_version == "3.6"': importlib_backport_requires,
+         ':python_version == "3.7"': importlib_backport_requires,
+     },
+-    packages=find_packages(exclude=["test"]),
++    packages=find_packages(exclude=["test", "test.*"]),
+     scripts=glob.glob("scripts/*"),
+     package_data={"argcomplete": ["bash_completion.d/python-argcomplete"]},
+     zip_safe=False,
+-- 
+2.39.2
+
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
index ad765a14109f..773aed62585d 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,6 +1,5 @@
 AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
 AUX astunparse-1.6.3-py39.patch 2466 BLAKE2B 8779b2a98e801f675f67e2f57b283401aa577f76bfc9633c0f17af9ee9c11f1508c3b23f4bba12040012e9796f887bb7253a40603f1777a1f8cb95c5cd080c4f SHA512 6bd1a46f48e96634f67ffbd49fce4a3e9251f030a1a4298455bbe92f09bdaf1d03ce807b9bd44b8e04218d80df72974570f2c4de00e617dc6557ce537fb2abcf
 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9
-EBUILD astunparse-1.6.3-r1.ebuild 779 BLAKE2B d56071cc9aa5edf6c634c82da764e11702bd969621f2c3941efbc5b2704498353b71956a64c15ac5d7047b73eced4f89fe3e97c2a661bef90c6a5f338a15b229 SHA512 9e1ad2fa52da5076e4768dee2ce2e8574d42f5d4e45a0a544668f4abaf0c60fc02b807163284ca63381dbc933eea4e726fa32f83b22631fffd9f5c1a11165312
-EBUILD astunparse-1.6.3.ebuild 702 BLAKE2B 9b9f5dd687d0e9ab81b0cc3138a5fbec9a730f2782f7faa5060525ae5d56c107d6a1325a0c73979ed0cc90725f70cb6a5fb9831af96a473043710385891d18ff SHA512 56843f5538ed864e63148bf02de0392a6182e16ef6a680bd3782f4c1056d554ceca0c3f6220ea071f8a16d3f8b85630155f560eb7f7ae9ad821a9b0e9ca9b799
-MISC metadata.xml 423 BLAKE2B 2c4953145f52c0378af4a7170621e9d4060aaf20ea8a2adb5456cfecb4a6c3c223f1d5b75972a7512c4aac8210e1f62b8c0e07089e09c372e1e8564769aac9dc SHA512 d693f6f76e67227bb63323d8d6564ad3727c193e00aa5bd8ceae1ea99bb6dbd35521d97e332220a3541b0e5369928b491385ec2278279b410504920148a923b1
+EBUILD astunparse-1.6.3-r1.ebuild 731 BLAKE2B c62f1e093f5700d58cbcb32935371250f114e272553224ce102d1e4005fdf248ef6fb24c4e66c3393988e6d5243d9a501d46a5180d22ac208c6757e52945a1ba SHA512 f6dba291ed21761f04ab6a9c5ea6c7a881ad6f558058252f072c7bc529dcebfc98106534e02f52e2719ca3a279cbdf67d334b0b4e696cb79bed9c1cc90c50227
+MISC metadata.xml 488 BLAKE2B 9329c8e69d664603c1440c77afc371dcffa56c65b382f9d32d8b7917a689f20b966f7da15376c22119127f02070337e19448ccf1fb00215c5fc965be9056498a SHA512 d59e98b53bd6b962b554673200506373fe73e20aa50e3a56ed0e591061365d6da0d16c1ffbc799ed6eda65d6da27c349fe5e66f298011330e8c59882ff22a3b9
diff --git a/dev-python/astunparse/astunparse-1.6.3-r1.ebuild b/dev-python/astunparse/astunparse-1.6.3-r1.ebuild
index 2a005f8397f6..c00b8c24a796 100644
--- a/dev-python/astunparse/astunparse-1.6.3-r1.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.3-r1.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Astun parser for python"
 HOMEPAGE="
 	https://github.com/simonpercivall/astunparse/
 	https://pypi.org/project/astunparse/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/astunparse/astunparse-1.6.3.ebuild b/dev-python/astunparse/astunparse-1.6.3.ebuild
deleted file mode 100644
index 4e6632ee4578..000000000000
--- a/dev-python/astunparse/astunparse-1.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Astun parser for python"
-HOMEPAGE="https://github.com/simonpercivall/astunparse"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.23.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}/astunparse-1.6.2-tests.patch"
-	# from Fedora
-	"${FILESDIR}/${P}-py39.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc *.rst
-}
diff --git a/dev-python/astunparse/metadata.xml b/dev-python/astunparse/metadata.xml
index ca0a873ac6ed..bf7649e44504 100644
--- a/dev-python/astunparse/metadata.xml
+++ b/dev-python/astunparse/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">simonpercivall/astunparse</remote-id>
 		<remote-id type="pypi">astunparse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index abf588cadac1..0b299a02c5dd 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,3 @@
-DIST black-22.12.0.gh.tar.gz 1182329 BLAKE2B fa7461b296e278a9d0945816fe88b933794e1302bc6e5fc2d2d48c94dcf50826471962351d1acc12da804ff7fa434efd8a8dca874dac91c8e36092ac50752669 SHA512 a89acd3c0f0d446e21695e9d7059a6417f8101bca32b22018d974cb08d6f3c9e4dbc3aab0a12091618ca860fbf9b0a53d4f2729311f65ca72f50a71629b60ac8
 DIST black-23.1.0.gh.tar.gz 1196151 BLAKE2B 3c81bf5e52bb08928b568a20c9b3d769c5ebdd120bdfd4565c89fbffd978cd4a93dd70eacd041a4560723987278d16acfcae49245007bdc59178264757fba74d SHA512 f86d1bcf59c3fa0bb1bc3e71511c5df435ea437fd1cb30c466b8babc9522fb96bba6261da1431db75e6d578a85d061d31bd6ddbe50327fb4a3987eb03b03c330
-EBUILD black-22.12.0.ebuild 1458 BLAKE2B e5ba291e98d843a73abff794e90c041801edd0bffea1fdd4b21e500fa8219df26ca091abbb930e3ae28701ef18dfb0174741799595e147d3d7b567c021b764ea SHA512 2d4e3ad3ab7c34c9ea806179d39729a20682ff0fe5b6ad570266dbdfd2ccd7fad38af87551eb4f2d2bb5037d9b92228979c870e2573de1fb13fd55071554086f
-EBUILD black-23.1.0.ebuild 1507 BLAKE2B a7a9360b381c493ce3bfa6a70f20d64c057a0bf7ca00528cadaa8600eb1b7f6290c07f6e51bddb66c65dd55797c58302e274db1aa52619d931d61757728c5d10 SHA512 e6691064f3495a4b0f9f034591d1690dc9468df73c39033aa7f839e5fcdaa6a823eb8faccc231c8bfd29f147462568feac5c31c9746e917c110ac355225b86a5
+EBUILD black-23.1.0.ebuild 1506 BLAKE2B 6f023d2ff0058c63a1dc566c94666a719110795b6ec45efa99476fc5457caa7de0922c3797ab1f0f4af30225d8cecf6d9e6822babf1bd351824fdd836228ebdf SHA512 3a8115a3f3ca8c08086ef4e471d19849b792a20bca97b381eb6e0faf8a0d96cb7bfd30218bccb020e4947701ed2ffd37a3d289fea05e1e48007d9bef1b2cec1a
 MISC metadata.xml 446 BLAKE2B 7d9bdbc4fdd62c1b4278a824a75dede64ccd3a4d865722a99edbd4e316342879eefa7b249c453668a5d33009e134e2feb4d1ac01976146c3e988f3724749d4a4 SHA512 0a3a912fc1d439a92452e48c9749705cd2307e645bb1274d22265656f6101574edda79cf04c03ae512818e7077e404f79fb1f70fd68d9c7cd3be3417f991700d
diff --git a/dev-python/black/black-22.12.0.ebuild b/dev-python/black/black-22.12.0.ebuild
deleted file mode 100644
index ebfa5284ab79..000000000000
--- a/dev-python/black/black-22.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-SRC_URI="
-	https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-23.1.0.ebuild b/dev-python/black/black-23.1.0.ebuild
index f9b31fcaa4c0..8ab986331f85 100644
--- a/dev-python/black/black-23.1.0.ebuild
+++ b/dev-python/black/black-23.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e31cddb42e0e..bf4e29eeecc0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,16 +1,8 @@
 DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
 DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
-DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
-DIST boto3-1.26.81.gh.tar.gz 611431 BLAKE2B e3f607e4bbd4ae7002168a697c6c3081b3713acbf7d7c8abdb1016b63f9ac5b16ae44255f707272db6a7b4c657210af0ed1c355889b01434683889b28de9d4e7 SHA512 30faa2d60f5f661e4d56a57c5b9d258ad3de260be2a21723b921f2383e290ca0b3d417a4a970ba3defd8f8196deaade2741117393c664b5fe267deab2e210e06
-DIST boto3-1.26.82.gh.tar.gz 611850 BLAKE2B fbf4581d616c6978482689e42a5cf8dc846ef91c77bd9f94298bed1ec50cdf41bc999ee81a1dd43b697da282f2774133daf6c6789d7d78b78aeb272c42f91f56 SHA512 8dc96da11d6da19610810c850c69070d25629e583f4eda822c218f4ad09295d25d3ae689a321c6a0c5f0c27e34717c44eb708950b4f37fe1d27f1f48205e5870
-DIST boto3-1.26.83.gh.tar.gz 612532 BLAKE2B 2cbb1bdb45fcb594c981df7850bc5d2a50d381a34d995b604edb55787dac8e85e83f9588960b555ddb92672e1564b4287c4fa6998754dcc204942673f3c686d1 SHA512 467c3eeb7f6ad5a863704498109a355cd789b69d43752fc694c78e67a7953c08f42cbe90a442978dfee08ab032f5b562dc84014c0cb02ec607d6f4b299e0246f
 DIST boto3-1.26.84.gh.tar.gz 612921 BLAKE2B cf98272681299aa11454d65a6bf8bc6aa28244803e3d448f01425e62bb5dc01d93e0790ecaf6b2949ea1978130782f5ac282766c8fea94682e33b0cec65e2148 SHA512 d72117cb2f258fccf4a25e201a2dad8e13e8a80a03859edec2f27da01209185cbbb2f02a7924819214a612c6f6d3758ba0aba0047fab1cced3312d1662a7482b
 EBUILD boto3-1.26.74.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.79.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.80.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.81.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.82.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.83.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.84.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.80.ebuild b/dev-python/boto3/boto3-1.26.80.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.80.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.81.ebuild b/dev-python/boto3/boto3-1.26.81.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.81.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.82.ebuild b/dev-python/boto3/boto3-1.26.82.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.82.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.83.ebuild b/dev-python/boto3/boto3-1.26.83.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.83.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 6c79a6f295d2..10c7facbd696 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,16 +1,8 @@
 DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
 DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
-DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
-DIST botocore-1.29.81.gh.tar.gz 11211684 BLAKE2B c89f683ab6fd238f975af4a30eea6191d1a6c2a8cf5ec1ac640a34de801bc289545dc2a98e9a76824afdb650b9d173751b23af3a3f3e9438f8cd1cdeb0fb64e3 SHA512 91b0d34652f68a3f41e768ff35d342c50868fb9e6f9da2b97a64cf08cac03e959395ac499b9fea7cf5997273700b06499f0d870661b9104709fead4a87c0a1ee
-DIST botocore-1.29.82.gh.tar.gz 11213502 BLAKE2B 8038e8a97e7c8795b9f273e6d7a87f42d764c7996ebc9c6ba831720db9104ead2e11b8a30e660b1112ca2e5ce2582f7135b0db79c56bf6c615f9a7e242b9ef8e SHA512 4492b8bed66736f446e3dd76bf0bde56e2402093630f38246941d17e388f62ca2d0e069b08c7a39cd12e719d062c85c0981636b72362118a8d689581e492ad06
-DIST botocore-1.29.83.gh.tar.gz 11216449 BLAKE2B a1eaa0710317c257291045fb1514ffaaff07f5ce8e8c37652e60658020273cb5ff4ec1af15a678b0f0249def13e793ee6ed4e8902ce8af4c6b6a48c2767703a7 SHA512 acaabf7c225fa5ae9b3428bdad3a28ffb41ff5a2b637b52c7a1829de0c50ed2d99118d77abcef9e333ffb25de09c5e37a9b817739512dafa8e75ca370a956cc1
 DIST botocore-1.29.84.gh.tar.gz 11220100 BLAKE2B 588efd08ec38eee7e319ea6e1d41af3f8d96c8e71fa090e5d3e8c836d60be957c47b556a9ce18684d53cb415446a360006714501dfbfc77204b2822247e7bf35 SHA512 cee6066735b324d550b736224ce4a4cff207cb7494d14e599ff9606b7a530d3887636054b3d0457269234d83ec0078950e03f916cd834cf910680e7ca650167b
 EBUILD botocore-1.29.74.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.79.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.80.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.81.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.82.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.83.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.84.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.80.ebuild b/dev-python/botocore/botocore-1.29.80.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.80.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.81.ebuild b/dev-python/botocore/botocore-1.29.81.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.81.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.82.ebuild b/dev-python/botocore/botocore-1.29.82.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.82.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.83.ebuild b/dev-python/botocore/botocore-1.29.83.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.83.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 2f3a5588a157..bfd21d9a7d17 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,5 +1,7 @@
 DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
 DIST bottle-0.12.24.tar.gz 74146 BLAKE2B a6bb638a0cba4d5fadbcb3a1a303b66a04f3c4df84e34b87d4a9bb22178de943123403d2851bd28504cf9d91380af95dd108e3b84825a93a6345cbe39fec0c33 SHA512 a3bc4bdc1376aef6c7b5784de18bfaac83e2c0c279fb2c3c3a8322871c68516e858b8c82cfff9291d41a66b906c13099c9d1037184bc48ff6f4ef0783b048f9b
+DIST bottle-0.12.25.tar.gz 74231 BLAKE2B 2856d94e1525f21e272d70ca3101188ea65417179342d7b3e971c5d1a3be77265e4197e5d29764a5739adbd984883ed121524f29e6a5933b8681e2c34b511a57 SHA512 14b8ed1ffd58f9667d451872ccf73a6f4bf8f7ffb9329f55314f90c770630cfe3f9956f786bcc7fd5f67fde22d14961952969af405912ebe71f019ca6599c975
 EBUILD bottle-0.12.23.ebuild 1219 BLAKE2B 546f0ca5fc2bf5a7dfb0c902b4c29153497b7069811de4f67c7c82f142edf17313a3ba035e57d670f4937256c9fe202e53337118f8f4fa72a0f72286022a4cdc SHA512 1db32bbf79460dfb88afc9c4e8ce82cd7d32fc5f0fe9004b632cc8daa7c9563b12744659d1224f902448ba0c6788e71404085a724a079d22aaad8988b255eb2e
 EBUILD bottle-0.12.24.ebuild 1180 BLAKE2B 5777f6292108d4d5b38db98938eec670032945f079789f3fd429ea0cfb231a4e349fd1c6f1918d886a148817139c18e80682671dfecd540e31f668d1a97f9c68 SHA512 a3fa4ab6beaa32a3238013dbd4e4817e01156be423da6f6e9adfb4fa95af31a2d4522505d5ce3c738cad05b53cb0892264d40436a954a6068a6f71e8cd3b79ef
+EBUILD bottle-0.12.25.ebuild 1180 BLAKE2B 5777f6292108d4d5b38db98938eec670032945f079789f3fd429ea0cfb231a4e349fd1c6f1918d886a148817139c18e80682671dfecd540e31f668d1a97f9c68 SHA512 a3fa4ab6beaa32a3238013dbd4e4817e01156be423da6f6e9adfb4fa95af31a2d4522505d5ce3c738cad05b53cb0892264d40436a954a6068a6f71e8cd3b79ef
 MISC metadata.xml 389 BLAKE2B fa960ae3a5dbead30cd7bc7617f87d5f2597716f6edef3a2af4ab15a7f45cfab6db98d77335a24fd792a6161dde7b7ff183d934e19cf69f7e1b2c72485cafd00 SHA512 06b65bd22b74e1e77597e65872d6ecc471e97848b05c02a0e2d35f98499d4c56164a15093ea96b9e55a59ed2624bed2adfb45d58d4a79c426087ca2ddf89f6b4
diff --git a/dev-python/bottle/bottle-0.12.25.ebuild b/dev-python/bottle/bottle-0.12.25.ebuild
new file mode 100644
index 000000000000..e7fcb7168349
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.25.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="
+	https://bottlepy.org/
+	https://github.com/bottlepy/bottle/
+	https://pypi.org/project/bottle/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -e '/scripts/d' -i setup.py || die
+
+	# Remove test file requiring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index dca3ff1a1990..53d2dd5f425e 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,3 +1,3 @@
 DIST cachetools-5.3.0.tar.gz 27935 BLAKE2B 6ef41ef383aebc1d65e2855c6ce2e62ea38163b44f9dca756482ee8f35bbee033b88a3d7d458ea970fafb062f8b202563d478ff3ccae376f424bc643c9dcbe1a SHA512 5f0be2e95b82de4866718744ba1712354b413441eb8978f0bcb3e32306b6671b8ed7fa238aa31bef4c3b97764347d12a375b058f5df51dc80b277bf2cef23e61
-EBUILD cachetools-5.3.0.ebuild 537 BLAKE2B dcf89a12a036525bc2b1edcd68a4f6df5fdf9486cfe478940c8aaa6eba93c44f9387f48862920ab9a1d3354f97591e72844dac5c4fa6d3dc0671f8aef1d419fb SHA512 d6a95e2371991738d308a09f19546984a21f5f4d4ff909c8732e9d42625585f620c4d8751058b57eeefb704676a03dbec80d52262be3aba22b7adc1821aa824a
+EBUILD cachetools-5.3.0.ebuild 536 BLAKE2B 75a4c904e1581a31df42b3a1156648d0c767f73aa2755661b1388e6a34b4323eca83f5b4ca8641906cb9622cb2ade426ab2d814710e99e75d727144903cc9b9c SHA512 75d97e9a99163370a6f70323c685e14edca90ccd5a79c00cf5559724d5de723e8e113c29275e20d4f2794691f57a6dd3b9fa59ce22b6c54875d526c2837d3427
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-5.3.0.ebuild b/dev-python/cachetools/cachetools-5.3.0.ebuild
index ac26e87a31d2..3d4c97632e68 100644
--- a/dev-python/cachetools/cachetools-5.3.0.ebuild
+++ b/dev-python/cachetools/cachetools-5.3.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ac79133e88ec..8ebe33e13819 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
@@ -11,4 +12,5 @@ EBUILD clang-python-16.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294
 EBUILD clang-python-16.0.0_rc3.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230225.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
+EBUILD clang-python-17.0.0_pre20230304.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230304.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..5ec556a2ca20
--- /dev/null
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230304.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 38bea363f5c7..6853a58f866f 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,4 +1,4 @@
 DIST click-plugins-1.1.1.tar.gz 8164 BLAKE2B 48d75b9445b72dca41516fe81d02c6fad8089630c0d49963f559a847b90c7897c8db64773c4ec5f4c162d0f2f4fdd14fe212d485765d38977145fd32acdd0dcb SHA512 bbd838f50603ac4e76daf3535fd5d27a17e17549addbc8b582df6d6193b4f07d743101ce52f0b71f326995fdfeac159805025770350ca2e7697f212dce0c4b1a
-EBUILD click-plugins-1.1.1-r1.ebuild 560 BLAKE2B bfe0f462646d66e82c777b3f0f845a65f84c8c0001a60f79d66ce6c3605e38428ea95be194e76eefccf0b59bb2d1e178758a899311b88a89d66fc966d9500e97 SHA512 f562526b526e8d7a661ffc683ca9c3cf64e15b48fba622d899a5411b42737401ed3ad598bca2c3d29c74763a7d428b0836a8981c8bd77e9a4809c2b0cc3ba125
+EBUILD click-plugins-1.1.1-r1.ebuild 558 BLAKE2B d4e9c69300e9ff279b6c13ff245ffc0eb554d2e8ed38afee94d6161374b6b2fc2086ac178fba9352732a81ac4b9272180d8446f36dc7341a29d82a1ee7b95fd3 SHA512 b5c68be78124b88a5131f973f781816cb325803206a45923045b4ab56e87feecb6cf4ad30fb864e885f9611a9728df02c97b26b0821e2b9837113b339cf91b25
 EBUILD click-plugins-1.1.1.ebuild 555 BLAKE2B 457084a7f66e7cd1863910a779640d9b8c8957d6064edaa3f99d674351adf8f7c283df139293dd3f19a792577055c0e7d6e86020d9284073dab58955f57b4812 SHA512 4acc10428234995ccf7cde9465005e05a70301b6df617c32c2a8a4722f8fa51e30a4b3c5b200d386a5dc26d5a12d3528b28e4a040b1a350729d10550b6eb774d
 MISC metadata.xml 311 BLAKE2B 979e8b892b9771bdac7ffa3a58e165097a70dfde354a5062316850ff72c4192148f053fe0be60ba6aa43434b757d15647c02682fc21f08dc986ef02f15232e59 SHA512 132f8fc7fbe5005f70578d5eab2f43ec62e322df618ce479d22958dcaa4c63d192506a7a9423978b1f850689717e32d2a78b883502cf1f43e24fb7a61bfad578
diff --git a/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild b/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
index 7edb524346e6..974d050db8f7 100644
--- a/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Module for click to enable registering CLI commands via setuptools
 HOMEPAGE="https://github.com/click-contrib/click-plugins"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 SLOT="0"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/colored-traceback/Manifest b/dev-python/colored-traceback/Manifest
index f230b5d7ce01..02d6ba17cb1a 100644
--- a/dev-python/colored-traceback/Manifest
+++ b/dev-python/colored-traceback/Manifest
@@ -1,3 +1,3 @@
 DIST colored-traceback-0.3.0.tar.gz 3837 BLAKE2B bf79942de0d0791b567dce21609be87319da11596b90e67018ee74069ea63b072b73778283112f9f52270fef046220eff355993d38f84ecd80d895da0401a010 SHA512 013d779df231295319c29a48fe81a5ddfd1b77b1734dedf630a914bdf0ea89e19a8ec028ae40c55125209e748f4027a74d04ec816f6c6d3c21aca52d2dd58e37
-EBUILD colored-traceback-0.3.0.ebuild 492 BLAKE2B da06e8cadfeb2166df53bf789cace2c609b2fd9ff02c1c57f90a8287bbe0108a18336b1b31916b2e053f96524b152c0f7ffa5abef0a133da04626fe5a3291221 SHA512 76757bd2af15d96fa9a972281e2bc8e7fbe9e015a26715156caa177ba8887f98dcea522b5565fb0d5c4301f1d55dd1181d5904479e203ad5be9954bed320794b
+EBUILD colored-traceback-0.3.0.ebuild 490 BLAKE2B bf0d67275d9d1c2fac97cbcaaa8bed244d527689a61fc95d8fcc157e266b2480dac604692c7bceacce8784cafc732e7f9be3ddfbf8f34d1c45ab0675a219b68a SHA512 c863fb6ec7c66091dde66a42d1b1d214e19415e1ed24766e492e8418fb740bdc397095ec0daa3bd497d2ebe9e449cfa20622b2d33432bd2b290616f59b645f3e
 MISC metadata.xml 688 BLAKE2B cb19e8c52ec09fdcbd3563f06535dcbd00506277dbb64d26f36333e4aaee415830f3a07a3ca3d332fed32941cb9bb367e865b8773f045be5c39ec7d929f0a294 SHA512 d4c17a08782f133dc0a16be3035a05ed0f2ba83818d8fd923a9be042f88b445fa29e07183e95abfded1b4dc68d086be40f3790daadff61d210831b02f3ddeff2
diff --git a/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild b/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
index bfd28ce3802e..4da6115229bb 100644
--- a/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
+++ b/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index db7392e29a31..1123415c4b3e 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,9 +1,5 @@
-DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953d7696ee0ef3046f6555f54634cfc643ada2a03971685021a5cf59191d75a0bddbc83f736e11a2516c684b0f0d9 SHA512 d199d710cdfac5c6cde79224b4a27d6b88a0e0c504eff7ad5700e9fb1f5cc8e1e9359dcc12f6c447a7ee6cd680feeb89f70ad68574a739c55a6d09b22017df06
 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
-DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b
 DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
-EBUILD coverage-7.0.5.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8
-EBUILD coverage-7.1.0.ebuild 1880 BLAKE2B 625b4106e56dfdd41ecdf7d90c7a95dee9b41cc81a428a5fd54b1df3c7ad87ea9a9267e999f831cd0708f6a15f008905aebb27bbcf56e75c0dd25d38bc6e70b5 SHA512 a45c4292c142aa9bc59d8e4684246a10156e4b0348edb3a4faaf86d4ea700c68f672338f0483584181c84a516d7cb21d1b1ed3c1619ac159666c8c3a0deac1e2
-EBUILD coverage-7.2.0.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
+EBUILD coverage-7.1.0.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8
 EBUILD coverage-7.2.1.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.0.5.ebuild b/dev-python/coverage/coverage-7.0.5.ebuild
deleted file mode 100644
index f45105fbf16b..000000000000
--- a/dev-python/coverage/coverage-7.0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild
index a0a35a6df9e0..f45105fbf16b 100644
--- a/dev-python/coverage/coverage-7.1.0.ebuild
+++ b/dev-python/coverage/coverage-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/coverage/coverage-7.2.0.ebuild b/dev-python/coverage/coverage-7.2.0.ebuild
deleted file mode 100644
index b83e4bdd6609..000000000000
--- a/dev-python/coverage/coverage-7.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 272bc9128987..9d64b8571ba6 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -5,6 +5,6 @@ DIST cython-0.29.32.gh.tar.gz 2110417 BLAKE2B 008ffe325c87d165bf45afb2ff92db5286
 DIST cython-0.29.33.gh.tar.gz 2113910 BLAKE2B 9212edfa36680a3243632d28c4f5616a7336e82ee1f96df7d5e29711056619639c9a8fe9bbf9aea0a86aed39e836dc6eaa112ad35080f530add6309ccd09c53c SHA512 85f5ba7159d8793dbda980140b26086727f356a71d78f8522419657841d07b865d09c2f0a0f77d398669d071c1d261060235321a19eb7808e35d24f8ac71560d
 DIST cython-3.0.0b1.gh.tar.gz 2659132 BLAKE2B 7ed252d90f71521f24817e064f1b55f671185053cdd46214fb14f2b6e16dbfbc46e87659681ead40a32bb0506150ae6b8cdbaceae7667811aa81f97a39b5efcc SHA512 a7b2e9c22d19eab9e4ad551895e5c8882a7098a52865e341fd84d902124b4599d193d202333d9f1ffd5354fff62637c65d124820e6721905edaed46b5881b14c
 EBUILD cython-0.29.32.ebuild 1989 BLAKE2B 57cc0e23f5ec7feaa5a697e6807b37003cbaa6b7be1757ff607c6591dfc39a5f7e1e0e016630f47f9f7a8cb6b235682952a894f1a2cdcad2d2f9aabef98a39e2 SHA512 ba986bf5401dc05f204270e03a4b3f911721f5e94a79bcd1c714c8a0956affe7919bae01c433ade3b84ab22a823c7c61af95b8364470781c430dd6b125244886
-EBUILD cython-0.29.33.ebuild 1995 BLAKE2B 7c05a109959ed765232f618d4a60ca1f79439af246bf0c53fdf2b65eac9ff256c4c061bd28eef80c4b088e8ea74539870bbe423944b84c52a1a28dfc6bb826de SHA512 a0fac8ab71978548a5baf7085151203dc8571c3d5c4ec073f48ff406af57c3b4f4a22374ce3a7ca29d2baa2f2f28cfa8b9aca3b38aa613bfaf6d1cc28342514a
+EBUILD cython-0.29.33.ebuild 1994 BLAKE2B 22ffd32ada24e6379570c6f35ab8112a5fcb4d752342c35a24894c9084f691c78602cd18b522af593996bf0f32162a01fc4698b7a3a71cb4e04087a65a99ff04 SHA512 02a7e8b26d67de62704c2ccdd7f294ee86f9d11ddd4ddf67487477083b2d3f2b82c535de04519178ce67aa37b782456fd954107e43ec3175331402c023e3aa3b
 EBUILD cython-3.0.0_beta1.ebuild 2121 BLAKE2B ced4f51629663e7a8237996c7627123c30ca26f7492cfcbe63539f29646a75bed8f265b4e14ea6fca648ced5865ab666e31ae15dd31e1a95889269cf05703517 SHA512 928c1faa04105265373cb4177579f237d52abe104bd49800dc1bd31df432bc03e2d03af7de87604b6eba0ec5d429deea1c19c92719903f4732d033709df68bca
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.33.ebuild b/dev-python/cython/cython-0.29.33.ebuild
index db102dddd08d..ed6b43043b3b 100644
--- a/dev-python/cython/cython-0.29.33.ebuild
+++ b/dev-python/cython/cython-0.29.33.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index ce0d2a90c415..3cd227950ff7 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,11 +1,5 @@
-DIST dulwich-0.20.50.tar.gz 430389 BLAKE2B 1ea86fe00fa560311bdcff8c51904982a506fa670efb503f9103c5fb25036a792a87583fdf6435a6a6ec7bd6aaa2277c621359e1d99f55450c247fdc4be74e51 SHA512 506cc76f7deb8247b910fa4971e28eeda6ddd34703ac3c7a2f3b6525e6a9229bbec527b1965bebf7aa3da17b5adbd146916f247acacf9caf86d2494e60cc8626
-DIST dulwich-0.21.0.tar.gz 436570 BLAKE2B d63185fe6e900823f5b295454a41be4f8508aa4c1757599186a0daab6f9b44e0036485d16d9f3dd34e3d1d191987cb0191254cee844caadadf9e43d0a2de0645 SHA512 ff437cb8381d91183d2843397afed5c1b04db000a093d61b6cdb1d76821104260e9d8572a05cf10c8959b88b99ec8fbcd3ff3a3ae2f860ab6201773de32635b5
-DIST dulwich-0.21.1.tar.gz 436958 BLAKE2B b821eb8a195496066017c0f9c9076ed25e1bfb894cead5175143a8944a16b8a82ca54d9a65d1aea23d7a039ce63343c608e2694f756b65b49e345d0ff49293f4 SHA512 bef3725b6101d0b8f115df432ca41a5f7b05fc5d84aa87f99f5815c670775ab74264a88768fbbe41bb89ff4cc6618b5a8a01ad2dae33f121ead424b5ed977f82
 DIST dulwich-0.21.2.tar.gz 436949 BLAKE2B 8c3b42e103146c3641292eaaae29b2e53690a84fe0ba68adcaecc7ed75ce5ee3af64cffcc702b98a5bef18b6edfe888b2db0232430cf0289d1ca14dd49f3fb14 SHA512 edc7ea98f3417bd3f460d3c5fb54ceb1974df79e85fea4b4d324a79f487a5303edbdb256bae0b5c6e83615cf8788a2a921bfbd5031d4d3e4dbdd1c97ea1295e8
 DIST dulwich-0.21.3.tar.gz 437815 BLAKE2B 889bb20800bbf45da6ddd688ed1e8ff2ca76fc3671409bb4bee4ed7604f008610adcd68feda9bf50bdd6432d3ad400e381506369d6411905a8388884093d5540 SHA512 ffe89535bd48709e68bff6b299034ab6ccd28960cc32b3717d9779c84c87548d8366dfadfb0699c99b99f8e599d91284e05dcc3c1f9ae4d7b208500856eb33ac
-EBUILD dulwich-0.20.50.ebuild 1519 BLAKE2B 8a60db99c5074d493c79d9716f3ff59c3a4a58e705689d8accfa990e3bdeeb7c11ecd2d54d9a9012540c706dd7b13076ef9a339393e2c9c7056f4f43dacc42b7 SHA512 db8f6cab8b4604a2b174dbbfec5e107752aa00da05d0a1f6caba2a6b50cccb3fa0ef66a5239d4f21a04fc574643c003b1d1c99f35c825f53deaffe98986d0159
-EBUILD dulwich-0.21.0.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
-EBUILD dulwich-0.21.1.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
-EBUILD dulwich-0.21.2.ebuild 1520 BLAKE2B 9b414064917d81fc64665478cc5cdfc7c0de5d854e3612f06cfb99e828238275f32e98b37d60dc6c5b4274301c8d4d9c7b73a7b1ab2a4c8c3e4d797cb5bb1ea4 SHA512 7cac81a4a9b0c76f482946c3435d2fe286fb0accecee448379f1c3eb13cf44dbfb48786d26cd3be10cd23769eda5aca152254f6fe3b0dd7acb3c53069a5ef903
+EBUILD dulwich-0.21.2.ebuild 1519 BLAKE2B 8a60db99c5074d493c79d9716f3ff59c3a4a58e705689d8accfa990e3bdeeb7c11ecd2d54d9a9012540c706dd7b13076ef9a339393e2c9c7056f4f43dacc42b7 SHA512 db8f6cab8b4604a2b174dbbfec5e107752aa00da05d0a1f6caba2a6b50cccb3fa0ef66a5239d4f21a04fc574643c003b1d1c99f35c825f53deaffe98986d0159
 EBUILD dulwich-0.21.3.ebuild 1476 BLAKE2B 6575e4fc74da8f4525c78e5fc88d2e5255a4e073d957a5d8d3336c29338ce2b85ada7feba088f0f6094e4d8a3fc4fb2ab1bea6880211bc66220399a2e55de2b0 SHA512 34a74034f8ce4a3548f7313817eceb576e8772dd961d7ed9bbb0baa09301950461ff4e05f846a83a69ec34ea6eba1f34a58a9874f6bc6fac3091bc0f1eab6a4e
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.50.ebuild b/dev-python/dulwich/dulwich-0.20.50.ebuild
deleted file mode 100644
index d774e8bcb728..000000000000
--- a/dev-python/dulwich/dulwich-0.20.50.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.21.0.ebuild b/dev-python/dulwich/dulwich-0.21.0.ebuild
deleted file mode 100644
index 2949d3dcec07..000000000000
--- a/dev-python/dulwich/dulwich-0.21.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.21.1.ebuild b/dev-python/dulwich/dulwich-0.21.1.ebuild
deleted file mode 100644
index 2949d3dcec07..000000000000
--- a/dev-python/dulwich/dulwich-0.21.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		app-crypt/gpgme[python,${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.21.2.ebuild b/dev-python/dulwich/dulwich-0.21.2.ebuild
index 3860758cfd93..d774e8bcb728 100644
--- a/dev-python/dulwich/dulwich-0.21.2.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 8facfcd6b46b..4f93144cb46e 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,9 @@
+DIST fakeredis-py-2.10.0.gh.tar.gz 160050 BLAKE2B 9c97abe80ca683cd068e3e8616b068c166f08f1b1eb360b76c57da4b9d68396a5dd6fb4152e92dcd73a1407c50e259db54ba5edd61bc2dca774672de84fcf2d3 SHA512 31df18ead5e2937a7a98297f4dc08790371968dd1fa6d9dfa54eb35ab27c2a4a88e2186c252c8a630e0e70fa04e67eccb68e687f9383b6770313cf8b79f6b3bc
 DIST fakeredis-py-2.6.0.gh.tar.gz 151925 BLAKE2B 60538efa5de93436177aa019908f02affb9df9b2aaf1349e933da6f066f98aaa255bbdb3297645ad1dc3b67a57a61bb8081e476f451799b512719f5779c1218d SHA512 19a23be7a182f962e66686f3c4ec3a5b9fbc847d97e48f19fde11ae268f4a70de567ff2ca302a9fe0e7080de2215698cf5b2ff2febda5eef6748f3ec8d601720
 DIST fakeredis-py-2.9.0.gh.tar.gz 165442 BLAKE2B e71780b273f1847454d0e6e89f3f97a9d4a81d86345857fced39413521202f299b90c8a218f12b15d79a3bb7c865d7b0280798920cfd93120a553511b3a343ff SHA512 2ddf2570e7f00647834f8f07a3fef6ec68d630ff93ddd5375dcc47a14a5a7bf430dbc4a1abfb38fa2b5e18f1aa1f4ef5413b39c4bb3ed9d167aa1729edfa9870
 DIST fakeredis-py-2.9.1.gh.tar.gz 165449 BLAKE2B 6d0b6937a460d5fd27270df5e2d88c332f4ab42e97430fc7efd5777e35051fd44f6ab01b013637ee17bccada199e126075e2efd5fa7e3fd0112739e0e14f3c31 SHA512 bf18454ec2ab62e49b4b3f93d494d7648b1b82d9ec3720e7418767dc4acdfc89e86df8ec1b9814ac69fb4b6fa13d25f2ed3a62f82f479d6614a994904f97f249
 DIST fakeredis-py-2.9.2.gh.tar.gz 165549 BLAKE2B 351e07976ed6a4d11429c83aefe3a0e2d4397a97fdb2904ab65ac4d2717d129f5ac018f071b8670012aabe127d87350f3285f6f86369bb4b7eadbd61da5774f7 SHA512 6e9ab0851f74ade2325aad88b86212b4052ca53a7510034cd888ef4080eec4129b226ab8c166ab09fa6e3d3b2c3c70fce8adafdb4081a4d3501fd4d9d5e04b84
+EBUILD fakeredis-2.10.0.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
 EBUILD fakeredis-2.6.0.ebuild 2074 BLAKE2B bbef8fdd31c1f1ba42a628aadd8688c2f6af4cb5894a1a68ff9313fb43ebf11edfdc1a878969d4c4fb94c553f6925a58504e16bd9cc34acec54c0d6629a78577 SHA512 d32ac3244d2909c5746190b7e0a66599ea0ebed1f3f59b61894674410dad70003faac790dbf794b77df665879b644d0a7990033d9077a9a065f11d451855047f
 EBUILD fakeredis-2.9.0.ebuild 2010 BLAKE2B 435a9873d94081fcf3cda01959f4349d998ed02d986511cae95e700693a9dc1f4d7b002ffe75d8ec708856899dfc735c1fc5d567b603b0570c41c5ebb7165ef7 SHA512 a7b51f37fc01717d64fea5d00d3c2b9544b2d7d278ddee8c098f9bf56135288052beb357560f130df355b3367effc6eb7102116b61b4f0b08abb026bdbb39740
 EBUILD fakeredis-2.9.1.ebuild 2010 BLAKE2B 435a9873d94081fcf3cda01959f4349d998ed02d986511cae95e700693a9dc1f4d7b002ffe75d8ec708856899dfc735c1fc5d567b603b0570c41c5ebb7165ef7 SHA512 a7b51f37fc01717d64fea5d00d3c2b9544b2d7d278ddee8c098f9bf56135288052beb357560f130df355b3367effc6eb7102116b61b4f0b08abb026bdbb39740
diff --git a/dev-python/fakeredis/fakeredis-2.10.0.ebuild b/dev-python/fakeredis/fakeredis-2.10.0.ebuild
new file mode 100644
index 000000000000..c382b83985f0
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.10.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/redis-5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
+	)
+	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'
+	)
+	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/fsspec/Manifest b/dev-python/fsspec/Manifest
index 6e61fad78838..b0a4868c727e 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,5 @@
 DIST filesystem_spec-2023.1.0.gh.tar.gz 346962 BLAKE2B debabc938d2725b0c6e0a5aabdd6033a14655799a0b4ed98f171cdb3761dea6f3f85b63c91ca5461341e75c50aef53e4d09c6ac3582020247382c5e39a8d4791 SHA512 181e5dfc05ba664d9464246b2398c70a0bad3f274dab462a2432eae24ecf3307c49af46674f8222fac87964fbf3666bb7ad9e709484dc959b0333447b9a82a2b
+DIST filesystem_spec-2023.3.0.gh.tar.gz 352352 BLAKE2B e4a4edb882aa0aa15f654d3ae63d278b03a0b1fdc99fb1e7f48baefa750134aa2c9ddc89cc53aa829155b103107cbfb0c99d6c6fdeb5bf85068af5f1fc467ae4 SHA512 7c21eb60932267fe73dea3672d2e9b2d71fb3df26aedec9d109109168b91605602903518337563c00ae8b7d82212211ca569d3a91adb840eefd41eecab33c3ec
 EBUILD fsspec-2023.1.0.ebuild 1830 BLAKE2B c55981caf2ef78407afd92eca0b0be8137bbd1b26907329fb2eb9a608c9a2a83348f3ed80445db276424d40a14f08b51dac33db8070ebd0f2afdea8e8a5886d7 SHA512 ed043f8ae70819cb98f44885b68f8d9107b11b87d7a768ea55de0c2113960d6330b0618ab9146422d3546d3b4d61f33ca4e865209d54b32ece5ffd6812e3b3b4
+EBUILD fsspec-2023.3.0.ebuild 1832 BLAKE2B c8fd65840c039cec796338b63e828615b10c2f232379accd797ccff398cb5e4859e0e5dad62afbd85af0a24b5d0ef23867f36ed3610c5dfe74f5c359a39be7e9 SHA512 b756f30109a8562a8156552c2f70f22cb87937c2d43462702a7cfa839cfe4996923c6ae48b4f38fdc899debc034b8e0060cae9f21fc61efc0dd10977802b0995
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2023.3.0.ebuild b/dev-python/fsspec/fsspec-2023.3.0.ebuild
new file mode 100644
index 000000000000..d5cb7a874d91
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2023.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="
+	https://github.com/fsspec/filesystem_spec/
+	https://pypi.org/project/fsspec/
+"
+SRC_URI="
+	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+EPYTEST_DESELECT=(
+	fsspec/tests/test_spec.py::test_find
+	# requires s3fs
+	fsspec/implementations/tests/test_local.py::test_urlpath_inference_errors
+	fsspec/tests/test_core.py::test_mismatch
+	# requires pyarrow, fastparquet
+	fsspec/implementations/tests/test_reference.py::test_df_single
+	fsspec/implementations/tests/test_reference.py::test_df_multi
+	# bad test, fails when PWD contains dots...
+	# https://github.com/fsspec/filesystem_spec/issues/1161
+	fsspec/implementations/tests/test_local.py::test_make_path_posix
+)
+
+EPYTEST_IGNORE=(
+	# sftp and smb require server started via docker
+	fsspec/implementations/tests/test_dbfs.py
+	fsspec/implementations/tests/test_sftp.py
+	fsspec/implementations/tests/test_smb.py
+	# unhappy about dev-python/fuse-python (?)
+	fsspec/tests/test_fuse.py
+)
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 0db2b873411c..c62ebc2f67b2 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -2,7 +2,7 @@ AUX hiredis-2.0.0-CVE-2021-32765.patch 923 BLAKE2B ea62b3f4ca1ea622ea9eed89af3ee
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
 AUX hiredis-2.2.2-system-libs.patch 1421 BLAKE2B d10de294e0e15ec1b816505c852b0e82140874bd3f1434515ecd69d04236efcc8fbf24f6b261db138979d1547892bf71e1c3c5e74317ef43c3597b379c03231e SHA512 dcc64f1a83cfe5c956c65c1bf1f9ef31b3c66e393d0dcec342f9f8cd6265a41309a03ddae7d86fa85806a05dac7bb89d29a3b7ebb955d62409fbb719e7c8004a
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-DIST hiredis-2.2.2.tar.gz 84086 BLAKE2B f8a3b3baceb1b68d87202fe1fdd954d1e2a3320dab93acbe2d6f86a462ca18814c41416f84b8ba306a7c9af18560375e6523025c3b81f3c92e89620c68ed6a7e SHA512 abb6883af0d186f0ada10ebb2128cc31c8e84273b75de762097489b25a28ed4442bf33a9c088152843aadfcb4daaae6ff65a21cf0e5d8a07a60a7e3fac1ab855
+DIST hiredis-2.2.2.gh.tar.gz 18010 BLAKE2B 67ab7c3f0667d3cf33abea58fbe37bcc28beb569f6f3da966f191d00965faa5a835a286172179d6f33f4e0fa81743fa345829f04d9d89350ab1394cc0c168147 SHA512 8a42df63911000cd119da33e7fea25fa1a5244a86016818bcb6c6e12c042b12b00b7272633d85dcf921fd2eba67145e3258c64689be799a0f59766e541139120
 EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B 431f260350264549e704c43257e0cadabdd5b0736c0fcf1e7fc1533de191b7dbd390b7f80f076b7e162b05319881ab956f7e33ac84e710d006d8e5711f050c37 SHA512 b934178ce581f3dba577e69d0dbbf368a76830179fb1f525f4661274ccb715ed590880225be992f52f991ec6edc2a13c48a241f6199a8a74f466ead5d8e6f4cf
-EBUILD hiredis-2.2.2.ebuild 604 BLAKE2B 430cfc9a02a0c2620268ce2636d35c1a5afaa29f44cc08c58a115e1a728abf4ecd13186b9108cd6c56ab9a3d77e3acf76ac3f9cd49482daeaaf77e888d26c5a0 SHA512 16ec93824f16aea8f2ac2ddda8642815e70f2508bb688b69252ddbd823118fb7592f44b99c981671501c3fe12eab65209e863c66cfdc89d70ef2ba700699627f
+EBUILD hiredis-2.2.2-r1.ebuild 726 BLAKE2B 9c2c86b79dd6a318aedff5cf718e640b47cb8f31bde8e02cd8bcb36d651175123a0af187686713e07ba42bc043d2771b2dde42274a9cfb877f42b54a7e19eaae SHA512 079d5dee64da6aef64c182d54e4144fc069f8be768e85e55269a0bc1f14ef2f836d0a69153a230eb7247fea5afdd85ead9f976b057fc5302b06172647958e4ca
 MISC metadata.xml 590 BLAKE2B 546eb7e337de194c605799553964c62f4376e0b28588b7b8f7e1d22d82bb347c7dbff99d1dc947c24491c045b506aa3965e9a1bfbfcb97741d5a0c7e075576f0 SHA512 76b32faa707c7bcca41b1018c58e9782283e707865a8b99926f0f6060f915cbd4ea6b35da1a906385b5925d714ec3bd4f587f1065b01a826d8a6a3764af92a87
diff --git a/dev-python/hiredis/hiredis-2.2.2.ebuild b/dev-python/hiredis/hiredis-2.2.2-r1.ebuild
index c92b75861004..504ba13a0426 100644
--- a/dev-python/hiredis/hiredis-2.2.2.ebuild
+++ b/dev-python/hiredis/hiredis-2.2.2-r1.ebuild
@@ -3,24 +3,32 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517="setuptools"
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Python extension that wraps hiredis"
 HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/redis/hiredis-py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="system-libs"
+IUSE=""
 
-DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
+DEPEND=">=dev-libs/hiredis-1.0.0:="
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${P}-system-libs.patch
-	)
-	default
+S="${WORKDIR}"/${PN}-py-${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libs.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests
+	epytest --import-mode=append
 }
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index cff51794c249..230e12633ae3 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,5 +1,3 @@
-DIST Js2Py-0.71_p20210918.tar.gz 1970784 BLAKE2B 4ea446b306e858c2acb192a699b4c098cca1a334fd97246d3149186795a013fa1ff9cf45ecc5cd9bed241b13b3eb003ebf272f5af4ed24a608564fd4709e4ff1 SHA512 810363e4b0716e324e6deb5f373968c9c57e7ecf120710c064601ad46ca2f24bc8da52f779f861296dd506de06d664be86b3c0d72bcb811892fe4e6c22ad7a6d
 DIST Js2Py-0.74.tar.gz 2504984 BLAKE2B 1e4f34ad94947118aeaf84ff438f9bec5b2a8ca3c722d907d3b8015acfcaafe1f229cfe401ae0f3d07c0f074ecf2f9ca3aeb94ef9c394b7ed6d90f1279c1ffa2 SHA512 cb2f42c2bec0c15dadc301ee0a7ac452cc8c4bba4669e95f1155863590d6d00781883b54d4dab755a0f66eb6e30990fedca732494b1f8b6c07dc29f5203a8c8c
-EBUILD js2py-0.71_p20210918.ebuild 1127 BLAKE2B e378e053da7f36df12b9cb19b870c7e650f074e74737450323cb621705646515796f03d28814ee87de94afff5a02348b15d0f90f3504940476c2648175c346ac SHA512 8f530fe920da226c87d4cdf1b976d5369ec32f61cf3e5d55b6850bd350ebde062b6b538d1b23488c6230ef2808d78c2ff1e4b73a7264e112e752db4c58ebb674
 EBUILD js2py-0.74.ebuild 1076 BLAKE2B 4c60fb95bfabaf64e38fbd2b30df281e52d7bff81ee544611b3f64ed4bd2733992453f8337a0f51db240f9d2b5614aaa81a69cb42f65d422626e6dd46443b2c2 SHA512 d3ec6248292ba5b6c9bd9dcbea39cc38ca4eef70989a1768214f360bde88b2a2b2a1dbec481438834ee4823e3c49eedee0766b47bc8ee07b977cf86bf8a50e48
 MISC metadata.xml 385 BLAKE2B 145afe58273b407d1ba1f3859de0d79a3bdd4307575d043a8b574a8bac26c2d577efec841c6c3a9424ca7970dac33517df48c0f287c18bf4e1cc5faa5125ba6e SHA512 7e48c836578bcbb4abf0d99f0f2b870ab15158f05d5c402e2d84c9f9de7d2c994127eba26897e406b6c7d77c962867d39a37bf7ce78ca09d39b78d64f9d8d68d
diff --git a/dev-python/js2py/js2py-0.71_p20210918.ebuild b/dev-python/js2py/js2py-0.71_p20210918.ebuild
deleted file mode 100644
index 7a513afcf9f4..000000000000
--- a/dev-python/js2py/js2py-0.71_p20210918.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-H=b16d7ce90ac9c03358010c1599c3e87698c9993f
-MY_PN=Js2Py
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
-HOMEPAGE=" http://piter.io/projects/js2py/
-	https://github.com/PiotrDabkowski/Js2Py/
-	https://pypi.org/project/Js2Py/"
-SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${H}.tar.gz
-			-> ${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_PN}-${H}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	pushd ./tests >/dev/null || die
-
-	# Tests require "node_failed.txt" file where the logs are kept
-	if [[ -f ./node_failed.txt ]] ; then
-		rm ./node_failed.txt || die
-	fi
-
-	touch ./node_failed.txt || die
-	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
-
-	popd >/dev/null || die
-}
diff --git a/dev-python/jupyter-server-terminals/Manifest b/dev-python/jupyter-server-terminals/Manifest
index 8151f1af8993..57b51a96dadc 100644
--- a/dev-python/jupyter-server-terminals/Manifest
+++ b/dev-python/jupyter-server-terminals/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_terminals-0.4.4.tar.gz 29850 BLAKE2B 064876d7a10e7ff66da83e07d562abe53d609caeb27bcd7b7181d10c06af4406ee048b45b73092c8f3b0c10df40494eca1edb5234030154c63ea6a330f85a115 SHA512 5b1a6a9cfd550108be7f6664eac5ab7581d75e78a7dfc9825af2346b0d9b19f05543dcce010dafb9554c0782bf8e7929bf0ef96bdf2db392ab9b9ec1a3633fdd
-EBUILD jupyter-server-terminals-0.4.4.ebuild 978 BLAKE2B 5cdc6e348034ae487d781d8a163c9f9a3004efd545ec7db8820636149bd639ec15e8946d612705e5568ab2a76e7492f49086a07cc0d543f63eaed63358937871 SHA512 472f0872dfe77ed654981fbf5264824c376aefe31b4ef6fb03dea3b0897e6ed2e882e758bfa4966bf056b7c122d2902b0cd1011ed97f41eb408e6acc30aca5ed
+EBUILD jupyter-server-terminals-0.4.4.ebuild 997 BLAKE2B 377125f09b1ade5e822ac9ea43ac9c83cb5126a640893bdbc29975959bdf38cd556d67a864263367aac944a8a3274e3b5bb2fb3d8a1d9f2195e2d63c85e9f3d9 SHA512 47dcc5dfd4eb5133467b8e37f27281a26f522ad99da5dddb9fe277cfcb40f05b608a60f9d6992b5f511f445e6b76f1273cb54aaf9b82d7894d6fe71113cb458f
 MISC metadata.xml 457 BLAKE2B 6667133607998f468774a24e818962e037f937805af2578f0b759be79421abdd389cba957d79c8d7d4039f1dc6698ca1d1e08bcada91d4aa503bac21c041df9e SHA512 9ae0f7f3ab2bba3aeab9eecaac56995cba07f4c55551351a290b25550d6a4516432a73616a850ac7e7bede45a458ed8bec7dccbde7322015239062efee4b4e40
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
index a575814d1869..79a838cf0d1f 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~hppa ~s390 ~sparc"
 
 RDEPEND="
 	dev-python/terminado[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_events/Manifest b/dev-python/jupyter_events/Manifest
index 7188a7d214eb..01dc00566bca 100644
--- a/dev-python/jupyter_events/Manifest
+++ b/dev-python/jupyter_events/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_events-0.5.0.tar.gz 55838 BLAKE2B a3ac815a28d2592a10394569726b76de75cb3baab0bab4c1f276da33375ba93d6bfed71fbfaca404a238b7af58ebd7e75dd7fdf6c8717141517c2f790eeb9514 SHA512 49c21f0d5dce18b137f73911b0272919a56c972561deceb228558ea369f2091ce219ac335eec002b22ca1465b2622330fb3d8973d142df4b76e350345cb6249a
 DIST jupyter_events-0.6.3.tar.gz 59393 BLAKE2B 0f747cc099e8b0e30024b7fa61007d4449fad1be3b4807021df28668969dca18087634606d6f2c453da81da9c107576133e13ec373cf34362d0182320e84e809 SHA512 a9b9c180f7b4759a3d2c99421947a837020149ec1a91ad0cd06971d7ae99ad1050652f01f78c9478ce3fd3f1a1ab6b579e90c279fcee0771546f3c346becd61f
 EBUILD jupyter_events-0.5.0.ebuild 1019 BLAKE2B 31be848e26b53dae919dbdb4e7ac5e2d28b42f35b30530f09f187ccf63eb1348ee96898f21a03c05d7f8e3ba92f50e3e38cc0580e4b659d08ac151d92e328595 SHA512 e45695af80ea00b0c152231cfbb186eb37e9eed18541cbfccf93aa543f06646d99a19ae7fc9ee8e8b630773dbfb1867f7f792cdf558368eb99e63464aada79c0
-EBUILD jupyter_events-0.6.3.ebuild 1071 BLAKE2B 454423d86ef52eb198e0f8a19db0b1c2661c757399efbccba4bbc4870a60d08977ffeb762b27625ffe18c03a41200a4b4a40ca0e3441f776dbd562ab8931e126 SHA512 564dbbb1373dc7b951b95555e48109175331a341b3f15043a9b5be1b0c567fb4f803f633fabfa350b6a678f835f8e75e1cb4e351e66e2fb338e3ab1681e0b789
+EBUILD jupyter_events-0.6.3.ebuild 1090 BLAKE2B 3aa5700d789519beaf644e07e899056d8c5d8ceb8ce58848ac63db0334cb773254fca95101ac2879a8d72a6a3ac1530b24f5a6853a619acd1a81e75e9ed6648a SHA512 540221d3f37a558131433bde33473dd02f12dee32579f2dc84ae798d4d7084c9330bd14a84db3779bcf7b6dfbb60fec60817a03e828a9843b6f5beaf1bfb710e
 MISC metadata.xml 537 BLAKE2B dfe33b67ac51a46c9ad33d4b0e02ff39d5aa1780d70f92f12b7ee8ac336c43caa79201bebd42c461373bfdc7608580487ec000613cf92765fec352b70a8aec13 SHA512 689e8a1125b4da96db6d6c4495933ee29d24666ad9e7e3af891170f8da512ac388c005836402c74418476cb9838f278c19f5267840533cef0e02091d47fa43ea
diff --git a/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild b/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
index c4fed0cf6ef2..4aa86dab5d33 100644
--- a/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
+++ b/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # jsonschema[format-nongpl] deps are always on in our ebuild
 RDEPEND="
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index f7706dd99664..80bed4df9737 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -5,5 +5,5 @@ DIST jupyter_server-2.3.0.tar.gz 690143 BLAKE2B 06dcd78ecc55817600200ebbf03d1522
 EBUILD jupyter_server-1.19.1.ebuild 2282 BLAKE2B e9401e36a4b31f75ecb6fa8cc253182f04b79784106b0898832fea2f6faa3385e1c748cd9bb474e32f6316ec37ee4e818d1466a8242fb1abd25c8df27c4e3909 SHA512 294432d78c688f22ad90404a126fc9fc53255333f7b2916ef8e4490df62872d8277175b6ddc8d6675f13a0fd85836e3966bf8654294a2f6ac5b3f10d83a18b59
 EBUILD jupyter_server-2.2.1-r1.ebuild 2114 BLAKE2B d79e7f660be3e5aae65b7da999a10c66b3d55cfd4e26c332a25d1981f495f601f6791bedd3eb3bf698c24cfca0a1a0c4c3e98fcc9171beca0f8c5facccfe3ba1 SHA512 2c3d6a9f8b4dc21ef82964a1ae4d178cd046fac4ccc9ecaf033a51eb74acfce1c539a5ad7f1fb79ca8c98296006034ae683586f4ad655c775f6243fe096afe9d
 EBUILD jupyter_server-2.2.1.ebuild 2150 BLAKE2B 26d8be46c196fa30195151a781daaaaa887fcdf3d534e791a9b0d924bf24b8fb78c3c9320d552091c6d9f448f30f902a49fcdbb8fc9bdddffa37d3303c79f598 SHA512 c8945ac5bf1059bee07e6532175182476d49cdfefaf10fe6f51a464010cd993e283fe5986e5adb6c7f29ccd3db29766be7fe5bc6913273f1347229ca60588b9f
-EBUILD jupyter_server-2.3.0.ebuild 2119 BLAKE2B a81ee1f21d443db8ba7cfc494f9f351e38fcc0880c0bfe6fd1f905d73d53ac19f8a1774d26d1d5da11f947b0a700ae5a2bf405103e8d4be77a642d35cf9712e9 SHA512 7b8ee2ad2991abe72fcbdb8ea66e5630dc9ab5065a8f3d4218c711fad71b90363dcbc4722aae0b9982870abadbca675de0a9241cee0f8017287f15a73a9bd0e8
+EBUILD jupyter_server-2.3.0.ebuild 2138 BLAKE2B 33eeb02e34661e05a52a52dbb8d91af17902ff87bdf58d290ddbb9b67af8e6817aa61e1061b23203d597c2bfbb87ffe3048faaa0d9461a500ebc5c84c87f12d9 SHA512 7c910ba6821a4e31129d2143723cf12ef4918454e8fc25a345ed2991daf66468a2f6d5d16474db501eb85df6f65e1141ffb3bb107cb63118627dfd062c14e13c
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild b/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild
index 297025d2a593..82e47e9d444a 100644
--- a/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~hppa ~s390 ~sparc"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a40ce2b86c7d..5025d7cfeb42 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 914 BLAKE2B 5ec2a2dc492bcd56b0f4461b5f2b9eb2a948327027b98b9afd8dc022dcdb8b99012c91710b69432384e96cbceb1bb5351e259b02f0191aacda74edf07046b736 SHA512 46c55b6eed3ad82d459c3a1c52623ee928169401f56745b436904af6ad58959bc4b503d1fd0fe7bcf4cf1846db0f386a25ad9ccca46a0e1a61fb2a925b5073de
@@ -11,4 +12,5 @@ EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622
 EBUILD lit-16.0.0_rc3.ebuild 877 BLAKE2B e0fb3eb26a481420f154c6c7306824e929cbea060ec0e28c28991c39f86f756ee5d004abf6c76775975e053a588df73b2fd121a55617621c8a179899adecb41d SHA512 9799e40aa5ad07879a049777666963e225ffc97618fdae22869e8c8a648b0e33554859c525fad2307e23b96616bf24847c1ad7aa3e69353927c03f975b3bcbb8
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230225.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
+EBUILD lit-17.0.0_pre20230304.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-17.0.0_pre20230304.ebuild b/dev-python/lit/lit-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..f4b401a77373
--- /dev/null
+++ b/dev-python/lit/lit-17.0.0_pre20230304.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 96a61a61c52d..8493014561e5 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,15 +4,18 @@ AUX matplotlib-3.6.0-test.patch 10781 BLAKE2B 797fe4c86d94ecbfa5b7699c63f68e663a
 AUX matplotlib-3.6.2-test.patch 8245 BLAKE2B 12fbf6e5f68521e2dd91b577ec44da288ca84453a751687cbf3bba416ae0a0ba3a92a4577636f1b1455f6c1c9dd5064eea19ef18194005bf8ef758c4d48bd8f2 SHA512 eb21cd4e81a0a560a766fa6b47754011f388f0f5a677815326f49fcd9c22ef117aac1cb23445e3cd2c70aa52b00a4f298dff85d01692cfb4020bc38c37cee9d7
 AUX matplotlib-3.6.3-test.patch 804 BLAKE2B 1c4f28dec39bd282a5e04ba7656b2fed55d0bd114308f019b3cc6bcad7640ae1d2f29aed77346980853c7a251500d612555668fb0d9ee29573c13fdd3de87266 SHA512 fda1982cfed86eaf39cbcb4eff41d034f7e6dfee17afb9bf9d3932959e6d6b7ec19469fdc400f1b69a25419e2026a9858ea7d95fdf2e7bb9a257241aa1960030
 AUX matplotlib-3.7.0-test.patch 9910 BLAKE2B 1eb2766009957f43b00f26d6c7a1ca905a096980de25942355b6ff8d43cf8debab40122fabca8eb9f8ab145e4dda368ecd86084ca752e40662de2c5e6445e346 SHA512 f620f8c08010844e057c663fffc31230d617d7122300a68cea33e44b2d473ea448315eb09cb2df1ead4190e7b7d582bccec1583cf2046ce17713d324011b5841
+AUX matplotlib-3.7.1-test.patch 9910 BLAKE2B 6efcec53fa1b0001ee6121233fcf3718dce43b5f1d1b41401452c0193269427735e39400926ee2f94ee2c7a263c687fae66a9686563217b317afa3511f7bd29a SHA512 5f0661a1ac8305e45cb8de68d5b1a094c64002dac5d34bb937955d2e181721023eaba6ecea9fdf2a78a6ffc3cf29f6f640a5ae601ae6a0c6e355fe67e7393b07
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
 DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b
 DIST matplotlib-3.6.2.tar.gz 35843927 BLAKE2B 22b933b2ca2bfb156ee1592f522da6e7566f279fd6c7ef2d2f5aeb8697fc04085b57ba6bb5f7948572b3e671687b74d6ba9f7def2728b6224fbc98b121281a3c SHA512 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f
 DIST matplotlib-3.6.3.tar.gz 35868590 BLAKE2B aa511e7d82c41ff2b5622b23847c2e94ed5d400be74eddcdab12ddba8d25bcc1b778c5fb2a29935bca71b76cbf4213088286c9a6a3d085e06036069909ccc1e7 SHA512 844ca90bcc9953d3d1289a6d471180a3dadb49c75eb59858bbbfb67d4b1292b83b86b366f22ab12d9e97c980376d48b86e745607ec4e812a3010c6fec01398dc
 DIST matplotlib-3.7.0.tar.gz 36346055 BLAKE2B 558e14c5afaf7ec7f88604707b1adbd9bbcab7f8fcf2dfbc4d25b94b9fa55f4f04b4150d71f813a2be59b739dec1b70981afb0158d90fba03fbe19b291c3eafe SHA512 60207fb10394422b7a11faffb2775c23c377e6dd72ef9f3fde1099d50e1810c4be55cf814da74fd87faf49a628459472945bb901a4cbe73c9676df54b862ad5c
+DIST matplotlib-3.7.1.tar.gz 38003777 BLAKE2B a387d23b58e09011cd3ae1f8c0ebf5dd8c04c8c15c1f6453c92cd22b2439fcabcf384f39ae8d2d2c6b7d2645817cd57a60856a4c05728e8f8aff9dd163af5083 SHA512 d7db4213d5b38eba779ba06ffaa8e67a435192e4a8cf62f8e1cd4b8079cd257b2e83cb79926df012b7084c785c0ce8b03275035f68cfcf0a36b0dda7322f2e67
 EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B 40e9e41c4c038b05bf7f9a8e02350602b70d99a87c44a51f2ae4bfb547e3d2a21449e5eb60e72f093d1b644972f56d8c112939bb62b058ce1dfb3ec600ae6bfe SHA512 429b62d5c4f05dcacf8c105098c9d52007b8d01cca83a832ac68cf56c25419181f00835f8f65eca7c76e6f51e71701dbc6971e20b735331bc1b856608ee38eab
 EBUILD matplotlib-3.6.1.ebuild 7283 BLAKE2B 88e483a6fed18d9d4db1e11f598f5a66b333451cbc7f7b813a43a19c39abd096751458cf3030c32d2e2c4a9b8cd6f1bf3d5666470272f49a5b1d1203b3a0ee95 SHA512 a325c49c5b99548bb6c9bae8b9a917473987234d3aefcbab7083c643f7f00a48b7e2390baf927ae177ec5e961e7dffdf5cffad79339211cd7c3a013d93841150
 EBUILD matplotlib-3.6.2.ebuild 7371 BLAKE2B 97be1fd479d20e214d8d9264affdde51be5f69ebf72b19b8a15791a92536234ed2af6b84fa3de8f0c0fd11f47933fabbf761daa7d358f40a8daf9e876649972d SHA512 7881b796355c0a4844c86d84e0e42e3fb0e8c51f1e507a87eeb121136d726e5cabf5c1539b43b0a32eab3c405340d9c763cb5484de59c57c0d5887d8330c698b
 EBUILD matplotlib-3.6.3.ebuild 7416 BLAKE2B 12f2e64da9cc348d1c0c5277a851a3fd6accc168743eea5fd34127efbb6f97df73d78633f82550f505155d8cdbf3768d1c4a9daf3c7252c348566986a68d4562 SHA512 a3025d7f4fb5f99f9ae34189b8b66a14e58952d3a5b25f24bac1237f9bc603d31766164bc0a20a1e24b0c0410b5bc3db1e707ade7b7c30aee977b8f0fba549e9
 EBUILD matplotlib-3.7.0.ebuild 7518 BLAKE2B a1cf40163e66bd3b5cba7eb0bd449710b6baea8123c7fb87a66b7c2469cef72007e52782dae611ac06ba3a97d816a3a9dfeb8b00855082f8d634dbb365a58fc5 SHA512 158382c375983b54acd8ad0854b80e62752d25d27e5d54d59d15391b97f303510c82437c5f4723811ce40fa216199a3f9cdb803e3c84ece1ec0034022be702a7
+EBUILD matplotlib-3.7.1.ebuild 7518 BLAKE2B c3f5ae4c89735daf794e6cc19e7eb4b2a3b6a745f06a9d53b5321726b21aff6c46812b9007acafaf2951b4f575a750ef255387c8c316f36a19b9fdce1d82c337 SHA512 9d55a0bbefa80a155920fc17c6979138dc31c1bf129c8b9c1a8d5a6b8e53c08f4e07bd88b9a2f1e79c35a4272d68244058a8b5ad095bb374f2457a7b41af849b
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/files/matplotlib-3.7.1-test.patch b/dev-python/matplotlib/files/matplotlib-3.7.1-test.patch
new file mode 100644
index 000000000000..e2471a4282c2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.7.1-test.patch
@@ -0,0 +1,244 @@
+From 2290694d52ef1af255b9f0fa0d9c3c9ebcee9264 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 14 Feb 2023 20:46:30 +0100
+Subject: [PATCH] Adjust tolerances to make tests pass on real hardware
+
+---
+ lib/matplotlib/tests/test_arrow_patches.py     | 6 +++---
+ lib/matplotlib/tests/test_axes.py              | 6 +++---
+ lib/matplotlib/tests/test_colorbar.py          | 2 +-
+ lib/matplotlib/tests/test_constrainedlayout.py | 8 ++++----
+ lib/matplotlib/tests/test_contour.py           | 3 +--
+ lib/matplotlib/tests/test_figure.py            | 2 +-
+ lib/matplotlib/tests/test_image.py             | 2 +-
+ lib/matplotlib/tests/test_legend.py            | 6 +++---
+ lib/matplotlib/tests/test_lines.py             | 2 +-
+ lib/matplotlib/tests/test_units.py             | 4 ++--
+ lib/matplotlib/tests/test_usetex.py            | 3 ++-
+ 11 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index 8d573b4adb..dfc42efcb9 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+     """
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=200))
+ def test_fancyarrow_dpi_cor_200dpi():
+     """
+@@ -115,7 +115,7 @@ def test_fancyarrow_dash():
+ 
+ 
+ @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.005)
++                  tol=0.005)
+ def test_arrow_styles():
+     styles = mpatches.ArrowStyle.get_styles()
+ 
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 004f6320de..63d705cb91 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -1034,7 +1034,7 @@ def test_imshow():
+ 
+ @image_comparison(
+     ['imshow_clip'], style='mpl20',
+-    tol=1.24 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++    tol=1.24)
+ def test_imshow_clip():
+     # As originally reported by Gellule Xg <gellule.xg@free.fr>
+     # use former defaults to match existing baseline image
+@@ -2364,7 +2364,7 @@ def test_contour_hatching():
+ 
+ @image_comparison(
+     ['contour_colorbar'], style='mpl20',
+-    tol=0.02 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++    tol=0.02)
+ def test_contour_colorbar():
+     x, y, z = contour_dat()
+ 
+@@ -4704,7 +4704,7 @@ def test_vertex_markers():
+ 
+ 
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02)
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
+index e39d007378..fa0cb2e72f 100644
+--- a/lib/matplotlib/tests/test_colorbar.py
++++ b/lib/matplotlib/tests/test_colorbar.py
+@@ -237,7 +237,7 @@ def test_colorbar_single_ax_panchor_east(constrained):
+ 
+ @image_comparison(
+     ['contour_colorbar.png'], remove_text=True,
+-    tol=0.01 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++    tol=0.01)
+ def test_contour_colorbar():
+     fig, ax = plt.subplots(figsize=(4, 2))
+     data = np.arange(1200).reshape(30, 40) - 500
+diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
+index b0833052ad..c7633f6842 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -651,11 +651,11 @@ def test_compressed1():
+     fig.draw_without_rendering()
+ 
+     pos = axs[0, 0].get_position()
+-    np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
+-    np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
++    np.testing.assert_allclose(pos.x0, 0.06195, atol=2e-3)
++    np.testing.assert_allclose(pos.y1, 0.8537, atol=2e-3)
+     pos = axs[1, 2].get_position()
+-    np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
+-    np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
++    np.testing.assert_allclose(pos.x1, 0.8618, atol=2e-3)
++    np.testing.assert_allclose(pos.y0, 0.1934, atol=2e-3)
+ 
+ 
+ @pytest.mark.parametrize('arg, state', [
+diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
+index 41d4dc8501..e0f9f5c112 100644
+--- a/lib/matplotlib/tests/test_contour.py
++++ b/lib/matplotlib/tests/test_contour.py
+@@ -316,8 +316,7 @@ def test_contourf_log_extension():
+ 
+ @image_comparison(
+     ['contour_addlines.png'], remove_text=True, style='mpl20',
+-    tol=0.15 if platform.machine() in ('aarch64', 'ppc64le', 's390x')
+-        else 0.03)
++    tol=0.15)
+ # tolerance is because image changed minutely when tick finding on
+ # colorbars was cleaned up...
+ def test_contour_addlines():
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index f3ece07660..18c95e4a55 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -26,7 +26,7 @@ import matplotlib.dates as mdates
+ 
+ 
+ @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_align_labels():
+     fig = plt.figure(layout='tight')
+     gs = gridspec.GridSpec(3, 3)
+diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
+index 76a622181d..af81d2fc0d 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -1339,7 +1339,7 @@ def test_nonuniform_and_pcolor():
+ 
+ @image_comparison(
+     ['rgba_antialias.png'], style='mpl20', remove_text=True,
+-    tol=0.007 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++    tol=0.007)
+ def test_rgba_antialias():
+     fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
+                             sharey=False, constrained_layout=True)
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index a8d7fd107d..2f658bc116 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -174,7 +174,7 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rgba():
+     fig, ax = plt.subplots()
+     ax.plot(range(10), lw=5)
+@@ -183,7 +183,7 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rcparam():
+     fig, ax = plt.subplots()
+     ax.plot(range(10), lw=5)
+@@ -209,7 +209,7 @@ def test_fancy():
+ 
+ 
+ @image_comparison(['framealpha'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.02)
+ def test_framealpha():
+     x = np.linspace(1, 100, 100)
+     y = x
+diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
+index b75d3c01b2..d08cc79172 100644
+--- a/lib/matplotlib/tests/test_lines.py
++++ b/lib/matplotlib/tests/test_lines.py
+@@ -185,7 +185,7 @@ def test_set_drawstyle():
+ 
+ @image_comparison(
+     ['line_collection_dashes'], remove_text=True, style='mpl20',
+-    tol=0.65 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++    tol=0.65)
+ def test_set_line_coll_dash_image():
+     fig, ax = plt.subplots()
+     np.random.seed(0)
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index d3b8c5a716..56a1d0a0a4 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -79,7 +79,7 @@ def quantity_converter():
+ # Tests that the conversion machinery works properly for classes that
+ # work as a facade over numpy arrays (like pint)
+ @image_comparison(['plot_pint.png'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.002 if platform.machine() == 'x86_64' else 0.01)
+ def test_numpy_facade(quantity_converter):
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -106,7 +106,7 @@ def test_numpy_facade(quantity_converter):
+ 
+ # Tests gh-8908
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_plot_masked_units():
+     data = np.linspace(-5, 5)
+     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
+diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
+index 0f01ebaffb..5e44dc8d22 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -14,6 +14,7 @@ import matplotlib.pyplot as plt
+ pytestmark = needs_usetex
+ 
+ 
++@pytest.mark.skip(reason="TODO: broken")
+ @image_comparison(
+     baseline_images=['test_usetex'],
+     extensions=['pdf', 'png'],
+@@ -64,7 +65,7 @@ def test_mathdefault():
+     fig.canvas.draw()
+ 
+ 
+-@image_comparison(['eqnarray.png'])
++@image_comparison(['eqnarray.png'], tol=23)
+ def test_multiline_eqnarray():
+     text = (
+         r'\begin{eqnarray*}'
+-- 
+2.39.2
+
diff --git a/dev-python/matplotlib/matplotlib-3.7.1.ebuild b/dev-python/matplotlib/matplotlib-3.7.1.ebuild
new file mode 100644
index 000000000000..950b499d395d
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.7.1.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic multiprocessing prefix pypi
+inherit toolchain-funcs virtualx
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="
+	https://matplotlib.org/
+	https://github.com/matplotlib/matplotlib/
+	https://pypi.org/project/matplotlib/
+"
+SRC_URI+="
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)
+"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' 3.9)
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+distutils_enable_tests pytest
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+	# Affects installed _version.py, bug #854600
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.7.1-test.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+	sed -i -e '/setuptools_scm/s:,<7::' setup.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+
+	unset DISPLAY # bug #278524
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = True
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	mkdir build || die
+	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by -Wdefault
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
+		tests/test_testing.py::test_warn_to_fail
+		# TODO?
+		tests/test_backend_qt.py::test_fig_sigint_override
+		# unhappy about xdist
+		tests/test_widgets.py::test_span_selector_animated_artists_callback
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/matplotlib/matplotlib/issues/23384
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+	)
+
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+
+	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	# speed tests up
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest --pyargs matplotlib -m "not network" \
+		-p xdist.plugin -n "$(makeopts_jobs)" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/meshio/Manifest b/dev-python/meshio/Manifest
index 1bf0fe528cc0..2a3322dacdb3 100644
--- a/dev-python/meshio/Manifest
+++ b/dev-python/meshio/Manifest
@@ -1,3 +1,3 @@
 DIST meshio-5.3.4.tar.gz 492100 BLAKE2B 2eda13879b5cfd777201a668accfea82ee852ba729f5037584b9760eb1e9a2482a8d2e3ef7774271a38d88fba2533f012049040783e8abbd35ec4c3bb720ae52 SHA512 d8e7228045aa70d0a3ca5b113a24889f97aa327abe10d2c7bbc54ec358735117b6ba37b40fbf1a168f00f96a055d6940fd2f5cd0250e20c43c50ea7827e4d53d
-EBUILD meshio-5.3.4.ebuild 683 BLAKE2B c107eafb6cf2cc56ef8a8014d5fc76ff9e42fb39e232a72681fd9168816db6b6a61794b5959fd327c586626440aafec8f910ea49f24e771b573dcb562b005324 SHA512 680083740b89b32f4fc450e6bb4327428546baf901a68bd82aa4b0eaacd9b8f135157e1ce0cc971b590c1015f41c0e662f144fe985f3b6e7a17bab7896b8648d
+EBUILD meshio-5.3.4.ebuild 676 BLAKE2B 63cd736fdc635496d4eab6964066806bc369724ee310d5021f818205ce45e41ba4c70ec315e9fe820f504b4fbe7f0b7b91383110a789ce9199b70af37c82e185 SHA512 dbfd2fad1dd4f1e159c5df44fbb99b6cb5475bb38eeb2530e15f23a859504bb7b5f5538d8e7955125c707c85ab6e4e896325916e8c7ba640acfc800394b08d9e
 MISC metadata.xml 494 BLAKE2B 43f170b895da8ca56f6117fdbf06b59a5bc165bc1fc73b6f7aec0f7439550e9d425311879410240570874a63872a66aa75da26b8cfd6f6bcd42e6e1305f49d78 SHA512 7079c5f9211b06baa0bf0ed7f3bfd6bac84a318f660e26f9f0574826c0a38c6713266e87d0a61da01e3110d4d52d48083aacb945f471614116d463845e9b44d7
diff --git a/dev-python/meshio/meshio-5.3.4.ebuild b/dev-python/meshio/meshio-5.3.4.ebuild
index c18d5f584677..25665728f0bc 100644
--- a/dev-python/meshio/meshio-5.3.4.ebuild
+++ b/dev-python/meshio/meshio-5.3.4.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
 	dev-python/rich[${PYTHON_USEDEP}]
 	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	netcdf? ( dev-python/netcdf4-python[${PYTHON_USEDEP}] )
+	netcdf? ( dev-python/netcdf4[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? ( dev-python/h5py[${PYTHON_USEDEP}] )
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
deleted file mode 100644
index 1f800ddcc3bf..000000000000
--- a/dev-python/netcdf4-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netCDF4-1.5.8.tar.gz 767013 BLAKE2B 26e30b9ef74b6d1af07fadc5a0c93c1370c9e684b69345e18801c00691362766bce393b7fc8c0ccd4cd4b8e7ac448f3c69a1769e056c780c668c441cf0418b94 SHA512 b43e10356a60ecdd1aaa7585648242e9d610e042da8fd97f374617d7813cc9f35b4133a88ac4c10e921df12d5b2f2b1668af4fb69578b57b7c3d57a731579260
-EBUILD netcdf4-python-1.5.8.ebuild 1133 BLAKE2B 8bf3d43707973a29479df1d245e313adb89efdad8028926ccfb3e5e07ca3afd154067bf3089a6993325261574dbedba1932b234341c369e26ed70a4fbd5e6105 SHA512 e2596ef0515cc72f3061ed12125c19d49f9abc6e7eb2a0f74ff11b20575b04fa312ed0fa15a24fe95301f0df12d847bcc7f26095fa389f4a043c3c20851e305b
-MISC metadata.xml 782 BLAKE2B 13395c54962217119a1acd466d86c0afc4436955638d158fe6c495ce501cb2a6229d3ba5196a8836f2969cbe2b93927b9c89485e230cf667e3da426b61a28f2e SHA512 28b2fdd4c8d8d52d249f8b8cea8738d76ad1dcbfb170ac4f854be2d5228dfc86c93f8edd3b413c399067bf9203632e358d87461677630ee6acf98cc8aee6cc10
diff --git a/dev-python/netcdf4/Manifest b/dev-python/netcdf4/Manifest
new file mode 100644
index 000000000000..57fccf24b1d7
--- /dev/null
+++ b/dev-python/netcdf4/Manifest
@@ -0,0 +1,5 @@
+DIST netCDF4-1.5.8.tar.gz 767013 BLAKE2B 26e30b9ef74b6d1af07fadc5a0c93c1370c9e684b69345e18801c00691362766bce393b7fc8c0ccd4cd4b8e7ac448f3c69a1769e056c780c668c441cf0418b94 SHA512 b43e10356a60ecdd1aaa7585648242e9d610e042da8fd97f374617d7813cc9f35b4133a88ac4c10e921df12d5b2f2b1668af4fb69578b57b7c3d57a731579260
+DIST netCDF4-1.6.3.tar.gz 777538 BLAKE2B 7d0cef9196893b23666ad241634d748e58aa444aebae936a4d0dec0c3efb67a65717e3a3fa15074374bbc96fd2f1f3fb7aa60d473b2b3bef0622bcf38b5d4885 SHA512 274f347e258f32238af5dea8964e6fad47fc58d386555bf33087bd2ffecddb8aa068837af023555cd124106e0cb8092c015fef8bfa47a3c2941c07b70f850f6c
+EBUILD netcdf4-1.5.8.ebuild 1133 BLAKE2B 8bf3d43707973a29479df1d245e313adb89efdad8028926ccfb3e5e07ca3afd154067bf3089a6993325261574dbedba1932b234341c369e26ed70a4fbd5e6105 SHA512 e2596ef0515cc72f3061ed12125c19d49f9abc6e7eb2a0f74ff11b20575b04fa312ed0fa15a24fe95301f0df12d847bcc7f26095fa389f4a043c3c20851e305b
+EBUILD netcdf4-1.6.3.ebuild 1129 BLAKE2B 79cc119658bfe82f8591370a6f6079e52c9c3d1c4f43000672c80feb15cb7f7038123b23476260e86706bf7ef7a07620fc89f72c865a75489f19f9121959a0ec SHA512 90902863965f494b67a993212548bb8fb05d1c612f7fe33eef51d72385aafe9d96e534dc3aecfaf2d435620b526bbb51e8525fa76d23089e97a8e57f54ebb98b
+MISC metadata.xml 782 BLAKE2B 13395c54962217119a1acd466d86c0afc4436955638d158fe6c495ce501cb2a6229d3ba5196a8836f2969cbe2b93927b9c89485e230cf667e3da426b61a28f2e SHA512 28b2fdd4c8d8d52d249f8b8cea8738d76ad1dcbfb170ac4f854be2d5228dfc86c93f8edd3b413c399067bf9203632e358d87461677630ee6acf98cc8aee6cc10
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4/metadata.xml
index e9799992da68..e9799992da68 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4/metadata.xml
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild b/dev-python/netcdf4/netcdf4-1.5.8.ebuild
index 25f2870753da..25f2870753da 100644
--- a/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
+++ b/dev-python/netcdf4/netcdf4-1.5.8.ebuild
diff --git a/dev-python/netcdf4/netcdf4-1.6.3.ebuild b/dev-python/netcdf4/netcdf4-1.6.3.ebuild
new file mode 100644
index 000000000000..d7ac0b92fadd
--- /dev/null
+++ b/dev-python/netcdf4/netcdf4-1.6.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="$(pypi_sdist_url --no-normalize netCDF4)"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/hdf5:=
+	sci-libs/netcdf:=[hdf5]
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/cftime[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		sci-libs/netcdf[tools]
+	)
+"
+
+python_test() {
+	local -x NO_NET=1
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
+	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
+	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index dfaca52eb757..fd82aef3aa3e 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -11,5 +11,5 @@ EBUILD pikepdf-6.2.8.ebuild 1611 BLAKE2B 93cd21b8e37f5f390de3eabbc0f05a6e70b6783
 EBUILD pikepdf-6.2.9.ebuild 1611 BLAKE2B 93cd21b8e37f5f390de3eabbc0f05a6e70b6783ceb21b6aa3e1f49b3b5a87dea34d383dfb7f17d931d814f3a1d88b331567f444f989d036da71880bf02c95d00 SHA512 5432f6b038b71cbd811927cbf2d2b30b7f5159394f446154f1a3f7682ce54112d779019d7727104d893995584b542331ac01c924b21adb06af2c885d91ee7f07
 EBUILD pikepdf-7.0.0.ebuild 1625 BLAKE2B 95a9db49296e032637ab232cca94197da14e8e15c1b0f909ec57dade7339a6e97f0b30c1396ba1ae091b6bffd36e0797e3238095756668ea1223c545bf54c2e1 SHA512 f3e386ee11bda6a116179f6a3cec31d5b14629facb4c212073a099d7cad8cafb5ba0d83ceb6bbf5abf47a7d8ffc8beb920614240dc772a3c34f75263617313cb
 EBUILD pikepdf-7.1.0.ebuild 1625 BLAKE2B 95a9db49296e032637ab232cca94197da14e8e15c1b0f909ec57dade7339a6e97f0b30c1396ba1ae091b6bffd36e0797e3238095756668ea1223c545bf54c2e1 SHA512 f3e386ee11bda6a116179f6a3cec31d5b14629facb4c212073a099d7cad8cafb5ba0d83ceb6bbf5abf47a7d8ffc8beb920614240dc772a3c34f75263617313cb
-EBUILD pikepdf-7.1.1.ebuild 1501 BLAKE2B 50c70b2f9074d703c4cec6f323ead242f1e9aedb76c83092506659076f61484f51eefca8aeece8f26ef5d3de30a6c12606f280ab54e6d3995c0b1e83468a1968 SHA512 474d6758dab21a2a83e055402b6b941addd7fb63e9f1510237cb0f2021cbc6f7f7116aff5ccefc05c241d866cbd750c763b8285000fae20bfbba070dc212f285
+EBUILD pikepdf-7.1.1.ebuild 1495 BLAKE2B 05f35dd8fb88fed9490413222ac79813c6dccfadcebdc38259863add3b167c1ab8a28ce88868bda1e1d382f8cf981f170e1c9875ca5afac2e4a9e8c06c7dd501 SHA512 b67887c02268868b51e193d3dc333bb9fd650202f238f7c7b60809b4d18f5efdfc6b6b62346dc26a2ff8db4f8e5e5a50626478624d0c0c24e8617869a3be8b2f
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-7.1.1.ebuild b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
index 68c143cdaf70..38b0be442225 100644
--- a/dev-python/pikepdf/pikepdf-7.1.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.1.1:0=
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 5f1021197e80..c636b6667d4e 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -5,6 +5,6 @@ DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d34
 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
 EBUILD pygame-2.1.2-r1.ebuild 2011 BLAKE2B 3d721d8ce7918067e94e2afb583e66d8f8d567b1d01d2b9827f1df5bf3e13e5ccf938bab043982f8d7ab379f36956153fd6ff65fdcb541f7fb2793bb8f83595b SHA512 489fbd4bac984cccb0be03dff55123228dde3002348273c176262eba6350300f5c27234bb60cd0723658ff1ef7964531e3533b8a3f75d2a496016c1752b05de6
 EBUILD pygame-2.1.2-r2.ebuild 2157 BLAKE2B 133a6d73be620e5001376d9d39cc02e1a0e818951359abe732416f44f2c5615affca5313025ac9f6ee8697680c086a2972a7717f23d5ee15730698fcd81497a5 SHA512 bf29df0a51dc388ff81eb88594fb0909ee9e74a28c3a24b8106493cd736de316e69f3653703287a883cd48170f5bc6935d84e5d486b19480bcd8aca132ad1837
-EBUILD pygame-2.1.3.ebuild 1979 BLAKE2B ae2c2474888e96c5727f843bbebaae1941d64640d432b76665e1086a494a049f0af5bb800b59cb88233dd2f9c6802c8cf1abdde0447f2de75ebad4c5145897b2 SHA512 d920279ed671ae9b6f78b9f554bea603f918aad7ad3909614a4b53b9393acd8ee59a7c1e18ac450dfb7f3607cb680b7d45d13dfb622997d6359d4c7868bd54b8
+EBUILD pygame-2.1.3.ebuild 1978 BLAKE2B d21cf8bb72822166039a4e692d2f89d02bb23d17c0c3343428f787c68dd2d8423419ae5b24af7d61f52c3b5bf65e41a5fa923dd7d8c1bdf18ca7b7470cb57d27 SHA512 c7c288c60325b2516276c3675fbdf4f81e21a022f190f5fcd644cba6676bab98e543fcd595809e6b6b2f4d7ac4b24ef49856c2cf2e122fb16870bdfe3cf34e76
 EBUILD pygame-2.2.0.ebuild 1916 BLAKE2B be3df976b5bff81721344d9e25613cc44ffc940ac4695329de90dcbf6aaf1e4ff0f89c2be3526dd96243cd0301f27b74df05f534e563ae68c4515349089cd490 SHA512 0519c416542e271dabc59be0491ab5995cfc4adec586ed143fd276abb032674821ec31c45848b741138fd3aced2a3c6e04f4447d55ac16515027e865563388dd
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/pygame-2.1.3.ebuild b/dev-python/pygame/pygame-2.1.3.ebuild
index f734c5c926cb..bed370655b15 100644
--- a/dev-python/pygame/pygame-2.1.3.ebuild
+++ b/dev-python/pygame/pygame-2.1.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index 8a7d5f1a6d87..7632faaaf64a 100644
--- a/dev-python/pyjsparser/Manifest
+++ b/dev-python/pyjsparser/Manifest
@@ -1,3 +1,3 @@
 DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
-EBUILD pyjsparser-2.7.1_p20190421-r2.ebuild 834 BLAKE2B f609ca18c1e1925eac299288e5fc09d3108d19afb7f4c7753a25cad5093be28b6d67920465c5d407d455dcb6561a1319765ab054a328d709591849b1125c4ac5 SHA512 258eb6f2cca85332d732995a3c7b15a962df8373f4d03aced48d80982fc5c704140a10853fd30d757d33983ea169e4869e82255dda5ce904cba7cda6bc3d8cfa
+EBUILD pyjsparser-2.7.1_p20190421-r2.ebuild 881 BLAKE2B a0cdb77127a50d3c080d6f945d1fe285c473498be071de42e0cc4265dfb978b065c649ac4ee6ac9d3771e4b0bbfc74757543632851d95e878ab09ce3c5937a64 SHA512 e3064978ae2e040cac693ceda479f6f69be9a664d785f206578c737c68cbf5a36b70a10155935995173a23d62c96e14f145d418dd06764cdc7d8b7e73eaa76ea
 MISC metadata.xml 502 BLAKE2B ee0252a808b15e44c03de2e206b0bd2d7dcd2d389beb29203c5dbeb628fe91fe57e3329927c827cbabcb270e82debf175ac9bd651366899235fd901c3d5f7e43 SHA512 82a1cc55abf102cf7aecdb63a86a408517a6d9be7b0c2f69b20c2d67c7472bcc7d5dd3bf6fde47914872eb0d68d9080b7bc37b330067207b456aaf2363b87904
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421-r2.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421-r2.ebuild
index 47b017d915d6..4c4c3299c45d 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421-r2.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-H=5465d037b30e334cb0997f2315ec1e451b8ad4c1
+[[ ${PV} == *_p20190421 ]] && COMMIT=5465d037b30e334cb0997f2315ec1e451b8ad4c1
+
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
@@ -12,8 +13,9 @@ inherit distutils-r1
 DESCRIPTION="Fast javascript parser based on esprima.js"
 HOMEPAGE="https://github.com/PiotrDabkowski/pyjsparser/
 	https://pypi.org/project/pyjsparser/"
-SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 3240018bf4d2..2bb39c8ea48a 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -5,6 +5,6 @@ DIST pypdf-3.5.0.gh.tar.gz 7181507 BLAKE2B 8f5c129613ed12a9eaa90cf0e6fa189b0fc5b
 DIST pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
 EBUILD pypdf-3.3.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
 EBUILD pypdf-3.4.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
-EBUILD pypdf-3.4.1.ebuild 1276 BLAKE2B 4ba64bc15030ca8099cbbae6e4c070268e7e29e26612ccfada878686afe42b91cf47e9ff198d49d0d17f84c1d878b921dfb62960eedb74bfa3316f73b0af3a34 SHA512 f9bcf246b1179f1a1094e84d239da335166560dd120735cc2d2171987c9dbf6fc4d0d74146cfc4307069d1e250a09f2acfd9d2f1ad4feeabd9e750c8077151d2
+EBUILD pypdf-3.4.1.ebuild 1275 BLAKE2B 8daf564ef8b79875929768610b579cc619d462c4724a9a6e87cb02bd66edd506b838a0535fa2ec366f8349a4cd505f4d1e5b775b8077b2f397c51b40185a6943 SHA512 ce7c8a3665cfc3f572df639fb180a5f2e4939899975d7280aa00bab55c41d1dee5d9bbb8fba2ac06859c485e0a2aecdfe3cd7380f929edf7e9c099569ebb4ed8
 EBUILD pypdf-3.5.0.ebuild 1276 BLAKE2B 4ba64bc15030ca8099cbbae6e4c070268e7e29e26612ccfada878686afe42b91cf47e9ff198d49d0d17f84c1d878b921dfb62960eedb74bfa3316f73b0af3a34 SHA512 f9bcf246b1179f1a1094e84d239da335166560dd120735cc2d2171987c9dbf6fc4d0d74146cfc4307069d1e250a09f2acfd9d2f1ad4feeabd9e750c8077151d2
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.4.1.ebuild b/dev-python/pypdf/pypdf-3.4.1.ebuild
index e9581fbc5b9a..307145358413 100644
--- a/dev-python/pypdf/pypdf-3.4.1.ebuild
+++ b/dev-python/pypdf/pypdf-3.4.1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 RESTRICT="test"
 # 150+ tests require network, too many to deselect
 PROPERTIES="test_network"
diff --git a/dev-python/pyproject-api/Manifest b/dev-python/pyproject-api/Manifest
index e3830846eba5..96b9fe911322 100644
--- a/dev-python/pyproject-api/Manifest
+++ b/dev-python/pyproject-api/Manifest
@@ -1,3 +1,3 @@
 DIST pyproject-api-1.5.0.gh.tar.gz 22032 BLAKE2B 7e90bacffee70d2a2343f2360f5d0e6794a04a8b8b9be672150e5ac49e1dfabb0673b4c661ddc27f3fffa7bb3d04644e2b1809555987fc0d914a798fac667c8c SHA512 7a68df007e52c685f512fca26d371d1790f2fb9ced381025fe27462088cd4f1488b7edf4de94f6c1df989c4430336789b94d0b3bd634a2f6ec52f14f292b4474
-EBUILD pyproject-api-1.5.0.ebuild 1117 BLAKE2B 7368ad4ac6b7374c6a38829cc6a9e2b2397394169b9f8ee8e696417388412e5e3c2e7c8124c2669c3c9175ba4d265a56a9ef1fa16c61331b2f8c4108013c1b9d SHA512 5285832fa6efcc1df078ee4f1217b4603272309cdcb2debcd75ca79c6724421bec1318d28a4e53daa240bae600080bca4866fc851201ead8f65135be0bffd27e
+EBUILD pyproject-api-1.5.0.ebuild 1114 BLAKE2B d4337b00092e130acb7cc9a62e21c5a88ad9297706692f5fac64e5eccc97aeb9f55c90e65d402ff905b7faec26ebd816dc98c50a13405475e9dc8108339f9f54 SHA512 fb91c43e333fe1ba42efa7e1dc7671f20730eff3db3a71efa276cc36f4c3dada8df151a1ec42fed78f10c2fa41989289e94e0b4573f31883baac1648173760e6
 MISC metadata.xml 378 BLAKE2B f7bb92a50d3be540f9ef686045a6950a6bd26679df183dcce4af9ddd4f203090023309ad4e5e43a9f769ed40ef6269f64fb628ed0acfef9fe9fc36b9f67704b7 SHA512 f3840464571b9893548e778d5eef88c64b614ec8994b1ff1348aed1795cce740b2a32b46df1e654e0a9072e8e059214ca1487421fb1316b4160a1bff4202d475
diff --git a/dev-python/pyproject-api/pyproject-api-1.5.0.ebuild b/dev-python/pyproject-api/pyproject-api-1.5.0.ebuild
index 7011a65f8211..401dc4319478 100644
--- a/dev-python/pyproject-api/pyproject-api-1.5.0.ebuild
+++ b/dev-python/pyproject-api/pyproject-api-1.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index c9ae8c00b0d0..6e8adbea95fa 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -1,8 +1,3 @@
-AUX pyproject-metadata-0.5.0-no-install-tests.patch 279 BLAKE2B 51598be4b5d055e89f9ea1f6019effdb013855b435d7e4fb1d096a1a3376788a73f9caf47bfac2ce5e9ed750a466aee105c1efc688500f12534418b8c2bea266 SHA512 517e62ac362ddefdf9268af8ea9ed13e72a50db79596582bab16d1313a4d13bb28d972f936ba5d5d6cdf91d6a26624c247fba5c769aee14bba9c71be2ca51460
-DIST pyproject-metadata-0.5.0.gh.tar.gz 13816 BLAKE2B 8f5613c1279539116e99b6f319b687a08160360109e1ed71d5bc6c0434ee316ef7c0b7109d6769a03452a41c1b258765c849fe416b4632b4ba25990b6b3702aa SHA512 66cd447a01d0d01ab37611415bd620517600af667d7179a2696f763ae031c013393c8145ebd33f27b43629659333effa58596a02dfc5c217935c90475250b822
-DIST pyproject-metadata-0.6.1.gh.tar.gz 14047 BLAKE2B d97be3532450541f4f464eca8d3e241259463bbd9d8277df380e3bf38908b9fd4e279d4ec88051e974a51091da9afef0691c7d723213e244c9fb5a6b6fa1e7ac SHA512 4af84f9534a5c71e192e1355e1e99f99e82b97d01411c011ed2f1dff579a7420a0f5d982eea5a032de8549c14191b64334c8e2aeea22fe767837e662e8d8b588
 DIST pyproject-metadata-0.7.1.gh.tar.gz 14138 BLAKE2B 901e0b0b07d035ee220cfdba840a2b05ec1b1dfa3184ab614621c462b049bdbe484aa2d9abc42a54964c163d360028a00ff1db2c502504d11fb6d2837bd60552 SHA512 a4cb97b6646b765016f047f8d3da388ab758dbf8acf5a8ee6ccb017c764a90c069e04effbef21f878be7f4b01a5090f24252372300ce7e3a0410a6eea5d98b66
-EBUILD pyproject-metadata-0.5.0.ebuild 668 BLAKE2B cd2bc5eb34058b61c1ab2800a71dd9a6e12e7018a9119e2e474bd80d08133a7c208d1a815d2ff5ba16f1e65fee8657fc399a838dc1cbc4f652922d9400df6b08 SHA512 80b1c0a2c33a55fe57be60ec0d8d0a5f45bfd5e42ca890521a888f347137d04a48a7f2b2c99e5321a85d615de4cb4b70d64dce779f21edd85893a19bfe86a3a5
-EBUILD pyproject-metadata-0.6.1.ebuild 671 BLAKE2B 63419d091c3eda51f4ecf90d3d923e314c7df0148b2e8964f73d6fc670bd7b3005e5a4d9b4b1e0c15c9967003472adf9a406414666a613933a146c6cfe530c01 SHA512 68c0550db093e1bffcc55aa8f8245b0554a716727c554f5278999ebe0939a3db5e4b363ad8965575b69ee7d0858c3b7787cdc16421e09ef68f76a69720ab69ab
-EBUILD pyproject-metadata-0.7.1.ebuild 783 BLAKE2B 01e98d1d886a6be15c939c78f56d352edc66d7f227d320b75bc426a25122c9d007a344fc2d299ede1108a3202fe70f970c4554c1e5828a31bb32ec2ecfeb43c5 SHA512 71248fe55e3312459170eacb7c16bff2c3486259472838798f2726619efade026602c85697e4a5d8cd16dfc3d9efd8d5826dd124866c6a5dfb0a28cd474da986
+EBUILD pyproject-metadata-0.7.1.ebuild 782 BLAKE2B 185318f6181d804d18bb05c80a151bc23b6fcddc7d7cb770e6d9927b1d62d63f9bdbbb0c161cebb1d566e70b8334d2d1123ecebb1a2d69f6e4d53a2c23d80112 SHA512 7bd501bf2c51387bb92dba4c63d06a132a2c1a5c818dd919699a7404e2256c607b6aae7aa30b4f7be2b8b668bf01c9fc07827dde84b2979de15490a6ab62c965
 MISC metadata.xml 371 BLAKE2B 9495774fe62ac433fa655bb324c38b18242dfda38e0e331739b6c35b9a64563aa03b95395930ff8c2d20ff16aaaa1513673c27db973e88293fd6c8e09d2ef0e4 SHA512 5c8dec2e04b6f2e7ca0bead64c4987d3226e985085262870c9502b26f76270ffec818cc76271ccfca8c719e991884bc40e5da18d092cad801dffc8ccc5207b59
diff --git a/dev-python/pyproject-metadata/files/pyproject-metadata-0.5.0-no-install-tests.patch b/dev-python/pyproject-metadata/files/pyproject-metadata-0.5.0-no-install-tests.patch
deleted file mode 100644
index 0d57d4760b90..000000000000
--- a/dev-python/pyproject-metadata/files/pyproject-metadata-0.5.0-no-install-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/FFY00/python-pyproject-metadata/pull/24
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -26,6 +26,10 @@ install_requires =
-     packaging>=19.0
- python_requires = >=3.7
- 
-+[options.packages.find]
-+exclude =
-+    tests
-+
- [options.extras_require]
- test =
-     pytest>=6.2.4
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
deleted file mode 100644
index 9b1b54b8bd84..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="https://pypi.org/project/pyproject-metadata/ https://github.com/FFY00/python-pyproject-metadata/"
-SRC_URI="https://github.com/FFY00/python-pyproject-metadata/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/python-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-no-install-tests.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
deleted file mode 100644
index 0d51ddb579b2..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/FFY00/python-pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-SRC_URI="
-	https://github.com/FFY00/python-pyproject-metadata/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/python-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
index beec33e5fdc9..0e2d11f6ec96 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 06f1cf7a5eb3..fb0e4adeba69 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,6 @@
 DIST pyqtgraph-0.13.1.gh.tar.gz 1368154 BLAKE2B cb19ae6564b0fc0a4ec4fb6232f7949bb5130345380a86f0cffdee14e767d306b27c26ae3f7c011d77f21353b511d99148e1acb38e8d33598dde16362475b5a8 SHA512 bcd3d0c9c1d91ad2ea3f85f8e34e68ab999fce636ed336362253f09a7863a62c4b635d71c137c9458532c7d1f76dfc8433d476cd84121cf89488fb0860039b8f
+DIST pyqtgraph-0.13.2.gh.tar.gz 1420684 BLAKE2B da702fc16e9dadc55382be75528147bb050ebeeba0aaf8f87a9592125058ffe9b0049cf7897d297e7408ebd78a20c31f9a47ec8058025bf5b1653ed1fb2fdd6d SHA512 64ae6708e1a44bb69fc159d1cd23df47075eeb1d7daa03c4b27a147ea83a25bb5ef03d28892b20b144bfa4ee600622ef0595494565d42fb861c6849ca3f5c7b9
 EBUILD pyqtgraph-0.13.1-r1.ebuild 1798 BLAKE2B a77b7b824be0fa1c4a843948a9110dad83ca57402b613e5e65cc5ffc7099d5a6fe51bbefe4319e3dd634c55010df550c048196fa5f3ea1c70151a646cbed376e SHA512 ba05ae58f42efced97c1fa52d7a447b816897dee9e2e611832bd25bfb9d9bc6cc88601cf19642e5c701e5ed0ba2fd2a4f377ded9d92a08c1820b0bd22e1b85a2
 EBUILD pyqtgraph-0.13.1.ebuild 1796 BLAKE2B a1df2664adc96a7c97014542639da62b1e26ae9b320d5fa564895ec7f101d5c42d63d25bd2418bb89efc9aa8d60dff755be23418bd8a3ab9d31fd47bf8ec413a SHA512 8a078602470f3a707e914cb4ddb77dbb5730bc5add4957c671c5cfa5870e1440b79e25e24174ae9966ddc433bde73416b81f138d134acd3f5a79540d68908d9e
+EBUILD pyqtgraph-0.13.2.ebuild 1763 BLAKE2B 37f1287ec8cba8cf7eb0cbf1aa3bfa3cd39b8166ff0cf82499111127c9163607db3936d93628e496a91a60408ddc0f59ddd822dd6bfc564fc89705e592063bcb SHA512 bbc06b212152fc5e868d8c93ab239d5d63f5dba3f18984ff5359c2fda1ed6f99a7465eb5370f5f21aadbc3eefbca8bfbc857670cda29d634f1ea80625c84f1cc
 MISC metadata.xml 775 BLAKE2B 08f1417793ef0b57d978cab5b4c03e43e756a43625d8e6173a8b74d3c9dcce0547934485d192546cf81b8da03bdf21e4c800bb25e0bec452fe092ab3772a518f SHA512 b03a0aa3f6e6183ef2d81b9d0bb22f576661b353986a802f01cb670f9ae0487d84d3e91fd0a4add41e3dd830dbbc0414f4d556bc05bb89a768be9e5c2cee4ce4
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
new file mode 100644
index 000000000000..aca231532ed0
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="
+	https://www.pyqtgraph.org/
+	https://github.com/pyqtgraph/pyqtgraph/
+	https://pypi.org/project/pyqtgraph/
+"
+SRC_URI="
+	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="opengl svg"
+REQUIRED_USE="test? ( opengl svg )"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# apparently fragile
+		tests/test_reload.py::test_reload
+
+		# TODO
+		tests/graphicsItems/test_ROI.py::test_PolyLineROI
+
+		# pyside2 is normally skipped if not installed but these two
+		# fail if it is installed
+		# TODO: this could be due to USE flags, revisit when pyside2
+		# gains py3.9
+		'pyqtgraph/examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
+		'pyqtgraph/examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
+	)
+
+	epytest -p xvfb -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 832ffc3f8dd2..a856cfe99815 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,6 +1,4 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
-DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD pyside2-tools-5.15.7.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
-EBUILD pyside2-tools-5.15.8.ebuild 1654 BLAKE2B 1ed048d5941edcca44c55a28b65615778b3e8f9a0681a8f3d8d9f94f6e7db471d1259414c2951348943430e470abef9d7c68919e3a6f338f0d7349a3330f94b8 SHA512 0b5f143005e52819d11cdf1815e0da2ca08e3f306fee22d9548a5bd043bf7437662f04bab5f6e2f84b389c3ac86d4835e8b49f687c79d0cfe528d1c30c0dfbe6
+EBUILD pyside2-tools-5.15.8.ebuild 1653 BLAKE2B adbbbd888e4785543ae175f285f32b34a6d392b6d8f85ef9576968a700cb7284859e13f3b4b75e6e77a8544676ba0779870bab3c33f8ae9f66bad285dcb2a6f2 SHA512 6016c3ab4144ea89672e8981a337ea8a83f892ad5b713b6a79d2a08bf1137de240ad9193b8d1a07b9ccbfd83587f0304579e2fe308d158cea065f1700fb160dc
 MISC metadata.xml 512 BLAKE2B e06bacf79750f6cc22b41ade8840a01636793100a85cc469c19af1b4273ef33adb3dec755947057a892e88de4ac68e665fa0ccb265457dd09a502964bd991749 SHA512 d201e34b2d73fb308c6b5f14b2d0d292b453b5ef05c820efe429fcfa7259b23f17bc015c08b8f938a2df75f5b654cc1357632a786abfb555479e3f172feee3fd
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
deleted file mode 100644
index bc841956419f..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
-	pyside-tools_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
-	}
-
-	python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
-	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
-	}
-
-	python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
-	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
-	}
-
-	python_foreach_impl pyside-tools_install
-
-	doman pylupdate/pyside2-lupdate.1
-	einstalldocs
-}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
index 00bba590214d..bc841956419f 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 153f1603a09c..c0bd7be7e14b 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,8 +1,6 @@
 AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8c1ab1eace10dbde18b467c451605ef5e8c278965043d3cf19dfa8dc80f3fe4bdc1caadd15119303c3e134e364ed5098 SHA512 69a8691d452472f3ae8a58eadd1c1d69cef186192f9fe8311ae65419c94a9efc0331e9446b97f688777f3d5c7ef5a0100bed2e4ce3956b2a4aacfad0b95c1c75
 AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580
 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120
-DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD pyside2-5.15.7-r1.ebuild 9272 BLAKE2B 98d7773364fa7babc64361541e4feefa5aec3330a3c64b799ed7fb0fcd71fa40a9dd2239acb1e9cccd124cd7095a8136e619d9c9649385ed7bfc3466127fc1dd SHA512 760dfe9959a8e4f92fe522317c79b3b8009e11439b5264256230e1d565efb5922ef82fee0bfdb30a8ff17a4222f85893ea8e44ff53066e6b8439b3c154c0eecc
-EBUILD pyside2-5.15.8-r1.ebuild 9273 BLAKE2B 443fb138bca8c32096075059d68ed23e2bc238b6e1908c4ecba1a51b209911c7bdbb9d941b4939e521d72414c0d66f4800b5cb78ccd4fc52eb42dd01a140f466 SHA512 589b0ea9fe4583a90fff436486640c142d8f54be82cddfc21c44dc759721979c837696272c68a9c2d3fbd38810a01d0a73593f0b16cf28ba05d7d7f5fdf4ca9a
+EBUILD pyside2-5.15.8-r1.ebuild 9272 BLAKE2B 98d7773364fa7babc64361541e4feefa5aec3330a3c64b799ed7fb0fcd71fa40a9dd2239acb1e9cccd124cd7095a8136e619d9c9649385ed7bfc3466127fc1dd SHA512 760dfe9959a8e4f92fe522317c79b3b8009e11439b5264256230e1d565efb5922ef82fee0bfdb30a8ff17a4222f85893ea8e44ff53066e6b8439b3c154c0eecc
 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7
diff --git a/dev-python/pyside2/pyside2-5.15.7-r1.ebuild b/dev-python/pyside2/pyside2-5.15.7-r1.ebuild
deleted file mode 100644
index d82265de986e..000000000000
--- a/dev-python/pyside2/pyside2-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside2"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="
-	3d charts +concurrent datavis designer gles2-only +gui help location
-	multimedia +network positioning +printsupport qml quick script scripttools
-	scxml sensors speech +sql svg test +testlib webchannel webengine websockets
-	+widgets +x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liners from within "${S}":
-#     $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt
-#     $ cat /lib64/cmake/Qt5*/Qt5*.cmake | grep -i DEPENDENCIES
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( gui widgets )
-	datavis? ( gui )
-	designer? ( gui widgets xml )
-	gles2-only? ( gui )
-	help? ( gui sql widgets )
-	location? ( gui network positioning quick )
-	multimedia? ( gui network widgets )
-	printsupport? ( gui widgets )
-	qml? ( gui network )
-	quick? ( gui network qml widgets network )
-	scripttools? ( gui script widgets )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webchannel? ( qml )
-	webengine? (
-		gui network positioning quick qml
-		widgets? ( printsupport network webchannel )
-	)
-	websockets? ( network )
-	widgets? ( gui )
-	x11extras? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2)*:5"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
-	=dev-qt/qtcore-${QT_PV}
-	=dev-qt/qtopengl-${QT_PV}[gles2-only=]
-	=dev-qt/qtserialport-${QT_PV}
-	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
-	charts? ( =dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( =dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] )
-	designer? ( =dev-qt/designer-${QT_PV} )
-	gui? ( =dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] )
-	help? ( =dev-qt/qthelp-${QT_PV} )
-	location? ( =dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] )
-	network? ( =dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( =dev-qt/qtprintsupport-${QT_PV}[gles2-only=] )
-	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	quick? (
-		=dev-qt/qtdeclarative-${QT_PV}[widgets?]
-		=dev-qt/qtquickcontrols2-${QT_PV}[widgets?]
-	)
-	script? ( =dev-qt/qtscript-${QT_PV}[scripttools?] )
-	scxml? ( =dev-qt/qtscxml-${QT_PV} )
-	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( =dev-qt/qtspeech-${QT_PV} )
-	sql? ( =dev-qt/qtsql-${QT_PV} )
-	svg? ( =dev-qt/qtsvg-${QT_PV} )
-	testlib? ( =dev-qt/qttest-${QT_PV} )
-	webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml] )
-	webengine? ( =dev-qt/qtwebengine-${QT_PV}[alsa,widgets?] )
-	websockets? ( =dev-qt/qtwebsockets-${QT_PV}[qml?] )
-	widgets? ( =dev-qt/qtwidgets-${QT_PV}[gles2-only=] )
-	x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
-	xml? ( =dev-qt/qtxml-${QT_PV} )
-	xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
-	test? ( x11-misc/xvfb-run )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-python310.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311.patch"
-	"${FILESDIR}/${PN}-5.15.2-python311-fixups.patch"
-)
-
-src_configure() {
-	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
-	)
-
-	pyside2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide2 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside2.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside2_install
-
-	# CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside2-tools) to target one
-	# "libpyside2-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyside2/pyside2-5.15.8-r1.ebuild b/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
index 22ff84be9b79..d82265de986e 100644
--- a/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="
 	3d charts +concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning +printsupport qml quick script scripttools
diff --git a/dev-python/pytest_jupyter/Manifest b/dev-python/pytest_jupyter/Manifest
index e1a8a6b7f184..4e30669f683e 100644
--- a/dev-python/pytest_jupyter/Manifest
+++ b/dev-python/pytest_jupyter/Manifest
@@ -1,3 +1,3 @@
 DIST pytest_jupyter-0.6.2.tar.gz 15174 BLAKE2B b6c536383ab1b8e375e4250b4922ac6372f850ee4993643122896092109d3f711f91ccc7b159b7330de18f7876df818dc01d31c05e3c18d97488255e063db4d4 SHA512 396f7a7c978097e6dee37ead92bb3c8cef2a8100a7cc85b0b1eab19e20bdaed3332391c17568a6a279ab6ddeea1fbb2fa8dafe24ba4500982ba52cfcda2b1052
-EBUILD pytest_jupyter-0.6.2.ebuild 759 BLAKE2B cd5f79ad3391ef5376dd41e760a2f135c22f5208fd3f8837ead4add3ddbf5ca138dc19b04edc58ce82d7d7a317381040f9faae141343bcb33d66e2fe841b0908 SHA512 7cf2912206f1ce1ae13635647f119a11baf204d623a3e1cb3862bcfe66bce8d4bdaa6eb8ad2a44b38439a2af52fad0185a3e3e7891f7104802de2ae4c2c6534b
+EBUILD pytest_jupyter-0.6.2.ebuild 778 BLAKE2B 6f8a34d55a01df6b0a64166dfb869e2a33f775e1164b65dd639be1cd463e59bcef7f74230f2b86ec86d44c84398801a8ee423903bb3a4a3a427cb3cc8bcd56c3 SHA512 30afd8b68a12680a2df990ba37a965b40985eaca6b04d733ebd02b6e2fb0e9cceba51e9a57a6183032a3f222eff59b29b3f5237129a9f61bb122830a3356a06f
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
diff --git a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
index e3faa0cc9a50..56c85c6e5338 100644
--- a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
+++ b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-json-logger/Manifest b/dev-python/python-json-logger/Manifest
index a8021530cf2c..a56b8fdc4501 100644
--- a/dev-python/python-json-logger/Manifest
+++ b/dev-python/python-json-logger/Manifest
@@ -3,5 +3,5 @@ DIST python-json-logger-2.0.6.tar.gz 10369 BLAKE2B c33766ea303c8210670865ff6e38c
 DIST python-json-logger-2.0.7.tar.gz 10508 BLAKE2B 818abaa8007db2226beb7e9f9b6326c4c59e11827c740496bfde491a495b8580b74c483b4bead58525942009ae84643758b8fec4dc0ba85e2c1c2deff2445bcf SHA512 a3056f6c07386410204e65d027504df49d890b5c4577a0460077bc698c9104ab8720d6db107153766611f4f22141c0b2b57dbdacba75a7078638945937922f5e
 EBUILD python-json-logger-2.0.5.ebuild 531 BLAKE2B ee72a0ba313d598f40a30567037f49e4a6e1afd516b8f832d36bd55dbadbc4bfe68620e400f86ecc6a958b2e3cc61572e33caf9b82ac7e3596303356f6af3dd9 SHA512 45a7751b21d37d1ae1de5dc1a4db0c9c2b69a32c521e11914723af4264489ca44a9597723f6d06cac2cf60bcc0faf9bf043e945a958076ab5ac76f9b087506ef
 EBUILD python-json-logger-2.0.6.ebuild 531 BLAKE2B ee72a0ba313d598f40a30567037f49e4a6e1afd516b8f832d36bd55dbadbc4bfe68620e400f86ecc6a958b2e3cc61572e33caf9b82ac7e3596303356f6af3dd9 SHA512 45a7751b21d37d1ae1de5dc1a4db0c9c2b69a32c521e11914723af4264489ca44a9597723f6d06cac2cf60bcc0faf9bf043e945a958076ab5ac76f9b087506ef
-EBUILD python-json-logger-2.0.7.ebuild 536 BLAKE2B f64267b7a27bfb75d456a22640b3fb77265f02d82aafc8fe5e7d78865389c80b95843c1310df5dd0173d21fcf12307041204e4b32d01f06bd2b38e0475bff98a SHA512 c196736b04931a3c48bf400dab4b579fffb0c9b97eb726ded21ab4213bfabc5cd3385509c0d9bbd5cf96cefbe550d10f03831310f87768341e384539f5e1a1c2
+EBUILD python-json-logger-2.0.7.ebuild 555 BLAKE2B 66d87dfeb2da63726cda6d32e9a65464fe0a3baba27cc9b3eeaafeccc72f14df10bd61a7559b22374077d71498d7ce2efc0d41d949b0413ba2f7917c1a80ac92 SHA512 14117a7607ab304aafc5ec6c4c77bdcc03f23a486c52f6cd2a9e86aed125aac58bdd019c93e1dd0cb0865e29d9d5813b2c0b840e4bc033446e5978425c8c018d
 MISC metadata.xml 648 BLAKE2B d2c5fc2fbe82dbc6391eb8c5dd9513f5dc455abc8f8426f44eb338f0369621496d87f921b039c0e75f1684533e33058f005e41b55e4868ade9db30ed747ceb04 SHA512 a9a6d220281bf92eaee7da04710313daabda41feb00562c5ae6a016106b981c9fa6d1ba1294bd75e37a029799c235caeef91c48b404bca883a41b6988d549e64
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
index 4841c19190ed..ddda244391cc 100644
--- a/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 2dbaac4eb042..344d21e3bd10 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 2953 BLAKE2B 84794d759a96cdd2d56f9b254a4564ab1d2a6e0453c8d3130ae2f461db487875d5bc6f6989b2423f36b6cae38e578cf3afc5d1f1576534e33abdcf846c0de6f2 SHA512 903caa29a67b9332cee721882e28da7cb3f565ad97d0c75b6a1b14e8e62156a6afea370843cd2bf700d4703a1fed94a3eaa932a0ee493681190897ab80dbae6f
 DIST python-xmp-toolkit-2.0.1.gh.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
-EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 797 BLAKE2B 49f3fe5e79fe5392a9270df0b30b0b0af3ee96de04a361df390f5603f777f4bcb14140aeeb2fbba049dc30ff9039a9a190ae64218fcb0d5d18f2debdcfaabe9f SHA512 c62fd7ae9ee4c691f9d9d95f6e720657eabb3aa212426de7ca0242f70b028909f912c63bb360eb8371381d7fe469df8fc1305f14eba7bd047befb03ee3d60219
+EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 795 BLAKE2B dd5da94b5b6e98ca5cb4c7c00d789c90d90d5712a16a230a7615c4cfd59eb96b6ee866c6e2166af1e4ee18659e3ec7ffd0a18955b85f8ffa9a4f5fe167ae474e SHA512 01e66c5b2653c67d1a0892f15aa112a675f7c3cbbf10c97660d439265b1e830e3493bc56fef619f518a51945a7109b9bf6fef233abcbc232884bdef182cafdaf
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index c67bd6165c45..d3b9f3b805dd 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 DEPEND="
 	test? ( media-libs/exempi )
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 45b4af153f88..2ce169cfbdd9 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1,5 @@
 DIST rich-13.3.1.gh.tar.gz 15055408 BLAKE2B 79713ee232bc1c990c1432f7966cffd69b8ffef9ad8a562339d62b03fbab4620040c5ae1d735d3084d71f32581955f0ea5fad113ff992dcddb2dd0e20465484e SHA512 a3b5bef2183bbb888f0ef5a90b35fdb1ed7ef6103dfea01a5efa441ce8d1769b53d7888684e3b5cd76bcacf3768835d918d9fbb7801eab57c04d1412f129f6bb
+DIST rich-13.3.2.gh.tar.gz 15060707 BLAKE2B fbee6e01b60a18cb32a7f86fa41d621d2cb895e5602f23ed85e7338788f4fbab401fe0a8c2b2bb3a1975c40ebeaaf4d013e50a6d6e5cad6324a14acea21d48dc SHA512 9f33658d8dfa5c22fd92ca83690628ded12d428777d6cd7752afc35c36481d46df1766841eaf003917ec6da932d6f29981c779846d4c14a95e2738e74ec20b2c
 EBUILD rich-13.3.1.ebuild 1395 BLAKE2B c42544ea594e54bf6293bf52911f9f853a86794784892403847114be767c2860c4c653de1278a9f4e7bcc72619bdcac569bcbdff5bce755c66abdc5c51ceec89 SHA512 75968a1bc7f4f96e5fde2b045437c793ab1cf44df6c857dc6315c93a4931252a578edb898f4354d36d7dfab2d027b0edf8a4bb82996e5c16c4687a784b4def90
+EBUILD rich-13.3.2.ebuild 1403 BLAKE2B 92f1904c8e7e954e2ec88a14149a59500c05a08dd8c1e99ffbcc9667508375e4ab2ba420084b0145af51cc71e4c352e2bb04cf59bc062fd2351319de11c5c010 SHA512 f758e0256e17b0043dbadec791a1b76c4f74b4510157484a29bff1b8fc3cccc4bf1e4c5f51fd2d97d0ce8ef26cb77a9e0fc2855cfa797fb752ecfe16d2a63593
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.3.2.ebuild b/dev-python/rich/rich-13.3.2.ebuild
new file mode 100644
index 000000000000..8e2a3cb446e8
--- /dev/null
+++ b/dev-python/rich/rich-13.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
+	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+		# pygments?
+		tests/test_syntax.py::test_python_render_simple_indent_guides
+		tests/test_syntax.py::test_python_render_line_range_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 7d6cc79d28ad..4dab0aff6768 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -4,8 +4,6 @@ AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4
 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14
 AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c
 AUX shiboken2-5.15.8-py-limited-api.patch 527 BLAKE2B a27886393ff917dbf3b1318d44d998e574e87ce79dbcc694dedb2dc9da7c173c87b40eb8d6296d2f1f7d6bd3ccffa2e5ae9a11e97a2f4e436d4902b2a447513c SHA512 579b88892e05b2e313f14adebaf62e399fd3f9981955e15a762196ca405b0dccc254edfd941727f777ea97709272475c8df239991d2aa7491e200c61dd66a583
-DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
-EBUILD shiboken2-5.15.7.ebuild 6690 BLAKE2B f9e0e9abf8bfeea66d9a9575b165c1622a5594899c7ae8e7d5a7aab4529616e59bcab140dc66f5d959bf3048e913150dfca47a403ed30b7b3e9e47d6994ebac6 SHA512 9f0d279062ee045426cd34c84e526bcf02d0daeaa12a0fae27876f683844097bb1dc03e785c6193812ab1e9cf217a8998c024d5d1918c94fd111ec1543241ba5
-EBUILD shiboken2-5.15.8.ebuild 6740 BLAKE2B dd742e887d32fdc792bec284cffcce63028546f49e0f20889d6543ff50ec3bf313c1dd5d281ef4fc1d280830cbec975cb5d3036669c680fd69af3794033fce60 SHA512 ace9566da10033d108d772cfdf5f1312d066ac77fc31884a3522e4905a66163547faa170d54e83dbb4379c4ba17c76511378c2ba40ce8e109aa7f59a50d5bfc5
+EBUILD shiboken2-5.15.8.ebuild 6739 BLAKE2B fd67d3f2035cdf39bba9d463a6ffa38b36095d7a80cd412d95df9d051e299624ac83c6dfe94016017feb3985a6f5793a25931781e0fc420347e9f9db2e94a46e SHA512 46f005dad362e9fa1f91ae71155379402d02c5680a8d5e295f932579ae290d0eec98def094e898c81f57af08d78c7bb714c74543c06f195a5d965c105a771fd6
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.7.ebuild b/dev-python/shiboken2/shiboken2-5.15.7.ebuild
deleted file mode 100644
index ce1269accfbc..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.7.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/shiboken2"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2)*:5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-LLVM_MAX_SLOT=15
-RDEPEND="${PYTHON_DEPS}
-	=dev-qt/qtcore-${QT_PV}
-	<sys-devel/clang-16:=
-	<sys-devel/clang-runtime-16:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		=dev-qt/qtxml-${QT_PV}
-		=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qttest-${QT_PV} )
-"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.15.5-python311-1.patch
-	"${FILESDIR}"/${PN}-5.15.5-python311-2.patch
-	"${FILESDIR}"/${PN}-5.15.5-python311-3.patch
-	"${FILESDIR}"/${PN}-5.15.6-fix-pyside2-compile.patch
-	"${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch
-)
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/shiboken2/shiboken2-5.15.8.ebuild b/dev-python/shiboken2/shiboken2-5.15.8.ebuild
index a9d6167b26cc..9c4d0ece355a 100644
--- a/dev-python/shiboken2/shiboken2-5.15.8.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.8.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/time-machine/Manifest b/dev-python/time-machine/Manifest
index e88441422887..26f501514391 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -1,3 +1,3 @@
 DIST time-machine-2.9.0.gh.tar.gz 28043 BLAKE2B 9a9a521c94b72a7464853661da791b6f57f5155ddc62ffceeb82f808903f4c337e6bf48fe8300bb4f9f5673fd175fd85038a4e80a39e8f3e096c12c27ee790ec SHA512 ecc780a72d279b49d026a8f3f89210cb4c90e02c5a517c08eadbabcb65216a24c603ace39afd76ea1e6ccdef589d5997581d0db7477bb28fe4d1e0510daf17a0
-EBUILD time-machine-2.9.0.ebuild 633 BLAKE2B 8966f0f5e1f02e23ece8a7bfc3a0f318e4b177324c27131cb084af26164ff2322ace23e5cee2cc9f02b41add183b8c60073d8cf55202b78f265ebf26a305e28b SHA512 d62c9e0c40b3e133d5aff68c2dbd278a6f5d8f2b8858c476638aaac7f13fc46d664acc159ef8f7eaa076bcd6e97be364ca23d8dd56bb434f67b88436a5b89e7f
+EBUILD time-machine-2.9.0.ebuild 630 BLAKE2B 14d0ada8befa47e7508df7aeb330b5be3cd1e3ff53e15b0ae8be67acc068cdfc480bab7da769f5bf886e9990b6c44deb4c449206adc44b35e8c914673ae7bc77 SHA512 a840ac46530b1bc8b57d95b0adc6c49c1087910dd1370ac7c4637ba11a6ab3feb94b2e2c50b655a76eda385006d31dcf64ef4b4a7f16fea1dde52d7c58d02606
 MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
diff --git a/dev-python/time-machine/time-machine-2.9.0.ebuild b/dev-python/time-machine/time-machine-2.9.0.ebuild
index 5218fda4dced..c06dd68ae916 100644
--- a/dev-python/time-machine/time-machine-2.9.0.ebuild
+++ b/dev-python/time-machine/time-machine-2.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 3b4e69275c34..c562ca606742 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,5 @@
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
-DIST tox-4.4.4.gh.tar.gz 303823 BLAKE2B 3386f00343035dd1d3fe58cb15cd666a55e7d77b84d93c87b5e3add24753255657591d0019a7a2349c081796e1bf096fc29b6451f0d5286e3b5b3ef18e5539c5 SHA512 d37fe82c685db238ab36929d5bfd1dece73ec36b533e027700c35cfe7c3bdff21639212dcb504c499739a17bc9cd600effe4e911a3572375912c4912bf4c5f45
-DIST tox-4.4.5.gh.tar.gz 303977 BLAKE2B 4861add250b2fbd5736aed9183544f048194042ffbf059e38c551f96be2e0de043ec2877fac6dd51355d1553830f8b0d18c2d1f599c3cf9716882d78883f1c70 SHA512 38637caa136a54172d122aa2725787affdfef755f1dae4fcee9dfb390191ef5932c3955fdd8283710a052e5632f393c39f3c69a12f95468dfb8870590a285c59
 DIST tox-4.4.6.gh.tar.gz 304337 BLAKE2B 2c157fe5febf1eb131d767ade87484880201bb37fa65a579abb9780d755d570f216b8f865dd2dd8dbb3a3af01be78133f9ac0b73a3166dfc2b9cd99f6547498a SHA512 403bca89228d665182bfbb61550dfd9e9fb4ce4a5592472d50cd38e3f264c806fa15bbdccc020a720ad69885d9be54a1f074f6d87549cbe2b523e53d870358dc
 EBUILD tox-3.28.0.ebuild 1916 BLAKE2B ff8aa55245a3f654897ad4c8f5861a55410b2b9442bf3f85aaa0ee236f576efcea1a2ed697c715c7182679b62a4781c5a0f6236eb92a1b12d6ddc73154612a67 SHA512 2f5999d0263da9efb00216600f8b98fb3c204e11640049d92c6106279baeff452468d2bb78236839bc8bd5540d6f9d01338af26315148d81a788d476ec5dbed5
-EBUILD tox-4.4.4.ebuild 3036 BLAKE2B 406a88d17792ea4706036706c9c11ff6795394a6487a41a419cdd3bd3fcc95c3a5bf764892033d9e2512a53d972cd7ba8746555d21c44e0cd93cb4be206dec77 SHA512 91327d1b9a85cdad80d9c1ff1bb96bbd48f9d381d118815083af6c556bf53980fa0b475185c92fe1f13283fdea6a503a28d48d80d93bfd9e1f0815776fb96a58
-EBUILD tox-4.4.5.ebuild 3037 BLAKE2B f016a50b7fe6b6c10e7d5f598000f796b815564a2519c72e7e98e4082fd576f3dbfc3443ed3a0c52907cf353d58b5fcd0f2be0be6f61780b7e36c2a06d445923 SHA512 5eb8f52d6ef0eec005e315df10389e6b5bb43716f1e592ec177b0410040fc4f0988bb13c65470d84455d36730b92eb115f1a2e5088562a79cf7ad8459742bc35
-EBUILD tox-4.4.6.ebuild 3032 BLAKE2B 932a36765652f4a0fe87e01c8a00f1309224312000a0e9ad491f349e5184954c04e136914158109fabff6c8d27cb26a2b0a53dfe518d4e1d9a776f9636a2c8a2 SHA512 e2607fa62bbad87f848625e0fa60436190117c0ff7ef6302ed601e8a5298fdff49f8cd2eefb6c4244d5197f3e1e43ec9f42a8cf327ca0692284cc805d0c0dcc2
+EBUILD tox-4.4.6.ebuild 3029 BLAKE2B 3a3dd193f9eaed38066e520aecda87b81745ec4a175b9a6f6e65a701c85db0c46d2b9c8c3d5b9cac29ef1cf91d21f313d79e673b1e31587e502d7886960e398d SHA512 2ff026c0923e832e3af257fcffbdb5b7722a50d010205723983a6f866b36f63e5665b4466f7cceeb6b04db8bbc99b3e585bd94094b6a7afca2a079a9ce0c3c47
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.4.4.ebuild b/dev-python/tox/tox-4.4.4.ebuild
deleted file mode 100644
index 51be2d8170d8..000000000000
--- a/dev-python/tox/tox-4.4.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=[0-9]\+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.4.5.ebuild b/dev-python/tox/tox-4.4.5.ebuild
deleted file mode 100644
index ff36971ecf17..000000000000
--- a/dev-python/tox/tox-4.4.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.9[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=[0-9]\+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.4.6.ebuild b/dev-python/tox/tox-4.4.6.ebuild
index c63e5a73d314..bb9be16f77c3 100644
--- a/dev-python/tox/tox-4.4.6.ebuild
+++ b/dev-python/tox/tox-4.4.6.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6f91abd383b4..b3e108649701 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 77bbe98d71a5..fbc1d1a25a35 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,4 +1,5 @@
+AUX qtlocation-5.15.8-mapboxgl-gcc13.patch 1648 BLAKE2B 37b5282d514f0282223ed4914c65bff098d3de72355226c7f9338262acc1dfea4ec490a03efea1f7785bf9d61a9d5586d32ad2b027776e4bc07f186c9741c929 SHA512 c323a07beff23c005278d6dfc27de30610056279a31258c8c20d711d936700b6246ad9dcbdf255c7bd0110607b3c2351699c2495140eab95733b268bccba7220
 DIST qtlocation-5.15.8-gentoo-kde-1.tar.xz 3952 BLAKE2B 6084d14533ca2ba44249db817f1f0bb93e526fc14e4f4f32d9c99f7b231e25449b111bf9e08b8dca95928d3ac29f63a8e42cbd51d9cd0700344aad6982dd2ff9 SHA512 868e96a2a84bfb0e068957968c07b3558bef2c12517c5971b11e1b536a92ae80d0ca399355f8fadc0fcef2b272b77e6b30951f96ec7fbe174bb5a053567d2c9e
 DIST qtlocation-everywhere-opensource-src-5.15.8.tar.xz 6559180 BLAKE2B 1b8feb5da8d564a6605d9106ec6399aea23a4f0b43f495baf61e14266e90d2d73cd310fb6d8514730867acba1aa26efb3072c213f22f19f72c2f554d76ab281b SHA512 a337fade917150c13fa2ea22ad1949f41541cea4ceb1f732ab53c20c2f19a63dcfc6f9f544ca64fdb5703d3ac8d2ec6e832f1f199a32e73a2f6c51febf53f514
-EBUILD qtlocation-5.15.8.ebuild 1146 BLAKE2B 141a6df9553c0cd1d6531c52acc25c376a6081fc3499f8ca968f6edf502531e564f47b3be09ee6f55d3121c32e7b4f92077c286c7b58d45ed1cd239fc4d687dc SHA512 f269471f3a9100f3d059134573dfc88465896e6d2dba9c2b89f93a66428dfd1ea1c9fe005653f9d588ad7961d68f1091642e6a72a5ff639016068b8c39c6d31b
+EBUILD qtlocation-5.15.8.ebuild 1212 BLAKE2B 3a828dab652937f17dec7eb827f22737554f8b25503065c62422b3139ee9eb2cb8ac5ca2935c46f2f12d5ee0a1ea6e4a258b0e0916ce9b8bedc71180a8cbc182 SHA512 80ec32c6e6a161665dcf0cdbe9838dc12484979e428b1ed08c4d8fbcc57546bbff7dc882b03e1da1c6a2eddd9afbde03189a9419a1424e765f392fa082dd78ed
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
new file mode 100644
index 000000000000..ba4e94e859fb
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
@@ -0,0 +1,51 @@
+From d8054f1efa0b97b291a6f8c7fff9090b0fd4328e Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Fri, 3 Mar 2023 11:39:58 +0100
+Subject: [PATCH] Add some missing cstdint inclusions (#872)
+
+GCC 13 removed some indirect inclusions of cstdint which this relied on.
+Include it explicitly to fix build errors.
+---
+ include/mbgl/util/geometry.hpp | 2 ++
+ include/mbgl/util/string.hpp   | 1 +
+ src/mbgl/gl/stencil_mode.hpp   | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
+index a28c59a47d..283ec7dbbe 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#include <cstdint>
++
+ #include <mapbox/geometry/geometry.hpp>
+ #include <mapbox/geometry/point_arithmetic.hpp>
+ #include <mapbox/geometry/for_each_point.hpp>
+diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
+index 13498ccb92..2f6acb6410 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+@@ -3,6 +3,7 @@
+ #include <sstream>
+ #include <string>
+ #include <cassert>
++#include <cstdint>
+ #include <cstdlib>
+ #include <exception>
+ 
+diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp
+index bc959c9a73..fd00370f88 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#include <cstdint>
++
+ #include <mbgl/util/variant.hpp>
+ 
+ namespace mbgl {
+-- 
+GitLab
diff --git a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
index 219efff528b3..a1ab77f7306e 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
@@ -39,6 +39,8 @@ QT5_TARGET_SUBDIRS=(
 	src/plugins/geoservices
 )
 
+PATCHES=( "${FILESDIR}/${P}-mapboxgl-gcc13.patch" ) # bug 885431
+
 src_configure() {
 	# src/plugins/geoservices requires files that are only generated when
 	# qmake is run in the root directory. Bug 633776.
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 94353f47987e..ce6b8e5bed5d 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,6 +1,8 @@
 DIST qtwayland-5.15.8-gentoo-kde-1.tar.xz 44488 BLAKE2B bfdd7c2959eb99e115eaf01d617464359a549513958c997dd8b1a86bda755dec44d24b6619650bf385b2894a2001a712a344b093fc94e8cde40ac9c20323903e SHA512 3cd52fc78f2451c38c6d2b0dd958895016a94b255e38ff3909f40e4bcb1ef760332fde4cffd32ab11e868ce0afe6629f325613c88b8fd85ca28f1583194ce229
+DIST qtwayland-5.15.8-gentoo-kde-2.tar.xz 46592 BLAKE2B 0f2c460038a5b6f6fb7ea38edf61b392e95caa6356e8c070bde9d7939e20aaee4a45a581e08d04ad34f2a2da6317c2a16c40e58272d0c256fd16f0a1ce6fa34a SHA512 8b6c94e032a35f6ec6400fa292b1c7b864504d5c94d095c20fd41da8576eab4325bf7312b08cca00825aa858e175510b8b37c5877207fb4d60edde99c77c9886
 DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
 DIST qtwayland-everywhere-src-6.4.2.tar.xz 836720 BLAKE2B d8a6b84712081097775f083f3887c18eb001fd2beba32b2abc930ec3b932f6f19b347fe2fde3b98f35c1e7e31661974b13468fb176e73bdf557a330c80d847fd SHA512 29d3f3e7fade666bcd3145106f1d782122ac3fcf94811d25917c9f45af0dc8cddb3c2149545344d91e86f86490029555758ed2e180f241703251c22c7ec15122
+EBUILD qtwayland-5.15.8-r1.ebuild 1008 BLAKE2B 3a090b525823841c5aa13162aae1d657feb03603f09b38004266d36c3139201749b89ef8ac4236b4ac9417a43bf2e755ace0429053e821d5e25107ef97425743 SHA512 e40d2b554c95a4c02dd934ccb90ed1f14047d5a2f9b4e2e26ebd9ff7eecb3b34917911aa4d7847683d45a0342d6b8f6b8e765e24cf014c58e2d7d773d8393322
 EBUILD qtwayland-5.15.8.ebuild 1002 BLAKE2B 4a77721f71912a69ac8da399cf959dccbf1141a7ba4f2a10e64a5bbfac97be16925a271767a227d84756aa256d0a419a4575a65c98ab402c5fd8bba3991868b6 SHA512 4591113cdcb1cc58cd2740d555243b4ffea4c507a2ef3ce3a06c2982dec8da850256d78347a1843b16455d313f4175d421451f93b6fd00bf387be1f86a01ea7b
 EBUILD qtwayland-6.4.2.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild
new file mode 100644
index 000000000000..9cceea0f85cb
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+IUSE="vulkan X"
+
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdeclarative-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+	media-libs/libglvnd
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9c63ae3f5dec..3e60e4d76f58 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/date/Manifest b/dev-ruby/date/Manifest
index 64b5cfe15343..9bbe39f938f4 100644
--- a/dev-ruby/date/Manifest
+++ b/dev-ruby/date/Manifest
@@ -5,5 +5,5 @@ DIST date-3.3.3.tar.gz 109793 BLAKE2B c7ee6337a520172b692a48c963a67d7fe7f6f56dd6
 EBUILD date-3.2.2.ebuild 1034 BLAKE2B a43e6fc4d8d169070178ed3ff967cb6775bfb40b1842a1579864340b18468f90bdd60815c214483abf317c07867eba1ef8e473553dce9a801a1f0451989387c5 SHA512 a7a3be82be4c51ecc2d3635a79933981ec4e0071b8019edb079a0bca20061dacfc420bae4e1f2c6340334eb5e1437e687e647db49b43d626ff52a07e2eb6bb89
 EBUILD date-3.3.0.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
 EBUILD date-3.3.1.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
-EBUILD date-3.3.3.ebuild 1065 BLAKE2B 40207b46773d433957adae5479eb684463094491a4a2ca4752e365effac95f8f3f6a8a0efcc516660544f0c9749f1280ecf909657e0a5796a9071eed2ad6ba3e SHA512 ab9a69b588aa593c99b7fd3b51ee95b74cdc93440ba86e4708e5adb4370a93754d0ffe0ee926367dab3027502cb17f75cf0166a07d963c483c0dffb911d43741
+EBUILD date-3.3.3.ebuild 1072 BLAKE2B f1d15edb9c22efb491b99be93a268af619617147341d4cb6c0b7930819a289ec3d0ab8019cc4de235b7fa3305802ffb6ecb844e1bf4161e5839b84625a961594 SHA512 96152f174e42c52ba5c9f07f445c64e6c00cced16e7bfd9262334332bc7378f5e0e60baa5422334c6f73e8d84a69e70502e217589aa0dc59e59a71b0be11b4e9
 MISC metadata.xml 336 BLAKE2B ebecdf17ef8daa50c1327043a3c8744971b20f9e58758716a4d39968312ed3426e3902d2be1fc6d1ccc6ff84460fa1c2bd98d5cdf0ccd417167603209c14b66d SHA512 5abad9d2498b1ca553c2500c9ea24b04b3c8f617ee799a45efe48814a8cb926380fdd6c5b963ac6b3f43f8c92ab445e59458a80b569ac5a433b7c89c3d9171dd
diff --git a/dev-ruby/date/date-3.3.3.ebuild b/dev-ruby/date/date-3.3.3.ebuild
index 9cf86030816e..1db724c49ba6 100644
--- a/dev-ruby/date/date-3.3.3.ebuild
+++ b/dev-ruby/date/date-3.3.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/debug/Manifest b/dev-ruby/debug/Manifest
index 19cecfc2a914..f0756ca3ab97 100644
--- a/dev-ruby/debug/Manifest
+++ b/dev-ruby/debug/Manifest
@@ -1,3 +1,3 @@
 DIST debug-1.7.1.tar.gz 159697 BLAKE2B f3fc6b75c45992ef12d7bc6cbc3d3e65bde782ab399aa5c6643752c7337ab5e31dba5a22b3a36a0b345f3017147aed987b35184c789d8e32d3283cdff0f08a58 SHA512 6ff242862e05c48b2021b128d12c0ad9a6ed67954d0e7a60538eddabeef83253a613c13aac21b5b00516861fc0553351525fb190dfbc196e9da42e217d3b4e93
-EBUILD debug-1.7.1.ebuild 1064 BLAKE2B 3b6928e5629eadc58d12d97b2b76cc6d838b166ed9f0fd0c599fd6b0284dc9bc13d84da79e5aab31a75d1491b1ee8f6f04251f4ada48956ce2b48b21fad1b125 SHA512 be6524ddd8e3c8814ca7704d89d79fe1e2669e6cd4639c54e4d5257b5c51abb200fe9ad21ec9082e0ba451bca4f0bba0fb63de77be4803bb080a4af5df8d3fcc
-MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
+EBUILD debug-1.7.1.ebuild 1071 BLAKE2B d0766b5f69c0fec57ab4f7ce4ba42aab2ed89cad28cf8a1e4b2270ec45d81aec4419b7b5f73a1504dbc0dc8340e3b67f1496d7df66e3212bc88a5b35d698aa6a SHA512 27420e995acfbe62e07292a2bca259b1c3f1caf3a38441fde0d3b45a8031f1647cb896201c835f4bd55a17379a49e8c3fd8d9667a0f420b02ed172c2d24074a7
+MISC metadata.xml 386 BLAKE2B e6fe3df0176aef095867b1378587aea3920c4d47d7fcdbfd2b65b40478025382a60067b3962445c78a088511988f24110dd7d04d3494b36f286fec20a942b773 SHA512 6c2a6ec3baa4077178b8b7daa556972dc1ccb95d22d699915a73f45a19d8eb5cdb0cd266147b0adc98b3b024b92966b8d8a121ea94f81d4b0d6f2da01cdc4e78
diff --git a/dev-ruby/debug/debug-1.7.1.ebuild b/dev-ruby/debug/debug-1.7.1.ebuild
index 6dc149fdd96d..321e28ba17fd 100644
--- a/dev-ruby/debug/debug-1.7.1.ebuild
+++ b/dev-ruby/debug/debug-1.7.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="$(ver_cut 1)"
 
 # Avoid tests for now since the results in a very deep dependency list for ruby32
diff --git a/dev-ruby/debug/metadata.xml b/dev-ruby/debug/metadata.xml
index 7a38fd1850ff..864ac37653a0 100644
--- a/dev-ruby/debug/metadata.xml
+++ b/dev-ruby/debug/metadata.xml
@@ -5,4 +5,8 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/debug</remote-id>
+    <remote-id type="rubygems">debug</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/digest/Manifest b/dev-ruby/digest/Manifest
index fe0ece039414..4fa218bfd588 100644
--- a/dev-ruby/digest/Manifest
+++ b/dev-ruby/digest/Manifest
@@ -2,5 +2,5 @@ DIST digest-3.1.0.tar.gz 58646 BLAKE2B 64ea95ccd99c518b046b0193c5e9230f0941182e5
 DIST digest-3.1.1.tar.gz 59341 BLAKE2B 460ed1567b1e24d56e7be66bec06d4dac4ce86ab21392c192c7455a9d735f84a5450d2482e9844f526985dd83af290f60487c179563f1190b0acf8c6241f1b60 SHA512 7a74654f2240d21d1ffb7d8f4292f9f17c26da7e24c970964ddccc6da7ee2972b834ce0830657f87b28773c84565a172d8a1fa287656929a34a2941f9b28b028
 EBUILD digest-3.1.0-r1.ebuild 1088 BLAKE2B 32fe34e7711641babdb24ac3d77ccae025f9020d7cbe80ab861ece1e084c76c4c54c2a0007023459901631234dade64690f4b67455dc1610f233811f471f742b SHA512 e6d2de27ef4d25413ed79b44a5d3a54db7e682ff5b1becbb56d92105ad71770694c7b54808d1c8c0ea6689643c9f353da6b22304ee2edd2dea2d67928d862daf
 EBUILD digest-3.1.0.ebuild 911 BLAKE2B 64ccc720069c328de5f2f18bdafb981647ce8382fb6cec51a30cb2b2e389a510ed197159dd3fcddd5a443cee7917f3127dc8d4e69a78b9fc0d8dc6c363fcb861 SHA512 a8dbf0cbf79b02b474d281c6bf38e057f593e8aae1bc875bbf83a816ce2c4276db505bbfc4c5b3f0b66f494b27ca2f19bf39a1b76f5e6e207ca70a81898a367d
-EBUILD digest-3.1.1.ebuild 1088 BLAKE2B b96190a4b81e346b19ac5c51a17e4136eb8fde28b0590c18d00f2ff43b7cd761216b356c5ec653b85bf47e928771056d5539c99d669af3678a3b9c5d76c20182 SHA512 2160a977a3b4bf2f7048c00a8f1bf8ec4577c8018e21c6f0637750ab0053ea8d745c3d694f61efc39cc61d492dcbb8c84341ea90b3bce3e83594375c31ec4f50
+EBUILD digest-3.1.1.ebuild 1095 BLAKE2B 0502f8bbc27c8c8e0f0cd6d783db957054e0c7a8042505e0525fb568a915933f436d66050bddee3f6c9fd2a6cb72879cee9976eb81eed17871d065f7357325fb SHA512 b82b149b422ab28a33bb77eb92fcc1e733104925325e8441a53771bf144cd898741970842313ccb4cc6d91b369cba2f2e829efdd1f09b099b41f66a7f29b7c35
 MISC metadata.xml 338 BLAKE2B 1a016bd3e85b4f5b69ba5786b1ff95851702539014544cca7228219ca187de64a4c95067d45de0a88f2127a91ac8e78b175821682c13ff7ada4effbcfb7f7f48 SHA512 2e64f3ddca50af8e92e9cbdc83fe2145ca3cd88f65599f9c14bb835d27549051ad6e2d82fad57bd798a2812dedfea31f00ba89f7e6de040288be5b435c11d95b
diff --git a/dev-ruby/digest/digest-3.1.1.ebuild b/dev-ruby/digest/digest-3.1.1.ebuild
index 9296df1fc541..f44159e6f2c6 100644
--- a/dev-ruby/digest/digest-3.1.1.ebuild
+++ b/dev-ruby/digest/digest-3.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/forwardable/Manifest b/dev-ruby/forwardable/Manifest
index b4af6407b5ac..e87b225747ad 100644
--- a/dev-ruby/forwardable/Manifest
+++ b/dev-ruby/forwardable/Manifest
@@ -1,5 +1,5 @@
 DIST forwardable-1.3.2.tar.gz 16904 BLAKE2B 858068489c9c76e3a711d3b7338f948ac44ef9af9f1792f3fe37fcf3cd7c03201146c7a9f0e2aa7022bca1d705fc285fb9377175e688a500ceb38ee1697b964b SHA512 332eae2ee23fa6c5db334511e79a4d09ee168244420fce718cfd90944fbd03694cf9d2c94b9ad9935deb900a285c8ebf679184c8bdc10de563466d026c9794f7
 DIST forwardable-1.3.3.tar.gz 18044 BLAKE2B 41e3299698d6c48c18a2d5468fd446154eb2813d90d05b1e2531ad48cfe2a3bc27a8b33cf7818c3c46d25ddbc1c0e61ee6d755019d68363e31fae469c3b696a0 SHA512 fe388c3377aea76d350da1a140a09a522a405307ce2566160f1dbe7d2bb46612b57fe9d3c516684402586f20a4b510ada762809192ca81dedb7a251906e56ed7
 EBUILD forwardable-1.3.2.ebuild 1006 BLAKE2B bb03666659fb2e9a9e50d4d14227ff09a00437854078cf1aeae3d67f06e29c6861d1050fd5dee58ec56098635b597633260259fed4ed142c446a91ae7a7373a1 SHA512 f987cffdc5203784f3d96a2332120af2f9d91d691c7e76270af6038b67f15cc6cc0bdc3293ee75aca95625270d3604f21729b03af8bd48d1633257ae45654ba8
-EBUILD forwardable-1.3.3.ebuild 1006 BLAKE2B 693cb4c41d39e81eb53ad6e06c17488de3796aab7b4a781edc1ccef3a3a81d9a67e8b7ca8b435c50a36b26378f258ab543642bde1416f28d9c5b5b840a7a5b73 SHA512 fbbd28213c5dbcab4e230ff3566ff4013d14731e143637b964e972ca5b5b449c504e031a0f20113c3ac2f26d7eb9cba267f82eead5822cdb89d006f6265a5147
+EBUILD forwardable-1.3.3.ebuild 1013 BLAKE2B 1448a556e1268932e8cc61f4dcca0dd7a1b41e290b2d5c70a0692aa1cce5f760c29a2b67308f7f791c62a68dba1b318ec04ff4f29bb381542e328216c741d74e SHA512 a299e187829c0ae50618d1d09b9a5c8395b36ce04ec0065ee8f96d885806c86960508c48981773459a348df7a13483fb2eede553aad505ef4f283cf2e3df3571
 MISC metadata.xml 343 BLAKE2B 2cfaba492c6cd348ea1615949014be2fa221948adb53ccdba20df9dc232aa3953179518ead8b24e6d2254137df0d9829652eeb42032abbcb1cf258f2296b3b48 SHA512 f418ef27f0cadcdeee72c820fa5602b07f033c0be05fdf7f38a12f66045fec7e3c9c6aa2fe6bd202ebbac705c08b91bfec6f4f3aa7c262ed2661190794ec16c3
diff --git a/dev-ruby/forwardable/forwardable-1.3.3.ebuild b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
index 2bea402075b5..c107a607c55c 100644
--- a/dev-ruby/forwardable/forwardable-1.3.3.ebuild
+++ b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/forwardable/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/matrix/Manifest b/dev-ruby/matrix/Manifest
index 92bffb5dfaf4..9017c8d9e47b 100644
--- a/dev-ruby/matrix/Manifest
+++ b/dev-ruby/matrix/Manifest
@@ -1,3 +1,3 @@
 DIST matrix-0.4.2.tar.gz 42649 BLAKE2B 03b7f3482d6d5a48c626fee824039c182a35242a2c25875e7cada4d781d1939ed780b5cbf8c45645d07c81e4f5d5c5559a1ec236a5152e095a60228e4ed3c59e SHA512 b47d1d662acdca703afd323fe9293726e051b0ef87162ff45c26c62fad2f3158f71d943f36f7c6706702885e2fdea8483b37ee45f25295225e86dec5f88590a4
-EBUILD matrix-0.4.2.ebuild 862 BLAKE2B 3ffe860aa3dcca015dae33c50391898bb1550ae55840c9d092fe98357b8124aa1cbafdc3842e5558802eaf9b6df5956dccf282024cce6e980b90ad6e23c037c8 SHA512 0f55d27b08cd633831ef7dea75e418ab99ce2b8a4fe9890e7eb2a35df99f0e072598b1a4bfd0beddf1a5e529b748f458a62e5b79a60ba8c7ee143f20c3eed47b
-MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
+EBUILD matrix-0.4.2.ebuild 869 BLAKE2B d21b2bba7fbe067df936169c255b7b783f58c53e8be9082703cbcee756b6e16a1692adb52360d58b7bcb0da21a490ccf3f2722075d0fa438f2a186a2a1a00655 SHA512 c974bf210750a9b4223f7d86ed4e21aae28d9c627d60ba004cefe8f81777ef7850c8c9a032812c0da3fabce940cf8a8270cf6cb145d5366b834a5520c4a719a5
+MISC metadata.xml 388 BLAKE2B 033b1ed8548696a424a15354c5ca0bff90cd2159ace98d0599c9655018b2b94e73adf925b5893177fbc5d99e5671c57f8df65fff723c628db1c83c3d3cbddbd7 SHA512 5aaa9c686ea223eaa5fb5fda9be03fd9a5e6f1e7b05881f21a9162f4a0aa0c1c12f179b7a0222ce2fe0af88e36c40429ea8441c1b1adc073057e5ecffcc34ca0
diff --git a/dev-ruby/matrix/matrix-0.4.2.ebuild b/dev-ruby/matrix/matrix-0.4.2.ebuild
index f26c64972d5b..c5fc52a51622 100644
--- a/dev-ruby/matrix/matrix-0.4.2.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/matrix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="$(ver_cut 1)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/matrix/metadata.xml b/dev-ruby/matrix/metadata.xml
index 7a38fd1850ff..c16f2db61922 100644
--- a/dev-ruby/matrix/metadata.xml
+++ b/dev-ruby/matrix/metadata.xml
@@ -5,4 +5,8 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/matrix</remote-id>
+    <remote-id type="rubygems">matrix</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index ed1c95a0a371..4a7356b0b7be 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -5,5 +5,5 @@ DIST mini_portile2-2.8.1.gem 28672 BLAKE2B b0ee9b2326260d9f0dab630da104443d23a69
 EBUILD mini_portile2-2.6.1.ebuild 592 BLAKE2B bd08ae4e0754465e4d73fa12cce700a7d8a3b9eaff970e4459ec20eeb9a2d2a05145e8d70787118c7fe9df5933b4495fdc94c6d9c6713c987196f5dab0c19cf5 SHA512 e769818fd24278b16400193882ca4f1b3f1ff07af0c3943b80f0e54d836ef536725019e483e0cbdbf05688ad30734d5f9dc7c7548b9cf4d01cf74ed644fdff5a
 EBUILD mini_portile2-2.7.1.ebuild 599 BLAKE2B 3d4eaebc98009d6f0867025158d4ace9a1bf25076a5cc29d625da7761d733463abc60eaf67908c8ce0f555ad6eab70f42f60d59a8b55f0bdb9f86ff730d6ab4d SHA512 95270a7fea30f12c44953e065564fed21cbd3ec83d4347418c5f743ebe484da6a51f7094b3ec77ef9f0c88f258529df5e977629a47face1a571be10376ffbc87
 EBUILD mini_portile2-2.8.0.ebuild 606 BLAKE2B cae102e56ce0bebf5fbcadebbbf3d83aa9d77dcb51eca3a467127577c31305ccb1c6d770ac6810c4dd2e0d9119edefe2f6e30a521f033a9c5e408aba462a9b3c SHA512 cab2829517a91a5c92545add3aef2b99e403273a6b374f8ed9151d9c69fde383e0f21f17a506e254161454eb291c4d22fc93df60800333d7239a45d04d553413
-EBUILD mini_portile2-2.8.1.ebuild 606 BLAKE2B 974c69fa8b7a553849eb9ab5491bd9f69ee6dfc8b5e197cf628c926fb44bb01ad52c41b9cde7e917c01b5973a656b3b1983b1d65b56dc9cb5b31f49ba3cf0b11 SHA512 c46d0f56f9e4664fb12fd80f3860f10003a35655f7709fc6b3d4509deea19ed18c61288ceffd42e4dae51266ad69cf20f616ac5aaae23e54f618f153d5c20a5e
+EBUILD mini_portile2-2.8.1.ebuild 631 BLAKE2B c93e103d2b062dbf6f7f7632888f2d96f32ca8eeb62fe07411712093e68eb765c985c9bf3b2569d324f3843e2d370004fa48f35cf470fd6548c9fdb16e79d1f7 SHA512 2847e5a1ab28716a39557c475ce0f6860779410db8594ce3587be34adecf5c99fcb91cee304c1e59495414d58e95cd718b9aa87094ba684a928b3333d056baaa
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild
index 2a390c41c80f..13a8b37d1eda 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 inherit ruby-fakegem
 
@@ -18,6 +18,7 @@ IUSE=""
 ruby_add_bdepend "test? (
 	dev-ruby/minitar
 	dev-ruby/minitest-hooks
+	dev-ruby/net-ftp
 	dev-ruby/webrick
 )"
 
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
index 2eb43494a999..76ec6993d888 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1,4 +1,4 @@
 DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
-EBUILD minitar-0.9-r1.ebuild 908 BLAKE2B 10019ec89a3a8c8e95cc3b6f6a5cf172b2442f44b37aef8e7a861b663d933a65ba43b8fe56f88bbdeb3d5d951e9f8551a86b8d901c574dd6b8d7a9980ca0991a SHA512 b6405b638c5a6a04cb47135c88876b34f8021316cd2166e75c37110c89f17e3cd7d39de114c9ca510cd16c10cfd757a92fc7a6d2569ffd99133557501f5e766e
+EBUILD minitar-0.9-r1.ebuild 908 BLAKE2B 3275c03939291f2a22b2a22b99602d49caba345d5f21b45f84ea93830e474428b6ce0bc32534b76ed7fd15d8afe67c3427d66f6120310a09d0166f34161d40fe SHA512 f99ed6e2b8402c381aff230e4e638809a62943cc69c19c8ac09d68efe54701263c97fcab9d102afc07d97977a98a3562faa6170ec404df8d8619238f53bbe55e
 EBUILD minitar-0.9.ebuild 894 BLAKE2B e7a5039b32d5940d8caa4d0ffae7179715bf5c0fec1a2a3bff53d78ab1dd36d63840b9741593b0eb428df9ff55bd4b7ce5f3a313b40200e5d4bdd8f76d9bc5ac SHA512 489866aec76cc7b45aea2244c3f28ecb94b295140f03e5521d9214274fa8f0b55488971699bb76c0a39b4b5b55f10faf700032cacd0c99464ec033dca39f0ffb
 MISC metadata.xml 345 BLAKE2B a46be73631fb9e5d1a47518c20dd0fbf2eb23c106f53c8f2b4bb3dfb2478246c2e764310c02ac1176e602ac0bf73a4daca80c10703a59f1ac861124df41905ca SHA512 8107541ada060cd98c15f57dfb1106cda2f0c5bfc6b4907b90abd7e5e5d8cbd93b2398b057a56af221cc4adb52d063ebb70b7e41c623d5936c720008a24d5b33
diff --git a/dev-ruby/minitar/minitar-0.9-r1.ebuild b/dev-ruby/minitar/minitar-0.9-r1.ebuild
index 9424071e6df2..64a63b1d70e6 100644
--- a/dev-ruby/minitar/minitar-0.9-r1.ebuild
+++ b/dev-ruby/minitar/minitar-0.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/minitest-hooks/Manifest b/dev-ruby/minitest-hooks/Manifest
index beddde96f88e..3f9d0b6fcf25 100644
--- a/dev-ruby/minitest-hooks/Manifest
+++ b/dev-ruby/minitest-hooks/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-hooks-1.5.0.gem 11264 BLAKE2B 740df3b75ade3372fbf75ed7bd861c70af6f11d8cd1f37819272b98bc8cd1fad6ea09375856cd48a75499e0a692411c6da4f5aec212ebae91b47531c4bedda54 SHA512 4e7c969485c6e8d3414710b787c8880ad26b71de9f0b4a93ca1bf343deba426feee1cc06fcc51eee05c4880d851664fff045026d44728e217607e4cb32aa8f4b
-EBUILD minitest-hooks-1.5.0.ebuild 538 BLAKE2B 586c918386a82b108f5a3ad26dbc66d1b1becee219386b6f0802ee7910269c7c608459e9cb43728c4f7ff5766547eef5aa5d67d492ec44340c82841417a0af45 SHA512 972c603ddef89ec13bb0dc8d36288fda62bb79b46199d643b39f312e493c366e69cb7869c6414d17c923f8ad20bb0f86e4aa994a7602ef7878ed3a6386895dd5
+EBUILD minitest-hooks-1.5.0.ebuild 538 BLAKE2B 5c74cc9d983776c20cb65541f8abe0fcc5e42a70ad4431e314afc5f5a575feae4430a3867568272b777130cbafa6e5565064774f11369ae2ae7f7e877bc7183e SHA512 04000f1d515030e3cc44f1d8c1904048d877452c33ccea9e7af530f0810a9b0f83f88b7acfa6e311ce04b740cfc95cb6adaf511d5d2785a28d1ccc10e84e89f0
 MISC metadata.xml 353 BLAKE2B 56f918c9b37553f0d6a8a1d2be23fb574be145b5d4bfb159746333d9995bb689701b0f7056bd69f9721c5d3d296a2374d9134f8bf07efe172c8e97f9e8d93a72 SHA512 ccaa8d13d5ffc19a6f52dde413e8f3950c13e5b1ce81f3b67794a53678713c34b5d0723533c2da78bb95808129d76a07e74f3fe4305bf1f1b84cb99bf1e5b9ff
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index b0b6614ee02b..dcbfbfc7d307 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 # Skip tests since they require unpackaged sequel
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index b1dcd1fef83e..96d4863db582 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -4,10 +4,12 @@ DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1
 DIST minitest-5.16.2.gem 93184 BLAKE2B 005af875bf38e3744bf9de90ec6e964487908a817c19094dcee658963ab2c8882bb1cc4e0b19124b83af9f5da019a8d9e611ba21856f50deca8d9eb1757640cb SHA512 714dc201e9a8a45eefa080ee1a45fa66acb2de0cf624e7c6233e7e1745c35ef9e1a8d24236ecf33f440c05c03f09e017c6ff1e077473b22e3abe5d1ff3126989
 DIST minitest-5.16.3.gem 93184 BLAKE2B ce3b9f2177a56ab8ff0b61ec4266b67ecfe6e387c57c96eec20db0d7627ac9b73ebebfe148249a1c1c1c9631a63aad8a712b4892a6741a186300afdcd8135a01 SHA512 1463b12842a914df663d0d796bafd418ead038d32c935f3970062492f248f3f4fcf3a5c2f45e2fb71ac13e3b94fca1e6497e7cd7fe9e7050587b7efe2b275453
 DIST minitest-5.17.0.gem 93696 BLAKE2B c5979a0d82c4658e4a1584450c899b6a09d99fa145348127902f187e03c6bba73f798fe815186c9ab87a119baa6f3b18acdc1606aa99ec2cf4a1fe548684e93f SHA512 00374b0d0c86d0ec2d285bc4053b6851e1a59e86f7a3ab3db8ccac1db222256edb58514c666763047cec95cf099b1738765a3e9eec9aee3386b187e9fe0f59f9
+DIST minitest-5.18.0.gem 95232 BLAKE2B 5b0f6fb2c304f0d96a6e98c5a4512acbff0a354290e1f2670773f8bdaa8d8b11b8504a15afd03a7bbe89ff1a9478599c2b0b4f0976bf5d52306655581c94ad4d SHA512 309f899b5c5c2573aaf1e84a2225f446e009923b864af8a006eb518f95e758fb6425ec1e5f1790ba8026e041a8fc601551c2f447fa06528399041de119fa2d1a
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
 EBUILD minitest-5.14.4.ebuild 727 BLAKE2B ff25599b81e0eb8eaa5a619b6cbd8625e40e8f4494c3efc430777d0141dc0fa01ef782c869f9a60eb1dc084ad45963c5977ea984020e5becf0337474ff714de6 SHA512 d977f76e101e9c8c0a8faeb759b11b9edb9621108ad9cc6a6fd0717199082516b9649809f23b4c90a66f7df832c6a3f557bf73a96e423119e1c7979a293cc8fb
 EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
 EBUILD minitest-5.16.2.ebuild 774 BLAKE2B f89999b511cf70efe1d9629d0dae15a71d2444a6d102821aad142ff148d50ace0eb1fa9418ef26ee123f39aaf869ab1f781182f3438a4306939f78279a51c973 SHA512 dc971935e750e17880ac8b0edbded90db194904be0fcf0f65592ad20a04c6623488c6c2cbfd6c22c27f8821b8f57bf08896f87b672f0b12c7ad54078ae9fdde3
 EBUILD minitest-5.16.3.ebuild 923 BLAKE2B 0af3d772e8cee967149b3064580e26aef93cdfddfbf3e708b4a399801970ab599d7c68d4bf8562b0f5af49e6263a85229de69162da4cf01978fd758412b480bf SHA512 4965cf802c458555659efe21afc2a4c1ef579d9e2dd5db0fa00f887098691bd5dab7e419a0e5656ae80ec74a58073eb7e0ed45b9d89e16e3355a91098c309296
 EBUILD minitest-5.17.0.ebuild 930 BLAKE2B 45c430464b72f2cbbeb027bb11bebba4b3dec4874e4ea75efa4bfb587b7b4d8f82b68188b93dc311018ab2f72a65e14829d877ee4f6152cb56ec5f697f9c76a2 SHA512 df14a01a4b03c1ff22954fb24576d16172c514c37d3831554af74374fd97a4e6de118dcbed4d4e11a95d41b816309953d5f56ecf572a961b2fc2230b04d880d7
-MISC metadata.xml 345 BLAKE2B aa5fc9309fc2803a64737c45818f713867ae504409b879c1481125131fb661a1c71f99d3facb5c7253561b62c32ea4d27c9344bfa0c6ad66a15eb1daea81ff42 SHA512 df9736bf7588243c9d1ff886c8b428237cf96f239fccbfe6561d60b910a07f70750db6576d3aa4597746d18fcce8a708f1aa9be4f9f2796823d1a4e154c6fb4a
+EBUILD minitest-5.18.0.ebuild 929 BLAKE2B 3a2fcafc7af6645b49067cb0dc1ded4d70c2f8d3f65639447cd60f1dbdbef532acadfc6a41efeaea2cd6ceb36df9f7d7af7cd6893c225f4ab3fa3ef87c869361 SHA512 7ff4371b6a2c59084e45098c0f76f4d76a31d9f775cb24fac11add46bd1e89902d9be70e13cdc44242176e77a490464d5c5756fae49b466203759b84c1f5ef5f
+MISC metadata.xml 396 BLAKE2B aeac1892215d93c002d508741370ca1ef7d086dcf63594490b9d98b1640aa06272327f11d27cfc3dd331c4ac892c6e0de52b846d301844891f0f4fe5f17a2cc5 SHA512 724d808e8ff75f66517230a204c88dccbd7cdcdefbb36b96315fec653a7f0eb57471d0b929130a5e7f33453a96f301e5c5bdc8efd0d2fa11a446b3c39c2b0f97
diff --git a/dev-ruby/minitest/metadata.xml b/dev-ruby/minitest/metadata.xml
index fa2983ac52a7..4116fc8fcb32 100644
--- a/dev-ruby/minitest/metadata.xml
+++ b/dev-ruby/minitest/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">seattlerb/minitest</remote-id>
+    <remote-id type="github">minitest/minitest</remote-id>
+    <remote-id type="rubygems">minitest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/minitest/minitest-5.18.0.ebuild b/dev-ruby/minitest/minitest-5.18.0.ebuild
new file mode 100644
index 000000000000..3c5fd1ffae81
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/net-ftp/Manifest b/dev-ruby/net-ftp/Manifest
index fdfdb3c62694..72a0799168e2 100644
--- a/dev-ruby/net-ftp/Manifest
+++ b/dev-ruby/net-ftp/Manifest
@@ -1,5 +1,5 @@
 DIST net-ftp-0.1.3.tar.gz 29719 BLAKE2B 27d6dbe8b75ceeba49ae9c1b041f1b3196c7e938a1a5cd10b68a8130cde09bb974a2900cff93d2d1aced6b69d1fa4749eec58650a2d4b1583fdc7fd86f001b03 SHA512 73159513947e1574d15b4d73c87c6b7506e1ee8defc01fd5dfbd4dc7e9f4aa9e8a2a62ae397b3471d0276707d806c6f3252540e60d9b224d30a8cc23fe60b4d3
 DIST net-ftp-0.2.0.tar.gz 29845 BLAKE2B 710ad47552242dfc30fd971cff683d67e0e1cda73086e3504b0e45ab650ad4666c19c46d221bb5b64fab2d507a9063c64fc8da17de9221de4fd487acb0cb3514 SHA512 a6b2f30bde4c39568690db7f57e917e0fab046d456acfe68eb22a0ee81ad71b4be4a6c7752dc556bb2481f3e0fe5fc81193e194e2b5056087abce633e0d2f7e9
 EBUILD net-ftp-0.1.3.ebuild 910 BLAKE2B 1ba826046021acb2baf241d2ce584b1ea05d13179fda2fd33fc56cc16296c464bb54e7ca9e94188704aa3c43bf736893bf75641742d90eb5fb3df2e6ba6520b4 SHA512 d38220b7f0f0da809ff40674a471186877bed99e2a31dcff4db241def0c2ef58f8c026d1a3d8f623f000117345cd9593b4b711c142bf5821d1479bc1124bcc96
-EBUILD net-ftp-0.2.0.ebuild 910 BLAKE2B 793e82cbbf7a2e0fe808e3647646cdf1fcbf83a59ea15550e47978dcd9e9a8e1db84ee27be0d223ba69f0e67f9c442fe9f65391191ebd06f92908b5644cdface SHA512 537fed70166ea030457f9ec53fc726e633997562f05085ee620cf0e32ef6a5e8f0666fc3143cc5b2ac994245501a1f089e34608895ff5ac2d8487c470dd2230b
+EBUILD net-ftp-0.2.0.ebuild 917 BLAKE2B 9ba310ad66d3fce7c6c63d6b6bc230c7bbe3b2c6088c376cf154607fb42e4fd068d05bd24c32ef3505418c3d4aedcac1a1b7dec268998c0a7b916918c37e716f SHA512 0abafef74e994dac457689e70ebdfcc89af75154860c740fab81ef7242597fa90e3c425ce698fb7002aa4ec577ec240ac6238468551ddddc481ae4b1e6193c75
 MISC metadata.xml 339 BLAKE2B 3c2418dd7ddec0598782ad012aa5a33ec70d5179cbe0eaf602a65865f2d516366410f1c5117e2a7f4f7b03003fe77b4ee2cb888dcfaaab08631dd7b1a8d3b99b SHA512 caec07b9c960c4f24e06adb37e4705caa5a13f5a7ff388c11b15953efda289dcddc47e84864e082f26b0b720d299724fd0ffc9d556ea6a7cae1dd3242bfcd1df
diff --git a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild b/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
index f2d76d3a5d55..364ca2ed91c4 100644
--- a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
+++ b/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 8a50a1be367c..39ce4ccb0b4b 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -4,5 +4,5 @@ DIST net-imap-0.3.4.tar.gz 103226 BLAKE2B b08ee0ad9ad788c1a58e583b3e71cef6e13f6c
 DIST rfc3454.txt 138684 BLAKE2B 56c850a7f5782c1447ae633ad9a380253b97925b9edeadbeb9001f4905157c353db967125dfb3bfef1e1bc2297142e5db424cb3b1325837ab4bb05db1f0f92a9 SHA512 79a85fede7df9202cbaf3fbb0bd59d951352c56208da2adf0baa5571ad92fd2153a6348000994b733c8a1bfdc93c38c86ed33708ecdef8571f20f906564384b6
 EBUILD net-imap-0.2.3.ebuild 947 BLAKE2B c2d17b88c241492554716025ddce7c745bce1f3abb6a9f9ef80495b9be1b25b222932ba580cf446fca902c6dfd9fab37047054d71009f131007867f879d9b30f SHA512 d0ee56ed5de3399091824041da4a50b81ff133925678035fee8abc21fba134d74681b95e0f5bf8cdc6c45e00da88a64e5d08f8182bbe9c6fe62ecc1dd100a6d6
 EBUILD net-imap-0.3.1.ebuild 968 BLAKE2B 4f335ab644938525da68af7de976228185c764be8d61274ef80595ae601c7586e8ae1c1f34e2c604ba7c0030f8a1cb7b786c16b3a79c1b8cc2fb0e484cbf7322 SHA512 3a8bc6436a9cb455140bfa9e02c90d455302d052002f80fd7a184f495fe145a173ce50f27f07c4eb1e3ac12844cc7f14fae04ce5c4719f5477099681a44b18d5
-EBUILD net-imap-0.3.4.ebuild 1132 BLAKE2B 2c04df3779ab35ef48728f40b46569a301797e8188af3d2335d9b74c6d2632174c1f78a6a31b8384ec2bc6ab1b28bf5b57d0fd87680536581b384aca06ed2800 SHA512 6b606d0595986470cef28c2a2df6aadf3ed0635e1f6e400ef01ed7e1d3d2308c08687c3481e74149114f0d84d4a7abb85653f203b0a821a8fd51872087e220e4
+EBUILD net-imap-0.3.4.ebuild 1139 BLAKE2B 308d41e11273988be203ce9e48b2bf18806c6d10782d3997277aa55c828c425e198e46ea990862000c44d9344f8eb473371d468f80b69fd6478200c52fd87aa5 SHA512 bee2a6e455ebf80d05ef0a82449ede9ef45fa39a4140f5f2658da8488c1933bef0030f2514a5d8b262b5a7141da23c218611b92a3a56e9e6efd0d14772dffdc1
 MISC metadata.xml 340 BLAKE2B ce089ee2eed44b5b96fa730c464c6e0299db5bbee1db0052a5c5e959079e7c14c23c0a7d1b6bd8d8e7faf83ed8379535d5059c10ff75b69cdb9d522c5d0099ce SHA512 ecf13d294eb224c7510bfedb5a093c78de5d2537431335708bc1046254941b583b3c013006adeea41d2f8df147dcf45c46c6c9b50841500761d6a6f0e0c71bdc
diff --git a/dev-ruby/net-imap/net-imap-0.3.4.ebuild b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
index 61efc846ec37..346494ad130c 100644
--- a/dev-ruby/net-imap/net-imap-0.3.4.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-pop/Manifest b/dev-ruby/net-pop/Manifest
index d9bdd95ebc15..01b89040a7f3 100644
--- a/dev-ruby/net-pop/Manifest
+++ b/dev-ruby/net-pop/Manifest
@@ -1,5 +1,5 @@
 DIST net-pop-0.1.1.tar.gz 17292 BLAKE2B ccb653929b29572944b0edfd1d8123c64fd1e2baabf360ed9d04a173d348825d2a2c1e675669af96e11c84cd32a07ad37a395e9a5a78bd8a853c65e42d1dd205 SHA512 9a6a03cf8ce19711a1f9318910f0cb01ec5282695e986b68657fafc289ef32c084f2a9f5a038114f550ef1553bc99c8dda094191492b503c82a37a4a71124eb2
 DIST net-pop-0.1.2.tar.gz 21598 BLAKE2B 6d5082f135804a72f2b09f9107601f0dd6b42f33a9d46cd36eec1759b3376f82564e305596cfd519ae64a8c820fcbf57ab9ff29cc16ab9298b9ce069a1405b60 SHA512 5f7e78cb5499f1049c93732f88857d0b2bf9e864bcfc897beddd3fc86883204ff6c153ae9fc24715b1625fec5e2ec673e913a1495e43ec0e077e52d88aaf3448
 EBUILD net-pop-0.1.1.ebuild 920 BLAKE2B 4f465a4222844c0f71cf38846084a22dc23f777a9fd1dd535806614402b88b24022f31588eeb7ffa19421ee22aeb1c0da0d34acbcb08671c7331af2c0ae3aec9 SHA512 0c1aa18a186413c50cda571c164a49ecb2195ab103a668d87db19e614e5b6da926c6192dbeda5ab7965314f40e797f279c93866d09546f913a1b5cc4aba371e9
-EBUILD net-pop-0.1.2.ebuild 885 BLAKE2B 43c2758997f295231231179aa7cda7d69d0492f75452ca7f7a860bc0cf0978159d2dbf5decc5f2d8b22002426e31a40f83f9e2c563fd75386f14c1a21e06e923 SHA512 9b076552601f6f7ae480d7576733c9cd1a451efd7764139be7e4a23a0c65d770c614c0c42dbb5e4e2fc9ab9eb9572a4190d2cf92af335ae728f3eae2dda9e92e
+EBUILD net-pop-0.1.2.ebuild 892 BLAKE2B 84ec74a267c3a661a8e1f1600779fe0ebe7f54eb3c94f4b4870f265718e55ac2ee8ebd38d0d91a3e0e4beb53bec84f1a15d41a09340405f67616394862d3e3db SHA512 1ee5b7e62bca0e23311f12c51e544cf97a4fc92a20e613547e81740de90dbcecd14c5a4b2564774a87e9218707c05d11cf8b8506718aee3321f8638014727585
 MISC metadata.xml 339 BLAKE2B 9723b52dde876efb195385ce0916ac29cfc27255f44af57ad1803e03409d762e095d2d89de8d49296f142b8ec29b160e57569d2f13818a0f43f0c01a709a6ccb SHA512 de6928b0e5693c02bf27a65aebcc2cac0bcd8d896c3df9596467368011959794ab4e8318d96582cf8889e77b585b0b96aa446522c362fa3cc1e4716260f2b930
diff --git a/dev-ruby/net-pop/net-pop-0.1.2.ebuild b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
index 2ab70385533f..201d7cd6f0cf 100644
--- a/dev-ruby/net-pop/net-pop-0.1.2.ebuild
+++ b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-pop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-protocol/Manifest b/dev-ruby/net-protocol/Manifest
index 37c38517b580..af38aa81e8c2 100644
--- a/dev-ruby/net-protocol/Manifest
+++ b/dev-ruby/net-protocol/Manifest
@@ -5,5 +5,5 @@ DIST net-protocol-0.2.1.tar.gz 17713 BLAKE2B dc5abe229e6900a41af786f6e617c27a8fe
 EBUILD net-protocol-0.1.2.ebuild 924 BLAKE2B f8478073769c39c413a449de321b90fee171c906045daf559d320299c8d1adbfd3f2a1676acf85cb8efda16015a69b904dc57bc3a2bcdfa7f389dc86df0a5050 SHA512 f682b9b168fefe5bc9a9630cb06bcd8225be64f8a5eb817aa267d473b60ef58be1f4a64e64defea44551923ee3fe0b12cf50f9ef640c846fc9bc2c4d7481789a
 EBUILD net-protocol-0.1.3.ebuild 906 BLAKE2B a24a6993b511a288bdfde3be4246c612d0aae60b35de39ca1f33517d81debbb509c6b0f4509950688c05a8702576785d67065adbd9f9ecc124332e0fb458b7d5 SHA512 fe1dfef3c61e7aaa9e7e48bbc2f83037083415fe568fb744055d79b97a18434d9b9c274a0d3df427c455f36f6db52a66e894c5263ca82e3583c5157083da376e
 EBUILD net-protocol-0.2.0.ebuild 899 BLAKE2B 00406fb22825d5a8d664ce8ef401bf2e781e62102c1b181f18100e7f2835ddb230e052f9ecf371816f031f471ee9e1ee9201ff976e3e01ced19d30a22e42e5a3 SHA512 300cd73f60992ebf3b3272d050a42656d4c58bd95bce5a99db0471228d774a90a2b12918e1b5f7ef9e319c6e698eaca54298626378c83c17c5abe215e43dddda
-EBUILD net-protocol-0.2.1.ebuild 906 BLAKE2B ee18e17a1c56dddbeef80017b767bb30460c9a15e4e73bfc21acd4828c4178bfc34a2bd542e33ccb42e06c907755902a74c3dc477e13f0673efbfcd37aea0ca5 SHA512 99d7e9b7a9e7ffc2d405315641dc7df93591c1cdf2e5d26acc53598557ef3bd0d20f3b9be2ec0cdd31adf42a5f807fd277d1b22f7f31351d744a5da930fcd100
+EBUILD net-protocol-0.2.1.ebuild 913 BLAKE2B 8f66086238428b3daa622ec96a266054518d4a57655180952a4bc3292ffbe4c56788077f75d1c19c15b0d13034ab51270e32efa9dbf469f721ebd47723601ba1 SHA512 e3d33f66b843b857bbe6bf7abe7142a2a5acc42430c3d62008c634cf2cc38e0057fd5d2555fdacb48ee4c211e3ae559d430d748b3fc4462ec53130b98c52e41a
 MISC metadata.xml 344 BLAKE2B 81d283914804c68a59c8f6ed77389c5f8f9ccd2c8f22e488569478b9df967b8e7e1bf18bb6e8949eccdc0a3731f273ecbed48bc5bd501a75339bd5121e153e82 SHA512 e137752f286f493b7903d114bb18830999f4991fa78d5838fa48aac8f4e88915db08352e73a8b7b3d19c98888ae4cc94d57e2a772fe11f98f99268544b558b94
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
index 9b69b87ce48f..7740246d9f73 100644
--- a/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
+++ b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-smtp/Manifest b/dev-ruby/net-smtp/Manifest
index 7837e8307036..2bdeeca2af95 100644
--- a/dev-ruby/net-smtp/Manifest
+++ b/dev-ruby/net-smtp/Manifest
@@ -3,5 +3,5 @@ DIST net-smtp-0.3.2.tar.gz 24567 BLAKE2B c498430c94470fbd11e23a5bae7fe4d866fa2ee
 DIST net-smtp-0.3.3.tar.gz 25297 BLAKE2B 29339faf7c7a3870b2eed7d2b9058ad7b3beaae9bddd3fe718cbcba0c65faa3e118916ac2e2a8cfc9e52c602bde301929c037856b68e42881bdab3ecbb90b01f SHA512 1936cede296d899f2cbcf5874b1472e808255cca21788037f6e8f38f8b1ef05779fec0c4f51a3970c09191078fee84c85e909eb9223034bdc293a1215b004ad1
 EBUILD net-smtp-0.3.1.ebuild 914 BLAKE2B c0f64ee86ff3bfb635b90733711f0ed90db772207b692cf1cdbfa3e006b452508a98ccb3cec45316881dba9f8bdee1b63a43fa88fa4d76d41bd7835aa770c890 SHA512 1eb34ec15e58ccf7868c14a61546a7ac59bdc93ec5721458cf334b90af6200575369aebabba2597aa20640d3f01dfab52a61d7826c53583767cee409b2ab5e4a
 EBUILD net-smtp-0.3.2.ebuild 914 BLAKE2B c0f64ee86ff3bfb635b90733711f0ed90db772207b692cf1cdbfa3e006b452508a98ccb3cec45316881dba9f8bdee1b63a43fa88fa4d76d41bd7835aa770c890 SHA512 1eb34ec15e58ccf7868c14a61546a7ac59bdc93ec5721458cf334b90af6200575369aebabba2597aa20640d3f01dfab52a61d7826c53583767cee409b2ab5e4a
-EBUILD net-smtp-0.3.3.ebuild 921 BLAKE2B 5dd8825176d456a3ed454403da036bb41dad5ab64c1c3cb170b9eab805dec58aa2d70a7038f695514b816a6308f1c455ceaf810510a86d254dd85d8431ee4b26 SHA512 8bcabc6021165d748829e4997120a8017a56dde7fabfc64c586bbed3a1c3ae880644305a1119dd5e1dee612f590ba272a08b0bcddd9519dfcb83bf355b20154e
+EBUILD net-smtp-0.3.3.ebuild 928 BLAKE2B 399196fd6d36f369aa3c492472d124ca16d2e1c976c4e3d74f2ac8728ccc686dcdf8d318521a90ab4925f4f24a815886dd9d40ad194e21f74df2611299150b96 SHA512 3b883caf9d4580d1c11e1d19b5e5049d725c0708beb25eb489fc6b2394ab460561d3a730607f2fef76ea0d5802f683f43f6df8c30079e95bc2badd2447d7f817
 MISC metadata.xml 340 BLAKE2B f644899564ce6b222e40d25c4bea15c69f467cc56be91d47e506804d9cb9d9d812f970afb63185bcf21437e4697c3153976c267753ffa3b79d3a75b7eb258e0d SHA512 d8b4c65ca944809289b3fb43c09a5d83e584772905540bce7e9c82d9fc85aab1b1b124f2cfb3965c15bf28fe1fcf7f031a4089288889c03bf1dab1d453d8fc60
diff --git a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
index 0e0f25e62689..18fd17b1811b 100644
--- a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
+++ b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 842d35de8806..97bb9532de45 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -5,5 +5,6 @@ DIST nokogiri-1.14.2-git.tgz 10446957 BLAKE2B 0c72c520642bfa3e69a38f5dba8783a4f7
 EBUILD nokogiri-1.13.10.ebuild 2672 BLAKE2B cbefa7feed0f6318e060996f30613866c8832b004a8ee7abfd811dcc98c5c2ee05d1a5337076d2a60c93c0171d3f70c53b085d4b31f38f3a50ca2f52dc0ded5f SHA512 2bf4ee868314eccdc43a78f3506991e7cf876604ecc507607204d80d77328e40effc845c56cb943f5a156cea1a399dd282dc9a454e687e007aed63fc544ead01
 EBUILD nokogiri-1.14.0.ebuild 2679 BLAKE2B 77e96e4a9400db2fff3fb1e93c884669e86c76394afee2970dfaf4f9d8b03b63ea6dd849d3275d8b910df6c566211a78b4bdafdff7cf6abcf77b5cef6412f8c4 SHA512 5660ad74e67c5196f1e6be4581271feedb504dbc132b070e1ac3e186d955957531cefd053faebb959b2bdc60b59e3c876a770698fc4f1c789391cf364ebe3c40
 EBUILD nokogiri-1.14.1.ebuild 2679 BLAKE2B 77e96e4a9400db2fff3fb1e93c884669e86c76394afee2970dfaf4f9d8b03b63ea6dd849d3275d8b910df6c566211a78b4bdafdff7cf6abcf77b5cef6412f8c4 SHA512 5660ad74e67c5196f1e6be4581271feedb504dbc132b070e1ac3e186d955957531cefd053faebb959b2bdc60b59e3c876a770698fc4f1c789391cf364ebe3c40
+EBUILD nokogiri-1.14.2-r1.ebuild 2686 BLAKE2B b3c947ab9c9a6d2b2b6dfe3e62ec906e340bee46747a0a177ac1420b29b112555769b338af6c0e14201f2fbe8e3fedb6d3114476d369a6cdd96a307a17464fd6 SHA512 cbc0c1c3a41bdfd7ccbe78c010e35a184d125857106f9ee70290009eeef042e9bb570aaed8e79768b1c12787352c5878d0eba7ed8b78bcd06f12ff9b32a8a0a4
 EBUILD nokogiri-1.14.2.ebuild 2679 BLAKE2B 77e96e4a9400db2fff3fb1e93c884669e86c76394afee2970dfaf4f9d8b03b63ea6dd849d3275d8b910df6c566211a78b4bdafdff7cf6abcf77b5cef6412f8c4 SHA512 5660ad74e67c5196f1e6be4581271feedb504dbc132b070e1ac3e186d955957531cefd053faebb959b2bdc60b59e3c876a770698fc4f1c789391cf364ebe3c40
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..576f9a9b647c
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.10.3:=
+	>=dev-libs/libxslt-1.1.37
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.10.3
+	>=dev-libs/libxslt-1.1.37
+	>=sys-libs/zlib-1.2.13
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/prime/Manifest b/dev-ruby/prime/Manifest
index 0ae97c810aeb..f7205fd4a35c 100644
--- a/dev-ruby/prime/Manifest
+++ b/dev-ruby/prime/Manifest
@@ -1,4 +1,4 @@
 DIST prime-0.1.2.tar.gz 9485 BLAKE2B 88db1d22a33405de0bd216baa0a8fa28abc61fe031ae6042a19f0a5c66cf7733b946a52f94165112b45b23331dc68e3168541ec89329ad8d2c016bbf1e33f425 SHA512 a766426884d6b3cd7a586676799db146974ec9a4a7c30ca53b5f279ad55ee9960c9b5bb26988cb66253b4fe974f9b5087f48ef5b216772464d03b8ed78a817d6
-EBUILD prime-0.1.2-r1.ebuild 932 BLAKE2B a4dfe2b5e834fc690b31cf4161d72691a43638b42266ab888401617b81fefa3b8691584d534f62564b5e7c233b4e7fba184fea4c37f906ac8fda003e402752e5 SHA512 5c4593e23faa65c9388b799a997b8f36dbba0d0b8addb69c20ac341fa48b8d75e37f22e8d3d3df6b461877cafff561519c0532c9f3834ea0ce85d701f0269171
+EBUILD prime-0.1.2-r1.ebuild 939 BLAKE2B eb6adea272b9bf5dbdf7d46edc85123cb68bf5815368b34fdf0fe407b71eeb7a9aecbb6b6436d5288ed2cfd6a5dfaeaa504af333523635e95dd598beacf853ba SHA512 daa3120a133a664c1d8835f16dece34a9b53b5bd9c8ac015e068baac2870eba71b8cfbdb02e4ed7866b47a52a78e01cd2a00b82c85f336ac770c2414c33b6f9d
 EBUILD prime-0.1.2.ebuild 868 BLAKE2B a71c119a7c7d3e744f157282e7e9d26c35239306125b6065843f79342bfd2f4ac3e4b1c9a34924fde24119640ef580d57483df51f6ec20be3dcfa35d02686d32 SHA512 9d3fe677d573c44fcd7bbb7cb66d6e94c8d91f01c166d12d12209a770a0a65525a3dadf38feb2ed94c862022fefbd162178dbf06a497569a03b0eba327835bc7
 MISC metadata.xml 337 BLAKE2B 652f251b8ae0979a74ed4552d31240480949dc062aa5d861ae068eab6a223be3d5649d0eeffc6b3e2a9e8ac4cc5c480f3db729595372db9c3bf6173d6a2586ff SHA512 c42e3ff93bad56e8f586de51971a56a4f355f673487818093dcb7c1f71e1dfa86d207b2afd4fc2beef06327957a24d72412a72c1be6b7e10e4558aaad68b9690
diff --git a/dev-ruby/prime/prime-0.1.2-r1.ebuild b/dev-ruby/prime/prime-0.1.2-r1.ebuild
index 5cb2effb4736..232551f4a7bc 100644
--- a/dev-ruby/prime/prime-0.1.2-r1.ebuild
+++ b/dev-ruby/prime/prime-0.1.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index 49f875ecfaa6..121fc19b93be 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,4 +1,4 @@
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
-EBUILD rexical-1.0.7-r1.ebuild 1083 BLAKE2B 5d7415211d59446835f966b14cbd9a267b2af2d2ab2ba004d39efdc4adbed18c28af216d7d1b894c52e75bd7ce83dc628dd599cab0fe6df9a057b710c6413fac SHA512 684938bccf911a10f3d8ab84a816df86c1b328a2b65a274121b437bf3ce690429b9e06ccfba09d17591f60f49971c187d694df297b62a5cf62b0a54ad5540814
+EBUILD rexical-1.0.7-r1.ebuild 1083 BLAKE2B df0ae89a9b34684696974b1563bfb4bfa474ab93484d8886afd1ab22bad27e8359de2edf17078856078b5b13f73f54adf0b77b6c8f2946fb2da680fef0bd7f3b SHA512 ff019c779854bd04937b8ad63f21160cc2af2e9e055c496b623cddb5f9ee58677629d9a21e4af8a9a43094867800583221e93986ac6bf39e8ef2e03f6328cdff
 EBUILD rexical-1.0.7.ebuild 986 BLAKE2B 538638fe99060773105561b56ffa6a473d731adcb52ea7082103554b1597ad4410e3ebcf7cf26ab30ba5ed1c59f0e5d02324c45251f4ffc84e2ccb7b61e95bdb SHA512 9092969b0fbe1d9867b4d00c6954c4889ad21d3b3245f327080877070949e815f20e496cd69e6a73e75d8bef24121a5333c3f49d0a2bbf19984af21fdaafe6e8
 MISC metadata.xml 345 BLAKE2B 6a09a3ec53d7053b7163d9a37cced813706557fed9bfbc0afdd446edf0427e559671db7d76ce42b548a1a385310826ebf88532e0431a8243606c9dc678e934bd SHA512 a5c493b94049a4084ebfe55c88cf22a3dcb337e65f08b98a3a37c453787ca6864a70a25fe40f744bac81b724d64e781aab1ac2757d1cd63f8e91d2ced8961061
diff --git a/dev-ruby/rexical/rexical-1.0.7-r1.ebuild b/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
index b8600afdc55d..48927b572393 100644
--- a/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc	DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
 
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index ff90a93d3546..2aaa1e535af1 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,5 +1,5 @@
 DIST rubyzip-1.3.0-git.tgz 156664 BLAKE2B 2bde6515ddc71da32fc2d2819770857f7dde8605718c868f73edb8493f7db5ce66a7115d09933ffc6a06ac0979ab07e8cbdcd47984707688b7a5db43394847bc SHA512 5a764725d1f6a797f710581dbe07bd7971f0a8a5b0ffb7fc9b1a627c32e6e342ff54e2ad39e74e294dd283b8cbf358ed2dc40857f6f656007adff80d4769b9f4
 DIST rubyzip-2.3.2-git.tgz 225923 BLAKE2B ed901326cd0f79c8be004d9c14b32d7e67e90ab4d2d5b67dc64559fd4691dfb63cfa1ee18363a7cf864bd62559f1bc2fae71fc25ad1c727d7cc01f94d1ec62ee SHA512 6c64e53c1f5ca530abfa22baf388f87c8cf098d81cc9c639f20903e5193cf26243fbf861ac12002ae954f026e04168d8a55beeaf3ac5542bd0618ca85a5c90de
 EBUILD rubyzip-1.3.0.ebuild 1323 BLAKE2B 6faf19a77ad8bce8ef2036d004305afb30b270fac4bcaa316a5c85f3f9649d7d08f2d7edde83245d9293811f636cb1ead84f18752eb428ca75c72831f3698376 SHA512 f46da126c1b1cc9029ec637e12707e8a840163ee46a3583f18e13530fbadb00881e78c1afa512c03382b99cef880a7193d72478050c0efe241d116db8aa2843d
-EBUILD rubyzip-2.3.2-r1.ebuild 1392 BLAKE2B 7647ea6260785be9912d166e6f07b86939a84ec3767ac4257f0325cab813012f7ff36f32e5c3da9f3b9d041a618f736892befcfb7ab0019ed5353a5aef2eb4ef SHA512 a0c4c706097d1722e92190e5b67bbc3001be8db96ff4b6ce281417dc23e9b629da0228faae558b1f6eb58dbf79b55b8b38c1012d55723b59ce7d97a634b601bb
+EBUILD rubyzip-2.3.2-r1.ebuild 1392 BLAKE2B 8bd1e33f37e66729000b2de6eab21ba5620904f77cd655165176d66696488652f8bba1eb468eeb125d737a190922a7c9af3c3dbf9ad7a0089f4009aa332f3e9a SHA512 4fef44dc99d7d58f481ffb9d5e277cc0b7a4cce5b23398e952b3632b399257c3f9321994bb78e5a361619e78d93854a4eae918e73884ae8aa2e209f5e2af3178
 MISC metadata.xml 342 BLAKE2B 1619c520edda34ca9b5b8eed0ba9d1a69491c0411698cc0cb32b192226e3c888dce2c2b22c8996a69222ab8521402b6efe644c93567b26a6ee906bf4d3bfe8e5 SHA512 93ae61d55a80d335c5d362181e5e8fad279739b178de0fc5ed4cec7508b74f088c041a3f544ba80f511e11fc2baeb223cc589231db5ce06d9349f3cc0c85e21e
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
index 57ea97dbc291..c17c6782df47 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
diff --git a/dev-ruby/singleton/Manifest b/dev-ruby/singleton/Manifest
index 89541a6c0856..ecdedf3624a1 100644
--- a/dev-ruby/singleton/Manifest
+++ b/dev-ruby/singleton/Manifest
@@ -1,3 +1,3 @@
 DIST singleton-0.1.1.tar.gz 4975 BLAKE2B 3957c7d622aaad6a71b5675ad950b2a4622ec520b59075df25a966609e54c2f47581ba35c5a004c67a1a36f50de13dacadbc96ee1fd113790e6793e97131787c SHA512 a0817b42e8b056488b999eca8de09d75efe79e5624f4817289164d90051c92279dc9f8a087e69df89bec913127c460b8b6586fde17b73e08d4ec5b6da4dec18d
-EBUILD singleton-0.1.1.ebuild 981 BLAKE2B 95074d75af9fe4f42164fbf826e2daf21c552741c0357e97dbde62535a51c11f4d4f72a8950b264263cdcac107ff1ed5f0534e0b40568bd6ff76db16dd86318c SHA512 bf6d0a18a76b4c8682ec49ea6aeeadb8ecf0d5c36a5e559cb8cb7c4e2d53f17ed161179e81eafc10d72f439eaa2b95b6656373cf995296e63ed644b44b5a5554
+EBUILD singleton-0.1.1.ebuild 988 BLAKE2B 4ec6db8f4f9594e57f506d6c334eb4ff4506612e29c846c41d43a6e02cb8317a5ddfc4ffbf6d5979099dc78459f7b0f569ca60d86bceaa1ee081a7f6b5c88635 SHA512 9a1ab0767be87ca17961f65ddc51728b162150bb41437aa3d672cd051c1e6a19ac15e9d688bb91ac44cdedebf631bcdce272fea2b36e0e5a6d90e180a82c4b74
 MISC metadata.xml 341 BLAKE2B e45d6753c4c9675cbb363078ea6614bcaccab98915bd3dcaaf7215c8ad608eba313c81f3bb90ce05e4b19981c408c44acfb09f1856652bd09bc459fa1c977d9e SHA512 572ab9227b892081aa5b43a60b4cdd50a4ab0953e7e820403836d7c1f61ac011df9506ef3bc036aa32fbdd8752f0693478d02d02a938558b2a46650aa2c1a0f3
diff --git a/dev-ruby/singleton/singleton-0.1.1.ebuild b/dev-ruby/singleton/singleton-0.1.1.ebuild
index af6137428c32..880206c38d3b 100644
--- a/dev-ruby/singleton/singleton-0.1.1.ebuild
+++ b/dev-ruby/singleton/singleton-0.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/strscan/Manifest b/dev-ruby/strscan/Manifest
index d93323bb5f1b..c53bf62d850b 100644
--- a/dev-ruby/strscan/Manifest
+++ b/dev-ruby/strscan/Manifest
@@ -5,5 +5,5 @@ DIST strscan-3.0.6.tar.gz 36514 BLAKE2B 3a303ab8185aa12ef5fa748541a7c00dbea102e7
 EBUILD strscan-3.0.3.ebuild 907 BLAKE2B d7830696a4fb3f98e1f5cc086579e3dbf9c545f06ebdbb68ce6eb2875d856c90b6b86c02af05b63807f32395b7eeef933dbe1443d2a97db12462665f85a2d404 SHA512 40b50552e808075de4205397cb180be113e3dedf7f81040a30f6e46802980d3ddff72ad661310cabf817955ce19be226f6e082144a1c6e496d339740d0f30c57
 EBUILD strscan-3.0.4.ebuild 900 BLAKE2B 036e6157fb7a86cedfbe0ef0099bb47f36aa11628e1bafc5ed9005f7869c8291ea56fa4ee11a6d2af7019f42210b41ceedba8072a18f90d9339c1221bc342862 SHA512 8b7d041d82a63052c2c3c0ecd2039d57e0e86a1f99377665548f266b3626806130c12f501a712d34c1d4fca58ab30460e0f36f9ed91e61a98f2a69d667ef8ff4
 EBUILD strscan-3.0.5.ebuild 900 BLAKE2B 036e6157fb7a86cedfbe0ef0099bb47f36aa11628e1bafc5ed9005f7869c8291ea56fa4ee11a6d2af7019f42210b41ceedba8072a18f90d9339c1221bc342862 SHA512 8b7d041d82a63052c2c3c0ecd2039d57e0e86a1f99377665548f266b3626806130c12f501a712d34c1d4fca58ab30460e0f36f9ed91e61a98f2a69d667ef8ff4
-EBUILD strscan-3.0.6.ebuild 907 BLAKE2B 82aa83456024e18b97d5f1f7aca1c70c47589a3569d8bba5c419f9fdfd3c43422dc1394285df881e3d7cf834b29f6518969340f50966b882fced0c469ea7d34d SHA512 f2c0d49ce1f5ee280ffa2918b8f892aa7d70290578edf5588afcd1ce5a74eab9f0cf7e64e830d68cf83f6928311edf29035369e3e5166a275b544b1787ca5204
+EBUILD strscan-3.0.6.ebuild 914 BLAKE2B d71279717fa0fa94eae7c142542b6cf58d8d3d8075f4e938ef31e774a0bf04ff247417ab8bcd323750c59b828c83a2dc0bdc6dec698e6b6392b2512a3f7a0c5e SHA512 4dbd409bfb635bb84cda839791315db9ff8153ec7950b5d66b44b083e53d9161284798c45f312b72cfdea8810e996b417f9188f0a6984b1aac211ccdfa5d66f9
 MISC metadata.xml 339 BLAKE2B 78f4ae75b57e9192dcd9490dad00fe1ba916bad247dd6665b7eb6c4804ff1340c78407f6c79b777c555817f17e6ca3beb25a29f3d44be8b1865659a0b127f826 SHA512 8cd27e859d447843da29169be15647a5b7355d830f375aa59e8b39d701dd9b9c7c377c7f53c53eeea6c7222f4f9aec0ae0f7040673e24d6cdfb8b25f411819f0
diff --git a/dev-ruby/strscan/strscan-3.0.6.ebuild b/dev-ruby/strscan/strscan-3.0.6.ebuild
index 3b3490b11201..3a8741562659 100644
--- a/dev-ruby/strscan/strscan-3.0.6.ebuild
+++ b/dev-ruby/strscan/strscan-3.0.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby/strscan"
 SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 56351eb1c154..6116fa48da7a 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,3 +1,3 @@
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
-EBUILD syntax-1.2.2.ebuild 894 BLAKE2B a3282b4f090b83d256402f61b01998ad7c2a31a191ccbb26eac89e87104db36fbf4f0795bbc6fa6a785f6dc7a4a714d42ae9a9685c13c624afe69e03b6c87159 SHA512 50e4c75d2c328405003f07c770db0a842c55bc4e44c7c408c43aaa22ecbc283f7a7032b39c9ce4e81db909a1cbd80b54a98071e6e60c8d24c152d18e7ec93bbc
+EBUILD syntax-1.2.2.ebuild 862 BLAKE2B 2695666bc02074512e8ed8c149fe8a1fcfc85d1c6ca31a440653922fc5f28c1c2096be34552f6732d22f7fb2e1dfc0ba0cbbbfb016dc9cfd6c08cb0812e0396a SHA512 1107f34b0360de78b5f2a8e94fefae35d051c869777a6bc600161425352de5ed4d7933a7388bc7b9d101f39658b53c5688aa7439526534affe339f2841651d90
 MISC metadata.xml 340 BLAKE2B 962456ed8d58f70077c45c1e25321a61123b84f766464a3dd13ec1ba997470ac11c4ae155abf551ac30755181790a775437d31f66ac2079af46b427aed2939e3 SHA512 f21321695f1484807cf772bba7be2b9867329e8534108e3854ffab9b57e4742177c2767db31aafde9fd878622bcc6230c748c955423dbf3fa39719cf815a1987
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 2b4a73dbc719..b22e4c3bc86c 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
diff --git a/dev-ruby/time/Manifest b/dev-ruby/time/Manifest
index 9d3c44172895..fb61cd0b833d 100644
--- a/dev-ruby/time/Manifest
+++ b/dev-ruby/time/Manifest
@@ -1,5 +1,5 @@
 DIST time-0.2.0.tar.gz 25276 BLAKE2B e944fc0ad371608b24c543e503504e1bfd9015f8b998372e6e4a08d2b76c7d75b478ceac42d4d955c205e4ed30a018d3c008e947d9d3215fcd32d78f429aee92 SHA512 07b4896827014ab1f6394ee8a116a8074c2342c070b814bb190104a404828d684c9ca49d0c53fe5ef4518d5455de73d5f4c03051cbae47257fa631b17515d2f9
 DIST time-0.2.1.tar.gz 25363 BLAKE2B 8f9a3dae104a03cc012b156fe696890a655b8a81627e23c3cc3c811b15d1a195d5e7ca1da1b9ab8ee81895e291962be2f64bdf021a376e77a3195695a0a876c1 SHA512 695ea9907338fc13fd8b7ab98ed57d811c05e0609c99585eff80acd172d38408c705857dc25ff78b310a6945e768e5403d9c4453b357676f39d40418982c97e6
 EBUILD time-0.2.0.ebuild 984 BLAKE2B 5108c127a639f4d671047fe151b3a4bde18c7bf920728a7f5acc37cd95e1c69fd55394802f9640d83aabde4d2f462e1d3910233df683b3e537970db478858f63 SHA512 ee1285b4571407f706c9723ac726f6eb30fca13c6edf5b271c0ccbdb65fa40715b9da2a809760945ea4281027f18ff7398fc5267195971823777daffc7c155e4
-EBUILD time-0.2.1.ebuild 1018 BLAKE2B 0df134cee8cb9ed4e5976618d5b9b59f3a255f19930decee4202546374c78bce40efbe44d6ef5482fa4234fa7083a88fbc207f194f5bb0c425d06b48a6e69820 SHA512 e4b926df7985c3dc4baf05d217b60c032b2fce77886633a510c3cb326a5ba1edeba2e201028b1f0e46162a9bded04ce319f9679356d60ed4da5e9fcec259395a
+EBUILD time-0.2.1.ebuild 1025 BLAKE2B a5e32af2f19421735c07f43914f9b29f6bf874c5b18a6429b2b4e7c77da900df50d9eabbc2555a5bf54d0b3786ad0f46b5a69a3a3f17f43c24fd4df0b21ae772 SHA512 6678e39a1eb2f142b8195e5c5fbb0dd55c9e0b13d15692bcf8fdb09b2905940775917afc64d0ba826d4c561fc8908b086b06889c0e4384343e554eb767441dc6
 MISC metadata.xml 336 BLAKE2B 319e2c60fbca7c2a86ddd03dc6b837e5f596e12fa5b9dbf002a955c23e8eeeb26bb91a4526a6a67604b6eded037f99f8e95334899fea2d1b3d1715457eb7dc6c SHA512 8ab5bc044b940fea3297ab6cb12a4fd3204602558812dc059d59e8a7f72ebe137ae637127270c40e8fdec3a8c00c9778d109f499b4828ac4d03f38ed7b0fa292
diff --git a/dev-ruby/time/time-0.2.1.ebuild b/dev-ruby/time/time-0.2.1.ebuild
index 6d3a3ed4c245..3a2b095d7815 100644
--- a/dev-ruby/time/time-0.2.1.ebuild
+++ b/dev-ruby/time/time-0.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/date"
diff --git a/dev-ruby/timeout/Manifest b/dev-ruby/timeout/Manifest
index 59d04bed8709..fa9464c5d1f4 100644
--- a/dev-ruby/timeout/Manifest
+++ b/dev-ruby/timeout/Manifest
@@ -3,5 +3,5 @@ DIST timeout-0.3.0.tar.gz 16332 BLAKE2B 9f76ec3ae80c727c745cb4ebfeed67d0d9072fe5
 DIST timeout-0.3.1.tar.gz 16781 BLAKE2B dece63fff06da13516e1ebae591b5cca63e1cefd2ac10c9e254a1d37125fe05f962bb65befeea58de0c9c88f4c475ce62decf349b5268d67bf41a7a31503a54a SHA512 2bcf81df02eedd3eceb370abb1eec94cc77cd93f8c7d034fdd7a9b78c56490f9f49ea64a805e2d9ea5290bc9d8d0a5178ee5c77f6b3d9ea147a4be499c8b918a
 EBUILD timeout-0.2.0.ebuild 861 BLAKE2B b378e33e3415a951dffcbe44c33e177f5f9e4211d18c365cc7512af6d1c5cb1c03bd86e06f7ea126392c60eafb3cbac63f05b7060ca8817f0c72f051497f82c1 SHA512 e35b38d45521a5872c9ffdc1c34784d4fc8d3dab73972ef133e267738eaebeac746b8dd227ba6ceb65b7a1a6b7c717c695919b151c31f46ba25778879a58f1c8
 EBUILD timeout-0.3.0.ebuild 861 BLAKE2B b378e33e3415a951dffcbe44c33e177f5f9e4211d18c365cc7512af6d1c5cb1c03bd86e06f7ea126392c60eafb3cbac63f05b7060ca8817f0c72f051497f82c1 SHA512 e35b38d45521a5872c9ffdc1c34784d4fc8d3dab73972ef133e267738eaebeac746b8dd227ba6ceb65b7a1a6b7c717c695919b151c31f46ba25778879a58f1c8
-EBUILD timeout-0.3.1.ebuild 861 BLAKE2B a12b751218e81cc99cecf80a5df994962fedfdb88111c2a42302ce417e7d7ee6f8a1c222ac2b72c20de113dfb3d991d4e8efd827b7079c3da19574ce33ade831 SHA512 7086ff85fd7f2ffcef7dbd55f2f8d0d7b672be17b39d2fe2f941d8ebdd2b88c44c6173648d559b99b8242cebfdce30b8a69e1de10eedd118fb83a5d844d19245
+EBUILD timeout-0.3.1.ebuild 868 BLAKE2B efe61999261ec1080670e6f7cc00b93136c3080897c1511a16b554c8dbd166e6e56f8661398b0e21748a5a00bdd261a06c70d718211d2b05d2350e17c57f2513 SHA512 a960695d216a23d30e6010d5a9e012b5f9ce0d14aaf078b9b74a81fef7c7b54fe2e700122aa446837a547c023da99b2136c4db77c2c74939749e42d1e9a199e0
 MISC metadata.xml 339 BLAKE2B 631c72fbacd33d4ff5bae080f6c0c30c59f241e045056f8e4cd8330869a682cc4bdad6c13757f7f151f9171277a3ff227decbb87a20b2a4da7f83ad12d4259e1 SHA512 bff9f7fad39a8eb72caac724534d0d183da7aa43a4f57011e823a4d0b68d53418f858859aff22d46db2b6df3223309322837d2dd2badb0c1eba965cbb1fb3d29
diff --git a/dev-ruby/timeout/timeout-0.3.1.ebuild b/dev-ruby/timeout/timeout-0.3.1.ebuild
index 027c1d082153..ea1f03d24422 100644
--- a/dev-ruby/timeout/timeout-0.3.1.ebuild
+++ b/dev-ruby/timeout/timeout-0.3.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index ca03430b2029..3e9ee791a640 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-libyaml/Manifest b/dev-scheme/guile-libyaml/Manifest
index 66049050fee6..b7cfe03fb25b 100644
--- a/dev-scheme/guile-libyaml/Manifest
+++ b/dev-scheme/guile-libyaml/Manifest
@@ -1,3 +1,3 @@
 DIST guile-libyaml-20211124.tar.gz 6221 BLAKE2B 12e35af8495543f90289bd437d27177901f01090c66ba113d128258c7bd448513332698659b48438a92b75d78dcd686b7ffad66e7c7adb2374f504b1e29485ad SHA512 17e6eef46e412db7be877bf54dc59f4ddb3f2235bb54a33f79aa0e938ad65f5fd68fc4247e055ecde3de37d8d872ccda5f0205d5f546d97458890b0b97764d0d
-EBUILD guile-libyaml-20211124.ebuild 1571 BLAKE2B 98988ae8bc9a11de867833ad45c43e35266f163da84fbcf9caab45231b6059e495253fb4f24e4c7ed5f42a179eda4e298125dd0a1a5ccf7d9a929d837c739cd6 SHA512 f151d50b11c3ba070fdc508b0dfc8966dc6aa327df5c4b959c603543dfa67ff7269add6a96059b9cea6ab4873285831e8fe813b48d39d8cf9f0e3e0d0ef6786e
+EBUILD guile-libyaml-20211124.ebuild 1619 BLAKE2B 76a3b094361b1838c639332b0e78e32132c3bc7cd93f6d94e07ae2a4ea5d7015ec3285f96273d994a97257ee9d1d1a56ea87757118b67f407474de79b6ab5507 SHA512 03f9f09a2e6c45475bc36ee0890707d5a620c9381580d55228ddbff584b6291f5d493f100740385ac6c05ab5bcc7279506a90af598e52a567142011e65af7af7
 MISC metadata.xml 422 BLAKE2B fefc2dce459aed13173a55b088c011ce8e3d57221478ae72819d15784b70dbf0ede02ffd4d9042b0fc521132b80e37b6f3cc28e2e75c3f83f06eb2278fbe7a0d SHA512 a8ec0736b0ed6f53f9638531e509071a57d56d081f0dd0d9ec06e372d2f911d5ef4a98cdb53992cf52f68ea08f645789483b5d7b872bfa6aa9255e14619402af
diff --git a/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild b/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
index 36fd680e32a4..9a9d84dc8e24 100644
--- a/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
+++ b/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=2bdacb72a65ab63264b2edc9dac9692df7ec9b3e
+[[ ${PV} == 20211124 ]] && COMMIT=2bdacb72a65ab63264b2edc9dac9692df7ec9b3e
 
 DESCRIPTION="Simple yaml module for Guile using the ffi-helper from nyacc"
 HOMEPAGE="https://github.com/mwette/guile-libyaml/"
-SRC_URI="https://github.com/mwette/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+SRC_URI="https://github.com/mwette/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 49c66c8a905e..c741631e0978 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 0415ec3a671e..917bc5642946 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -8,5 +8,5 @@ DIST patch-6.1.7.xz 533812 BLAKE2B b08005dfaa1247378fa2b3d1955537bcbbc6ee8c91715
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
 EBUILD bpftool-5.19.12.ebuild 3256 BLAKE2B a2fc604b44b8539de5cc03eb0b408dd4c0247cbabc238e2e189ec948e4cd3511b55a04a41dc807475d76f403bdc484d9bd2d4f8c17c7f6ecef53639b17ce9054 SHA512 0f6978a5286575a5f8ac91ceb44ff55349d43fbb416eb9da3e95ee682ee059237f7858033a1e9d0846c2c0e63d6dcef4a64187fb16f31a22fab81dd7646fc649
 EBUILD bpftool-6.0.12.ebuild 2991 BLAKE2B a1b4d976e8ca3b21e0a956eb1d3a39822e995e9ac305faf0319b528ee73dd21646167b34526a2d715c151b8366b46328b9bd98642550e67d09fc9ff86f43e1a5 SHA512 ca867462dd25204204284bfbf3c3e63433b50cff39e79bbc3be135f301d661b47a4d877c1e7b4ebd6d4816bcbdc78938c7cb5cc320e93066540f8d138dcc74f3
-EBUILD bpftool-6.1.7.ebuild 2991 BLAKE2B a1b4d976e8ca3b21e0a956eb1d3a39822e995e9ac305faf0319b528ee73dd21646167b34526a2d715c151b8366b46328b9bd98642550e67d09fc9ff86f43e1a5 SHA512 ca867462dd25204204284bfbf3c3e63433b50cff39e79bbc3be135f301d661b47a4d877c1e7b4ebd6d4816bcbdc78938c7cb5cc320e93066540f8d138dcc74f3
+EBUILD bpftool-6.1.7.ebuild 2991 BLAKE2B e714185f22b9e52680e1b6df3479d8483a020ef217ccef65f7fea32b79f095268c5a8c9ddb2f3485df0db13b5df86c2d72360cb7f42f07571ce73e9a84ceeaf3 SHA512 213948470c8688471dca99c21481717a28b333130229af05b5639ac74152ee71645ae6830c305a5e35ba0bbcd391433234379f2c25c6c1cf16a33fe3b8ff88fc
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-6.1.7.ebuild b/dev-util/bpftool/bpftool-6.1.7.ebuild
index 4f68a43259e9..312ca35bf0e2 100644
--- a/dev-util/bpftool/bpftool-6.1.7.ebuild
+++ b/dev-util/bpftool/bpftool-6.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
 
 MY_PV="${PV/_/-}"
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index 7455bb4a8888..eed8f311c2a8 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,4 +1,4 @@
 DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
 EBUILD cwdiff-0.4.0.ebuild 746 BLAKE2B 351a34bfc7d8b5ac143a1ceceef2febbfde7334919988e96de71e918c834c5fa148074784d87c09c0244c7a279f1cdad9bf70d1377633ba59b3d9f82b24d62a5 SHA512 32c8e3b934656fced5250a1c3fd1a7266dd6e73c5fd44d1628f71a3c585967ad6e11cb5bf2b5a483ef098d65c854d5303b7661d06117378f85cc12fd91476ffa
 EBUILD cwdiff-9999.ebuild 746 BLAKE2B 351a34bfc7d8b5ac143a1ceceef2febbfde7334919988e96de71e918c834c5fa148074784d87c09c0244c7a279f1cdad9bf70d1377633ba59b3d9f82b24d62a5 SHA512 32c8e3b934656fced5250a1c3fd1a7266dd6e73c5fd44d1628f71a3c585967ad6e11cb5bf2b5a483ef098d65c854d5303b7661d06117378f85cc12fd91476ffa
-MISC metadata.xml 437 BLAKE2B 8bce3a603b784a3f22b1977c6e9db1419696d92254b2981b4029614b723e20bd215fa46b7fb6637138617706006b8e0bbb9e94f69290503e0cf2e080b908f374 SHA512 fcda920b42bce1e04a835108a422c32ebc8706345270542d0f69b0a213328288eb7d7c7bedc5437939419f07786af8dcf82aeb6ef6d1837a4029b92a905225e1
+MISC metadata.xml 351 BLAKE2B 9953eb5b53adfb46c4ccf03374194e486948741a9535b5fbef5ea10fd5e83c5597d0115a95f0454c8ad7e429cd9ac466b51212e486cff28b057baa49e23f225f SHA512 a9a31bcfba336484467718401dcfc8116d35f114b321743926b8d92fa9e97a2eef22ffeaa56b09922298e57f7aeaf63f5f6976cddfa513d0912aff5433881ef4
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
index c212872b9af4..f4c293a02a6f 100644
--- a/dev-util/cwdiff/metadata.xml
+++ b/dev-util/cwdiff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="mercurial">install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
 	</use>
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index ffd807b21d0a..e18972b9a799 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -5,6 +5,6 @@ DIST dialog-1.3-20221229.tgz.asc 729 BLAKE2B bf9703905e16af1af11e68c5e0288e03ab2
 DIST dialog-1.3-20230209.tgz 573222 BLAKE2B eabca049a4a4c7ea8f2023534116bc1736853664deefa8fff253b6a7dd6671def231dccec9815c3842e9ba7c2ce99c304eb707a5cd405463175fae8c85153a57 SHA512 e34b1de09e3455289ee6278cf2f8bfb6ec9f8f6ed1f61aee10ad0ff5ee499330ec3481afa1dcd999ed7460479607cc443433e09584b8eeab2efdba689b6851cf
 DIST dialog-1.3-20230209.tgz.asc 729 BLAKE2B da27d94a4fe61ebcd1481f6b1bd750fe4c45db01153b059c7c329afcbb51c2f290b0a888e8c8b8bab65eb35fdcee6b8bb599fa9345eeea79ad2f298335528c21 SHA512 bac6a17614ca0798e2f52fc2635169e5256b7f3e970fe0a2693503d2fd6b618aae78f7a11bfdfb865e67f4f920c9597b3e8b050841f0b1454838ffcd4823e2a3
 EBUILD dialog-1.3.20220728.ebuild 1536 BLAKE2B fbdd5948331c59d85f60772d0e199200846f56d362dc6cfbc9e2dcfffcb4bf6020514b1e05b7ad2445801e95e68784a73cec347f96058f8239af06c5ecd22bf5 SHA512 932c0004bfa89dac2f4de3efa4020a43e7890b9952af31470c1b21887afa83bac775abdf756fda8b711648deb7d993934e222eceb08932bc7fdd63d5722b9e0a
-EBUILD dialog-1.3.20221229.ebuild 1538 BLAKE2B 22b8f4c6f5a8359a73e60999bc9f6bffdb2c2869b0b6c9c6148d58788fc65f19032be02d7f1f3484357eef7e38172de596468827b453db1539a020083b910597 SHA512 d67aad871629bc11f0373154a3530d655001fe40876c284e87adb47f6da9f25a7996d89fe7bd50ca49a1a8e7042b428f16f9bda1ad74903578c0ce6c4f97239f
+EBUILD dialog-1.3.20221229.ebuild 1536 BLAKE2B 51ef4d5c8aa14a5d7e6a7481bd18a99d31096444845787edaed0489709e148a9416387ec07a2c8809917099aa2e2098bc12250ef598c8e702edd6c627a16d6d8 SHA512 93fa4cb9f6d5f9f3bb0cfcfec53a526169617d5885315e2fe434d441bfd8d6d222254c2057dfd7023b09639bc5f9d6b60ce2d5c142eeadca06ff5af5f16a5071
 EBUILD dialog-1.3.20230209.ebuild 1562 BLAKE2B cfcf9eab004d87ea406c0c9ce1483ac0a0269bb8bef25460b7fb7f20fa5ce1422876b61542e5b30fe1b91088ffe3f98536353106f2ba842af060977e3226a047 SHA512 225961e5079a1c38832205a7c609b0e9faab5b7b3006deff80494a29e4cd7fed5e824544abc962abcb71b3c67796dae0ff91944b25de4094c7e00f22faa7cb4e
 MISC metadata.xml 530 BLAKE2B 018162b342a7a0462f5087ead1bfaf931a299a2934220afe0d1f2736951b66d05b9985dcae0b3a9039ccbf2df21f3a20271e5718a4f8cc8391daf23f16c0b1cb SHA512 e49c5b6feeabf720469a5d34e7c40b26cec9800eea1cdd54c103407d653b45c22de4fe341d1264d516fa00d8706c6a969ded915f2df24f463b0a8d40072afd40
diff --git a/dev-util/dialog/dialog-1.3.20221229.ebuild b/dev-util/dialog/dialog-1.3.20221229.ebuild
index 89ae5ce2793a..ccb366c584ce 100644
--- a/dev-util/dialog/dialog-1.3.20221229.ebuild
+++ b/dev-util/dialog/dialog-1.3.20221229.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 3e370cdcb5ff..6facc852e796 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,5 @@
 DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
 DIST diffoscope-238.tar.gz 3287285 BLAKE2B d745c0b279ce6e29cbe9c6655c48d2fb4c8d230c5d4931048be83b4d97f6b45bff5424409b559988c2efba2dcbb80778c97e3f726174ae154c479ec24b557c34 SHA512 8600a3a29f7d4a80f0a0b37e6277e46e377c6f056cf111356f80723f0e4a309e9bae087643019fe1c46f99430b35389083e1156911fa8d3375993b550342b25f
 EBUILD diffoscope-229.ebuild 3567 BLAKE2B f072f377fa06316742810be8de7ef0d24f94448e2a0626aba507b5af54ab8915833aa4ebde7668c3cac05437a9db198e4849ae7558f0413a2a72856bca8ede89 SHA512 963c4d3a4ca14b360a8f062eacbdf82f1c30d59f4a0bd47eba11761007fe1e5227a15635a66d9e75150c72aa14da0d7782bcc64987feecc01f32d614998f150f
-EBUILD diffoscope-238.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
+EBUILD diffoscope-238.ebuild 3576 BLAKE2B 6d4a0198927e87aa167031dc7775aecfea2dbb093481773ed3e716aa591de8ec972b7c47c1ebe204b12224bc65416084e690f099054c88aa75c15e556460eb05 SHA512 8f0e332c841ecc4dcc9010ed9e50baecbe76be46d41281a517fce335e807357143f9d0f230002e68324d807d31d3725a21c0e7b5b958fce355a56daa51122acd
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-238.ebuild b/dev-util/diffoscope/diffoscope-238.ebuild
index d598e5340b57..f64abaa19dac 100644
--- a/dev-util/diffoscope/diffoscope-238.ebuild
+++ b/dev-util/diffoscope/diffoscope-238.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/fuzz/Manifest b/dev-util/fuzz/Manifest
index e6491df8711b..776c2efbbd20 100644
--- a/dev-util/fuzz/Manifest
+++ b/dev-util/fuzz/Manifest
@@ -1,4 +1,4 @@
 DIST fuzz-0.6.tar.gz 54431 BLAKE2B 8f9652fbcf13038e066d9eff5bb803a9bb76ded9c9f18f9c39981e40530a8fa2ef2fa1aa39e6196908046e7c3dc9acab8ef2adea9a9c8ef824635b1c02aae248 SHA512 87a9b103bb37c91937e2bd4667a33f3792c464f8464fe1f35b022d9c01a13255c7228ab80ce0bfac4ccfdab9a25238a5e1add00e9380cbeb24f95b686d18151b
 DIST fuzz_0.6-7.3.diff.gz 3004 BLAKE2B fbbceb60b58e973ceae6485f26297bd843261db8d80d0988ec08eaf275758d32d5e3c992999543db1e3f1cc546dd881f8fa19b6c027bdb79dc3dad84b8f77ae9 SHA512 aef080a908269d44536071bb6d4a91560d7f357fb2145fc0d0369ea5997fa6a5c1b13b3fc673c370a61add5c76f40df3501f5103f2ac35ddce9662c9345e20af
-EBUILD fuzz-0.6-r2.ebuild 674 BLAKE2B 3f5150c746f2f8d9f5861ebe6bcea6a18759a807e6c46a548410a3637562aabfdc5c0fd5037e5a4ce750f99945dabf91bbd187e3e37d3b6c9723c33196a4406c SHA512 1b46f1ab0252bcea717a9fa4274550f32ccd3c2c247b474c1e07a7f1b1da3aac0f458a297997c4f2b6757dc64f6af11c5593ec932dea2bbae68ea2ddb44d2688
+EBUILD fuzz-0.6-r3.ebuild 722 BLAKE2B ebf645185f077f3aa3b7abda186ea17aa99f7ff25613a4ddc7770d36d83a615d4a29e30ec3bac24acbebc3d33437d4864fbd4106388223f5d3661e90ec619172 SHA512 dd25bc48420eb680097b14b10186097329a689badd39224435c9ae5c5615949515b997ffca46d5a250ba23e74237b6cd23c6ad0e4cbfb853654a45c61648c349
 MISC metadata.xml 301 BLAKE2B 61c39ed1a6560b4e9a9970fcf226009c5217e57c9d942461b7daa67da0a919cd5dbb34c78da28254480e92fdf4fda1e96758fab40abd3db1a2276cced1ff5850 SHA512 4dcea2d5fb529eb59f4b9d2ce34d83be0f455ddd1215beef09f74a56d8fe3274c7cf0a40dcff11f4e0509bf27dbf928d14b0d08d2e47a9226af4ba5391b3a635
diff --git a/dev-util/fuzz/fuzz-0.6-r2.ebuild b/dev-util/fuzz/fuzz-0.6-r3.ebuild
index 92ef90211b32..a0ae9281e5d1 100644
--- a/dev-util/fuzz/fuzz-0.6-r2.ebuild
+++ b/dev-util/fuzz/fuzz-0.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Stress-tests programs by giving them random input"
 HOMEPAGE="http://fuzz.sourceforge.net/"
@@ -11,13 +11,14 @@ DEB_P="${PN}_${PV}"
 DEB_PR="7.3"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="sys-libs/readline:0="
+DEPEND="sys-libs/readline:="
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff )
@@ -25,6 +26,8 @@ PATCHES=( "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff )
 src_prepare() {
 	default
 	tc-export CC
+	# Clang 16, bug #898764
+	eautoreconf
 }
 
 src_install() {
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index e13192351288..25efc1503009 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,7 +1,5 @@
 AUX glslang-1.3.236-Install-static-libs.patch 1460 BLAKE2B f17b5b7325e112d52a65767166530c9976833a2a893e608fe89c662a2e84feccd8e51b36a620dcf94b269cbeb96307744b4376799821dd4d4e422ad8fd887b14 SHA512 032da16afb9ca98bb0377625fc16458c641836fb3bb63940818c1bf4b068b6fe03b3f14b03cf00e10991236ca20d292293c67d02dbc429b2e3714e6a8bf85b19
-DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b SHA512 4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3
 DIST glslang-1.3.239.tar.gz 3683945 BLAKE2B ffc690522814d7a28bea7168744d390a5a1c7e34e67f2037c72b2a040c8c48fbb9d46f37d74ea58b2bcf7621b0008498a9dd592da08e9e93037e3f45c5b920d6 SHA512 a7cd35c76dc4f3a4f2f1015e7495b87313472d7c766075256c0d2d0004f395f62d38d715675b49f13f66a12645175c421af4622129aeb588528397e92f51790b
-EBUILD glslang-1.3.236.ebuild 963 BLAKE2B c3e69752a1bcc0448a59c196dc7e8fd828cb620abc41106939971a28da337f57165ca2721669c8d40f42568bb200bd12367626b9d29761aabaeec5825570a045 SHA512 a04780f1b16fd97c96aeb18e24dad17a9250e1873a8457a544ecfb4372bb0903cc68a5e18a044d7826c298f5575c69f185209adb53551bef95f4bde69a3930ad
-EBUILD glslang-1.3.239.ebuild 975 BLAKE2B 6b94221175b8afaff34f9541e3ccbd8aa77062d3fa0bb51b12d55cfc3b63d10940b4681e17a9836b88e87d14dd11cdb9d589db6b4fa87feeda7dba35ff2e2b93 SHA512 070e66eb1c8f02b6f54314cd27f2f25ce6024bc26a8b216a53022fc3692aa83ad795cb7f12c9c85c15cd7343226acea23701bf90c2d4385a94182d3f109dc97b
+EBUILD glslang-1.3.239.ebuild 973 BLAKE2B b4810ffb64a48c2103345a55b55ce856ec4fd7a0e5be22324e0cdf52cce95816fa2cf7759e1a30d85130e54cd80f81b2fd42598e61aee3ff082ad5da35f984c9 SHA512 197e83ba1850f56f348bbbff6c48e29f091855116c5ce0709b4f3148e6e96ab9718a4511670ef7db802b3cf8836325ca4c8d4b5f07ee4ae88a72c7cbd2fa64c4
 EBUILD glslang-9999.ebuild 979 BLAKE2B 9be4b50d30e27260788c9702f784c61df580b96efa40833d3685edb9774ff119dd72cc9d2859c23264785ea271d2cc94f4a93583f857930bafe4058a0dc0d703 SHA512 cf8af799beee2b6a945fffd89b3cdb8813b51d06985286d109d237347d086cc90ed2a7058b428bf1d9b117109bbc67ad161b714cdb7ffd634c4bd681bf4762b1
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild
deleted file mode 100644
index 85c685266e96..000000000000
--- a/dev-util/glslang/glslang-1.3.236.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
-	inherit git-r3
-else
-	SNAPSHOT_COMMIT="sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
-
-LICENSE="BSD"
-SLOT="0/1"
-
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PCH=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-1.3.239.ebuild b/dev-util/glslang/glslang-1.3.239.ebuild
index d5d99ff7cace..9a03e6499202 100644
--- a/dev-util/glslang/glslang-1.3.239.ebuild
+++ b/dev-util/glslang/glslang-1.3.239.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 5e50b94e5656..6ba9d02103b8 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
@@ -11,4 +12,5 @@ EBUILD lldb-16.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2
 EBUILD lldb-16.0.0_rc3.ebuild 2670 BLAKE2B ee1ab32dec6e5df020c0bffbaee0bad69ded3a57d6a26c61fdece3b9741b91c97a1fd9018fe36db452515852ada6388d539d93f0fa718601e7f1b590704af011 SHA512 93ee5b4a0f8d34cdd270e152d5c4a7e7fdd0df30eddc43ecaee3bf84734a0442d012eb3f2c619682465646d9789b8cc1961dddc7018cd17f47b88ccfdf764206
 EBUILD lldb-17.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-17.0.0_pre20230225.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
+EBUILD lldb-17.0.0_pre20230304.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230304.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..1d8c4b56e83c
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230304.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 1e6a4685bf13..95e214d43c76 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -4,6 +4,6 @@ DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf
 DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610 SHA512 9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
 EBUILD meson-0.63.3.ebuild 2978 BLAKE2B ebdf54198bd010928a402e68e427d1333b816bfd2a80862f94496a03f74c6030258d4295c563fac26496203f4f07d7fe747d28dfa841e7e21def6178bab85abc SHA512 728eee4770cd69040758ddf44bc6f06adcb31ef5155583d6c264e8aa21c3185f0c2c9870e8dae7fa384950f440f48db03e8e0e1367d2bdb391776340184621e7
 EBUILD meson-0.64.1.ebuild 3016 BLAKE2B 7e9a8e434623058032f5c9d2f9e0b7d3abad73acc5343f3b38270da333cab2fba8c99781fbe09a1e0875b0479b3d15c220c59d8bc2af290fb0c44e731aefa56c SHA512 6ff6d348c159a862c30b9e4c576ca11a9bc065a94323868fa69cbafc3c28ae64c30fdbd28e966950a8fd87c01be994364e47bfc8bd08f07bd71a92fe8495f79b
-EBUILD meson-1.0.0.ebuild 3017 BLAKE2B cd5a96d9793d83033fc0c643d9f64b514c241601fa2d1d5b07fefde8e9e4ea291b3594ca4a67d9d45fe5405f9f2537712d6dba30ffead916d8b403aabd29aeb2 SHA512 af014014c9396ef498be932e6b0dbe4e9221816f9e80bfaf8f7ddd4bac3fa3eeac0eed738ab7c281a47085c1f68c3bef1951fc6f3e1faf57c45080e1e8671f59
+EBUILD meson-1.0.0.ebuild 3016 BLAKE2B 7e9a8e434623058032f5c9d2f9e0b7d3abad73acc5343f3b38270da333cab2fba8c99781fbe09a1e0875b0479b3d15c220c59d8bc2af290fb0c44e731aefa56c SHA512 6ff6d348c159a862c30b9e4c576ca11a9bc065a94323868fa69cbafc3c28ae64c30fdbd28e966950a8fd87c01be994364e47bfc8bd08f07bd71a92fe8495f79b
 EBUILD meson-9999.ebuild 3024 BLAKE2B ec625a379d921d795834b542ea0b1fb6d80d9c2b959f62385a77e389b5e8615269ac58fa0b02e05056a41f17cf67e658123021a2791cd0487318b9530e9d2bbb SHA512 b7196b000747b08003a900ec8865e415f6567b870a3fed01d306f16b06e3376c8848333c5cda64f547076e908fb117b724cbeb40887731bbe2db7b64c5d9c0e8
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-1.0.0.ebuild b/dev-util/meson/meson-1.0.0.ebuild
index f14de1f9d52d..041c8396d96c 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 fi
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 1b06b66bf104..b59279eca733 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,6 +2,7 @@ AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031
 AUX pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch 2435 BLAKE2B 3e41b3ca1666aa8f88473bb3586312d77dfe2dee6748355346ef774dd8ddea4680abc329c653679eb97e634d86e63ef7c0b1593c9aa7ff4160ebf1e5d072519e SHA512 33607bcf237a542d043255f7a9f7f421f87d1a9e782a3f9a23cefaa91ea0fdfe815f50ff44125cd4e7c54aae36a6503998b9eb3c8c49e3626b46a1845ea39120
 AUX pkgcheck-0.10.19-fix-setup.patch 733 BLAKE2B 39033cf4509d7a46f0a638109cf1b7b8cb8b978f6b50ab4a331ee0b73745d3706b22f8e331990a2daf7138a9d0a37f42dcccb03285ea705ef96e2ae4d3a79f6d SHA512 6f1e2644989d2843fa9358e3bb440306fa4b6f52bece07dd2bec36b2597b41c03d54784d3ea505539ab5463030703d4b76d62ea476fb31d0f5719a6af662affa
 AUX pkgcheck-0.10.20-fix-replay-bin.patch 4506 BLAKE2B 68262310538abb220ef3f3109f65656e11716160895491f00f438bd686fe6a904238b1dd29cd92db7bbbb83f2a0282e455e843b7cc8f17c9f4c47a42f8dc4a82 SHA512 42a45d64f4bcd31b510124e8091bb3aae93c906bdb90ea2332405a5b17baee43edffc45563774fbdb2a7efae795065b67f81aeef1c5b9bde7df0bdcdeab3aa48
+AUX pkgcheck-0.10.21-fix-scm.patch 1470 BLAKE2B 2ca07fd6f5736df1bc8ce374842bc5d8090e7e705bf0c98630ab94e9c12ca2f0cd0be6b9bd57d59e67f2b25f971865ff3583d66f2815762e68943083636656f7 SHA512 360091ce895ded5abec23cfe7b9d268d22ae59a237c2f9f85e5463488d94dd8fa86eb8e7b148d0d92066d69854d263dd08645620bc43aedabdd8a283adbbd8d2
 DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805eaf9797c9839812d8716ea9f454f631d2e6da4579bbf702da5aadc61adc8064a6b7d32f001aaed9a2e42f8392f24c SHA512 c3af623b5c38325f9afabaa217e29d23dce4355a0aebbed77a5efa469ac135238d0aa04b4973d84c52e68ada0cb3b391a82d58317e75a279f083470c7e69cdf6
 DIST pkgcheck-0.10.20.tar.gz 549746 BLAKE2B 72ed97d93674ffd311978d03ad3738494a752bf1b02bea5eaaaf1b066c48e8c9ec5f82b79baeeabf3e56e618c76614ee6179b7115d1d875364ac6e3fbc3c6028 SHA512 6a8c135ca44ccbfe15548bd396aba9448c29f60147920b18b8be5aa5fcd1200e0b75bc5de50fc7892ad5460ddad1e7d28a7e44025bdc581a518d136eda8b0df2
 DIST pkgcheck-0.10.21.tar.gz 559386 BLAKE2B be30dcfb0021459026059befdd9cbe661b9b2448e6997e23ce6cc28b56793acc72cd490cf07f42ad6e13a48beca52eba5ffc0b40ef981fbc7235dd9ce29bdb27 SHA512 148567658d949e4737da5bcd2329b4647296877b747a216c64a4d0839dd0b869a8ae32644784ff124f7f94e54a58acc5fc349a28c8a096a99b9488ebc04b374e
@@ -9,7 +10,7 @@ DIST pkgcheck-0.10.22.tar.gz 566826 BLAKE2B 714eb92bd43b4c3f2319aecb343fe6580f75
 EBUILD pkgcheck-0.10.19-r1.ebuild 2362 BLAKE2B d653ee448a74bbf5debee553a67e1e387fc0ac0f3083540b32b014991eeb27dd0b02f33697b95669ebe26fd0c84d528324b2cb5b7b51750e4e6d45309233cc6a SHA512 2da2dcd658b828c907380fb4af4d2fcd2fc7aa007615a8fa1fd36dee9cfe71b6d21ea80fcc25eddce69b54b64046a5ff5c86acd64d8dfb8f0f97d3f72a2da5dc
 EBUILD pkgcheck-0.10.19-r2.ebuild 2417 BLAKE2B 8846153b57eb01b03fdcd0d9b70f303aafc9ebe40dc2a139be4b480153d734da67ff94a42b5a7d3accf2a9cfbb73664668717c56b635d9d88bcb001b5d93b787 SHA512 5529cca4233e5c350209baae3838949954a076fe074b3dc93bab8e34c5716f0d701cb43fc443ccfb1e225ed06f3d61e21b34f566b64e0cf08167d91066016bec
 EBUILD pkgcheck-0.10.20.ebuild 2299 BLAKE2B da8d2f3c4003dece22395a782538718fb5511048dd8a0f193504875b42fbe1c330583e4491b12cc4ef0c4d85caedb7777d3b00bb562a6e5974ebfd35f93fdeb1 SHA512 d97b28760c66445cf6a466a928dd1458ebdec5bec82742609545899e6a451bd46b5ec02913ec56228da44ddba728e0fb9bf76f8e96043d91042015587ed6c419
-EBUILD pkgcheck-0.10.21.ebuild 2208 BLAKE2B 7a591201ab467e2a2c463ab85f71145aa7dced2636d097305f79d59630075e39d6f11d2905362b281fef12ea55020bc274a870f162bdc5a70c24428c8674027d SHA512 337087d18df1524c74217e6373aa02aaacc32cc8fc50fd934e40b38157ca62fd1111e3f1cce0388740daa6b5c67f1d25a38c252f31e5eed7266389e6869262e1
-EBUILD pkgcheck-0.10.22.ebuild 2208 BLAKE2B 611f4a9bc2958e16e58867934ca50f62784217144e207875e30d3844ecb240361e6d20e5b0a216445e9d13b7f5bb0e9293a5e6682a9e5549a83dd14040aeb2f3 SHA512 6197ca12a10db8ef8a8b1c160952fb63751fb771f08c656512a2c11393bb8e241dd6c209bb5a718c66edf0d4448511e426827e40155601b834fea0da5953a3c5
+EBUILD pkgcheck-0.10.21-r1.ebuild 2264 BLAKE2B 51a2ddc89739a22f65f4519be6af1ae7b6e3c7b6553e40c040d6bca4960fd59592f3fbf5443b7e0df14b9dc1a9a6ccf76cb428375df9d92aa7437ebac9ec15d6 SHA512 15e5914fa42016c49a7f0a4c059fc5a3760368e2b91dd638e050d4491880b4c0d62ff878e76d8ae2a9033c171c20c7b7552a2d7a24641a719327a4d28b3fcb67
+EBUILD pkgcheck-0.10.22-r1.ebuild 2264 BLAKE2B 4aeae81f99d3777b91cdc23e06cb05b0c35af1ac4c7ca2e3d39c895f77015a07417fd7d968d2cc4f9b996e1492dfedeb696d7dc1047da22929083915b0821d65 SHA512 b3bd9dff6e17d4a803535082f5b7cdfd238d9956cf9e946b3433c3a21d2e5a7e40d43ecad5d31a0a545ca92b60fc382d8ea8298c0f28faa199b8309356460bd2
 EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
new file mode 100644
index 000000000000..387da2374107
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
@@ -0,0 +1,37 @@
+diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
+index 291a56b4..19b87ef5 100644
+--- a/src/pkgcheck/checks/python.py
++++ b/src/pkgcheck/checks/python.py
+@@ -234,16 +234,16 @@ class PythonAnyMismatchedDepHasVersionCheck(results.VersionResult, results.Warni
+ 
+ 
+ class PythonMissingSCMDependency(results.VersionResult, results.Warning):
+-    """Package is missing BDEPEND on setuptools_scm or alike.
++    """Package is missing BDEPEND on setuptools-scm or alike.
+ 
+     Packages which define ``SETUPTOOLS_SCM_PRETEND_VERSION`` should BDEPEND
+-    on ``dev-python/setuptools_scm`` or a similar package [#]_.
++    on ``dev-python/setuptools-scm`` or a similar package [#]_.
+ 
+     .. [#] https://projects.gentoo.org/python/guide/distutils.html#setuptools-scm-flit-scm-hatch-vcs-and-snapshots
+     """
+ 
+     desc = (
+-        "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools_scm or alike"
++        "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools-scm or alike"
+     )
+ 
+ 
+@@ -291,8 +291,10 @@ class PythonCheck(Check):
+ 
+     setuptools_scm = frozenset(
+         {
+-            "dev-python/setuptools_scm",
+-            "dev-python/flit_scm",
++            "dev-python/setuptools-scm",
++            "dev-python/setuptools_scm",  # legacy old name
++            "dev-python/flit-scm",
++            "dev-python/flit_scm",  # legacy old name
+             "dev-python/hatch-vcs",
+         }
+     )
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
index 66e807c20cc1..6c5f4ff38cef 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
+)
+
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
index 582d6f268d39..00ae8b9e321b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
+)
+
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_tests pytest
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 0391ae4e304c..4970a7bc730d 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,4 @@
 DIST pkgdev-0.2.4.tar.gz 64156 BLAKE2B 321e14b246a97236142a862968bfc127f3215314ef173dc0d610ca867d00a0db067def7810083b11bf6aea1e36202e6c91d7c63d74aa2b85fb17ec476cba1f7c SHA512 0390e130abda2f8eea1d3dd029d31d9381f2543ca98f547b91716ce383791c3760bd89bb276b5b15eaaa165be339c8147d26e93ba81d5be4c8a4cbede6a31caf
-EBUILD pkgdev-0.2.4.ebuild 1612 BLAKE2B 524f65404ea5d3336c11fc7243437e998ae7ae47e2f94357bf596fc899adeee59f06032ceb28b0d9ba7087caf833bad43fb27578f8e009236b8dd5f04d7b2a0a SHA512 8db1fc333dc90e1040a278b881493d46ba279a58d56d9bd1e3c410846bc0061419ef28839d807e67d339c5d32eba0843943397836710988a17d2ff75f7eb998b
-EBUILD pkgdev-9999.ebuild 1631 BLAKE2B 2b1c129ea90a849d775c4ca60014b3c4128a98ba9c2eacb117d137ae16d2826de6e8224d0f62beeec2beede165620ccfb13de176c8bdaaf6300a5a30aa399dfc SHA512 68ad3250424d74ca21cfe928fbc5b1efcecb3c6cb4daef692af8f785a3169b1bbaf9a7ef9f7f201b5beadae8b711fe74b1b1d5024883e5e69ec7253b04539f62
+EBUILD pkgdev-0.2.4.ebuild 1573 BLAKE2B 2e74e3e4fecdfeb426754899a68342f547d561b89cc78afb7bf55a7ee405d59994e1387a3f033065ead3d14a9e34fec0224fdc52882897356a4efab20c1e1b8c SHA512 991302cfb3c508e65c905a088cb87910e1ca823120b37644ce33a420dbe67d96a75e37ab2aa50f9b90fafd0b95670f14c9295428fce39bb6d010cc86181fbfb1
+EBUILD pkgdev-9999.ebuild 1660 BLAKE2B 8d9d1862c28e4e610fba1359fbddcdda49aca9ad8248f07f8ea7f9b1fb91b2b9378c79e4588616ae2a0939419594a2ef836433b5b04d31cccce14f104c696f17 SHA512 84e2edb72f6dfebf5028f9aafa98023e0837b15819ae77302d722a1d90481dc084551d2b8d78f599df4c4063ac7241a978637e4a51d5dd3c3b74936624f852e5
 MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/pkgdev-0.2.4.ebuild b/dev-util/pkgdev/pkgdev-0.2.4.ebuild
index f6989d35b829..4b29fa2379bd 100644
--- a/dev-util/pkgdev/pkgdev-0.2.4.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 3ce9dec619cb..7b8c02772dba 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
 	"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.10.3[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
 	"
 fi
 
@@ -69,4 +69,5 @@ python_install_all() {
 
 pkg_postinst() {
 	optfeature "sending email support" x11-misc/xdg-utils
+	optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja"
 }
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index 5f7c157ff50e..a34732ef2fea 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -1,6 +1,6 @@
 DIST gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz 385989 BLAKE2B b7582289f83fd0c76b8ef2a04540db979b0f599b6b711e17541e2804b93bcffe6fd611d43101c96644a7324398eea5df02326267b4e201564929de956849b719 SHA512 57701b5fdd4c69be79a451f08fa6d7cbd43a0963cfd7689443676b68ece96154ccb61121d4a770d6e519d3142f99c589df1143b0ff8308547c06fb0e87e187db
 DIST pwndbg-20221219.tar.gz 8344938 BLAKE2B 1ecda02573ef03b569f8a46c390f5388e6db9cfbb0df84410f245e4f043e89be16b6581d0e07fe840d50cab875943dd5a30dab1c2fc40fb93c5982cecc33e490 SHA512 1578ea834d7aa1d574e559844dae1991eddc9575c4e445ae02d05f0024900c550253293cba7277ed651df613cb2a2e2028486c2b8bc52adc0dedb9d9796c58d8
 EBUILD pwndbg-20221219-r1.ebuild 2366 BLAKE2B 5ad3f881de127a195034ba355028fd81f442458c6fba4a64322309f6a07ec9fd98be2af0ac1b84e082d1916778af42247f2b3d173fdc498d638d406f23f61f38 SHA512 90e270d187ac34312a47c109052ba5179c62aa0a70e395ec59427739b9e91137538f9a11e1af43443203160e566ca7eb72c94ed296a23781cb2f375ccdc93cd1
-EBUILD pwndbg-20221219-r2.ebuild 2387 BLAKE2B 4bfd37699192d71f3b05defbcd3f2e1076110eba20e8923a63472fb4e2ab0945df83f43988c5d2836e3f1a206fc0b3e6567e6850b5234731e15d7a1385bc6214 SHA512 0e2f2410ee29499cbb670a21e9e124914ace33ce47b335a7b1a66b913cebae5fdaf61772a5a5863ccfec3c08bd905d304dab5a91b7652cf35e8038f467fabe7a
+EBUILD pwndbg-20221219-r2.ebuild 2385 BLAKE2B df46ffb335343d9eee63a4d13fbd875a90df029ca2972db09d54a243e61de8ce9325d7538f42387df23f2aea70fac2edf30a7e4bb1e8238f3b173f7a66659a46 SHA512 37be4d88673f5e29f6c1afaf4761f587a22421d282e32082508a9ea916fb19fbcf6b75b6c7b3e78b6ca1b2886e18cb11f4cbbd7ae85af3d1b95b7ea8cc7a0282
 EBUILD pwndbg-99999999.ebuild 2493 BLAKE2B 603ba4fe11c0fcc31fb6dc2abd79dc752e6d031018ef889d691384666c18ac6ce599c483a0ce2af9cea774f81c64e8cdc1b47c970a80701212c1b8d0c431876c SHA512 52ff6a91eb267187a043d59ae72d8b0eca7614f6253c109e2a18617bfce776d123efbf9b533b22eee9e364a3cdf5468ea30fb6db6fa1c22e6abe8322834fa38e
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20221219-r2.ebuild b/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
index 2c9a6ddb9ae8..b78429bf9f65 100644
--- a/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
+++ b/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
@@ -20,7 +20,7 @@ else
 		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
index 678ce22952e8..2306945c2fc5 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -3,6 +3,6 @@ AUX pwntools-4.1.0_update_deps.patch 413 BLAKE2B ead75c25972bc604baf20da71f6b9f2
 DIST pwntools-4.10.0_beta0.gh.tar.gz 4228046 BLAKE2B 3b03b3a9af12b23405af3d59fffa6c0baf430d9c8fc9c4180d43fb015b5707e317189a4d38091de02a688da34756aa9dd1ba8ae264857556db142880141f7d61 SHA512 9806509deff098e1d0f4f3cec335191f536d3e59d620acb7966aafccc64ebc84a28ee77c91b2aac93c8ba13a36fc77968dfe56852b1fc593a1ca2d2e568d82c6
 DIST pwntools-4.9.0.gh.tar.gz 4218616 BLAKE2B d811a96943fbe80a4082bdff412aee5df02250846189e6300e99a6630bc02906053e728ca9904b27ddc546ad2c3612818a046b4d6418d8ebf682df600b99bc99 SHA512 8ed404dc556383712ad4de799fbff09f51735065cac07ca909f1430b22e6e9574d870aaaa4a7ce0e22d5f6edb18b956847a7aaf4dd6cf0b44fbfcf58e32497fb
 EBUILD pwntools-4.10.0_beta0-r2.ebuild 1748 BLAKE2B 2935cebd53757982cc4c2d38b5105d33a3d5748d03bcf6bd540d4e6e505679f237e07a33f752f8f85e0e33b4fcd9de9b6b0e00ac0514d47dc24a3532e30757fc SHA512 9180bd06389724f7b95f5373807672a73e53887945cadcd8234913388cf99e679782323cdb0269bad329d9e2e1be0b90b802fddc759738dc190b037874ce64b3
-EBUILD pwntools-4.9.0-r2.ebuild 1741 BLAKE2B d2a362efc41203d765c59dddffcf61b1024f7f8170c0d12a4e9a1ba68ce208e1c3eaac9f333267d54b494d22a3a3815b0c89920075128c9360268bce9cdc562a SHA512 2b645bc2f325911fbddd8b865b5f7446ad38ae464b6a06f0803c62a2a0d1aa1ef233e688dacaa8efb06720a107edbfc7c70a37016c66dff2558a6cdbfa0aa4aa
+EBUILD pwntools-4.9.0-r2.ebuild 1739 BLAKE2B f5f8cf92df6b7908ed833e4fe3d689f4324672cab30deea566108c6227e3b856ee2b992b0f39e76910caf163c118489581ed193f0a03e4c20ac7d6feda0303df SHA512 059b434f84d82699ac6651b6425944b40061039e3f1971344b1f4e853571807ee4d40d26e3ccae1b5f506ae6133dc7d34d3caf94913a4e76611fa62e61476708
 EBUILD pwntools-9999.ebuild 1741 BLAKE2B d2a362efc41203d765c59dddffcf61b1024f7f8170c0d12a4e9a1ba68ce208e1c3eaac9f333267d54b494d22a3a3815b0c89920075128c9360268bce9cdc562a SHA512 2b645bc2f325911fbddd8b865b5f7446ad38ae464b6a06f0803c62a2a0d1aa1ef233e688dacaa8efb06720a107edbfc7c70a37016c66dff2558a6cdbfa0aa4aa
 MISC metadata.xml 541 BLAKE2B 31c34e39b19efa02a71fa2916d584f78893a864bd06559cffd475b9ff9837989164ab1e7fb8fa5ec345b63bacad314c4218772efed0b5201a964b225ba8e84d4 SHA512 e213766d68840db16fe46c9f3ba7094ebc63955f763963b44606636dfab95f0ed48a368901ad3b464e991205bcacd1de7cfe470dee63268eedf3a74fa901773e
diff --git a/dev-util/pwntools/pwntools-4.9.0-r2.ebuild b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
index 716ef0f390c1..cca036676bc2 100644
--- a/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
+++ b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
 else
 	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
 fi
 
diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
deleted file mode 100644
index 1738caba6630..000000000000
--- a/dev-util/rocm-clang-ocl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX rocm-clang-ocl-5.0.2-system-llvm.patch 715 BLAKE2B 7a23c5887e3251b68113f5466946a4a967808ec4268df2eac093b374497cce8d1ca4955c549cc8c2c5f676a51903be367fc457b01a8d1d2f3bfdf5aa85dad024 SHA512 a45561970797cf8f7406ae9ff0e3844cfd8641a5b9ee08a2958907a0154f2cafe3142c507e5249df3bfb3108f17032edeceeab850143eee358886e4ff6ade035
-DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911 SHA512 582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167
-EBUILD rocm-clang-ocl-5.0.2-r1.ebuild 850 BLAKE2B b3f6c078612c7849bc5a83ccc367d834d820c2a194e45ec2851c66a711e7b042becf0c67e41b31091f84b7ecc0930faac8d65ca49811127f66b3f98629654afa SHA512 4733c5a49318fc27dba5aa5c63283b1140d937201897c97017e0333a19383209ff5d60c498121ee3eedb75b2354291aa5b8619b2c5ef05d7eb14fa78a2291db1
-MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
deleted file mode 100644
index 5f052f4282e0..000000000000
--- a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use system clang.
-
-Forwarded: not yet.
-
-Index: clang-ocl-rocm-5.0.2/CMakeLists.txt
-===================================================================
---- clang-ocl-rocm-5.0.2.orig/CMakeLists.txt
-+++ clang-ocl-rocm-5.0.2/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(hcc_FOUND)
-     set(CLANG_BIN "${hcc_LIB_INSTALL_DIR}/../bin" CACHE STRING "")
-     set(BITCODE_DIR "${hcc_LIB_INSTALL_DIR}" CACHE STRING "")
- else()
--    find_program(CLANG_EXE NAMES clang HINTS ${CXX_COMPILER_PATH}/bin PATHS /opt/rocm/llvm/bin)
-+    find_program(CLANG_EXE NAMES clang)
-     get_filename_component(CLANG_EXE_DIR ${CLANG_EXE} DIRECTORY)
-     find_package(AMDDeviceLibs PATHS /opt/rocm)
-     set(CLANG_BIN "${CLANG_EXE_DIR}" CACHE STRING "")
diff --git a/dev-util/rocm-clang-ocl/metadata.xml b/dev-util/rocm-clang-ocl/metadata.xml
deleted file mode 100644
index e74d41fd607c..000000000000
--- a/dev-util/rocm-clang-ocl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>gentoo@holzke.net</email>
-    <name>Wilfried Holzke</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>xgreenlandforwyy@gmail.com</email>
-    <name>Yiyang Wu</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
deleted file mode 100644
index 40be9d9dd7df..000000000000
--- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="OpenCL compilation with clang compiler"
-HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git"
-SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz -> rocm-clang-ocl-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
-DEPEND="
-	dev-util/rocm-cmake:${SLOT}
-	${RDEPEND}"
-
-S="${WORKDIR}/clang-ocl-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.2-system-llvm.patch )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/AMDDeviceLibs PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
-		-e "s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" \
-		-i CMakeLists.txt || die
-}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index faf2b037d6fd..7ae79555775e 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,6 +1,6 @@
-DIST seer-1.13.tar.gz 396675 BLAKE2B 9dd844688a84645c5c105f5296c86c71335ccced3880a3636c8e6904be85253b1dd4da51035e5d93f6f6415584763cdf40dd27cfb5d617ee6a2fd2b64685752a SHA512 1c54c4c304ca3a378aaf1f2e2e8de49cf41886de76257cb9f746ff85a15ec2bf9abe0d4311ca6a2e585d2c13740ec815e63f3a8dc4df7478c71bc0e2261b5d4e
 DIST seer-1.14.tar.gz 400391 BLAKE2B 9134bd62eae35e965601af56e734a29d5f0d12af2c9383e287c0ba41a6285587b24b84b49c588bb497b8b55154ebef74ac78b1ace282d018d40d544ed070e343 SHA512 1657ce26e676cb03e514e69f79e4aef614f489918329b1421d8017284387bb155b750d18b00ff8244ad73104cd0b7e078360a22c692e9ec5cfd4aa258c778dc3
-EBUILD seer-1.13.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
+DIST seer-1.15.tar.gz 401292 BLAKE2B d0bfd13947582585e5f99a86e4a03ea58fc3b1a06879dd75136d724f28944d0fca21a71cca3be269dcd2d5a04e6275e967dce18687ecaa87b1d2aaff58ed1643 SHA512 ff3ad9c5bb35f2afe5c07917b276e1653bfecbfac7473dd1bac6d441c47ef0b9ae86775ff663f2f653057a8a848ce48aefcdb7c5b2b7d680e7e53d2398660300
 EBUILD seer-1.14.ebuild 951 BLAKE2B 2df58aa9b25dbf222f74637d321f493437448c1abbde0726c3250bfa91a0962901387780b685b13918d38419c2e6182f67a82fb44d356163fb35c4f2833d1cc8 SHA512 4358ccbc58badeff52fc06d2572efc34428843e10c7d2eb0e631c923d2d3dd0bed0d52378c03c4109b730755c3f17d8b861fb8ab2fd7e2bd3be119685ffdcebd
+EBUILD seer-1.15.ebuild 951 BLAKE2B 2df58aa9b25dbf222f74637d321f493437448c1abbde0726c3250bfa91a0962901387780b685b13918d38419c2e6182f67a82fb44d356163fb35c4f2833d1cc8 SHA512 4358ccbc58badeff52fc06d2572efc34428843e10c7d2eb0e631c923d2d3dd0bed0d52378c03c4109b730755c3f17d8b861fb8ab2fd7e2bd3be119685ffdcebd
 EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/seer-1.13.ebuild b/dev-util/seer/seer-1.15.ebuild
index ecf4ab10dc4a..207362f81cdd 100644
--- a/dev-util/seer/seer-1.13.ebuild
+++ b/dev-util/seer/seer-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 S="${WORKDIR}"/${P}/src
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index dc71b43edec5..d26f02389bfd 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.3.236.tar.gz 445166 BLAKE2B cf64f91a3d4368f876fb5834c0fa42d36861519b842fee8789515752dc8cb519266579cec8be26f3e0ea2917884b3bad2644f337adf9184cda139224cbc33240 SHA512 0cd35cbff41b5dc6f78c5129c138c83e099c8bea63eca9dfc8fdf0a19fed015b9d4435fc8e1c8d98997f1c673162b289842e0bbe3ba243f798bc631cd92d85d2
 DIST spirv-headers-1.3.239.tar.gz 446227 BLAKE2B 43c115f2b9661b682455034479a056cbef9cb9d4d9e60be88a1d5e16354dbfc907c1719f0d90cb0a0d243e420b552b150b915baaa9aecf998604197f26ba214b SHA512 f537becf7940cc31bc7b578f33be1ca55264414f205582dff0c569bdbae085e78760ea317a32e6d3fe3510e29554ea1b1a00bf9e4df3e20cd4de6e998a891a5d
-EBUILD spirv-headers-1.3.236.ebuild 490 BLAKE2B c0ecb90570326a80fc4d31a9301bce47985e5b6295a32f7629b653760935bfc986123b056fb7408b45c38732f7ab5a2df9f99fa0c317c1c414c0af43bc421d18 SHA512 b04f3edb5145d19b3d386a09c624118ed1fe2b4b5d48e9a644f8d38c802e2ffe2a5a021e65a1aecc8dfae10824cf1c40b6ac3af95b9e03775d607774a9242b4c
-EBUILD spirv-headers-1.3.239.ebuild 491 BLAKE2B 6d85706cf0f172470b2f7358ad92ad8a14dfa1e29c22ffb9f7279e80f462efbf8994a1e73297a636cfd4fee37478a14041492d3608c7db6c72deed85194509f9 SHA512 7759e882556f7345ca657ee70201852051dfa343b13df11fee6150711eb431c2951325f306391a7d3f03c4903e5126906584d34b5866f6438b9a3d37059e0772
+EBUILD spirv-headers-1.3.239.ebuild 489 BLAKE2B 48386f966fcaf7a849a1835fdedf93d61abc5017c62fbf0145e83ec8c9fcf2a58c7b240047dc82ce06075656acb4d0359cb9cf5074a4ba0d51fd0306489d28f6 SHA512 4d7b961f5344ce9ed16004715626e0822d10a8cf46241f910d05deb17542741fbc48f7aa051cbbe1977036522d5ac0b3416ca56aec44bfa6068e1fdc34c75fff
 EBUILD spirv-headers-99999999.ebuild 631 BLAKE2B 3b51ab12672d7f984b1964a4b52ca0b490fec7fc2c6ad4c9c1c30573d9181864a9654d62c95bf6bdc15627285550f40248f55ebf34b648280d311eb190842661 SHA512 293b4f77a53319ac245cfd61c06607f8fddfc88ecf7ed4d38887493527a249ecee56e1722b8582122263847918e026e9badba135bdf461ef356e2c50de6d6114
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
deleted file mode 100644
index 9cd897229506..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="sdk-${PV}"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
index 23d3f350b5d2..b074631e4c45 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 17ad3f0f3917..b58226fdc493 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-tools-1.3.236.tar.gz 3079909 BLAKE2B 97c773b3bee60d3889f9bda49d0b729ce199fab1d6ac211f0bcc9fd0ec2d1d770ed6dccd603cf9beae82541d009fa37bc6d5e1a3a8cae82985c84e3bcfbc4149 SHA512 c70287582cc42eca1a4b81259217f02e4d7003503d43a2aabc24b3c6c50b9081768bdd69ed8a9c8489b1e9a52e9762629c920a96eb2ef43a96e9ead7a1438674
 DIST spirv-tools-1.3.239.tar.gz 3088996 BLAKE2B b7900fee1b5fca47802cd168766c3bc2f316fd69380670a8f0241df607c8fb41e8534d699330e38fa33ca1632a63fe54fb6c69def68d5b7a30b4229598fdcd21 SHA512 77c06e9127e9f5ab5c83b2bae181a9e626adc4f37d10122a1ed62904dd7e05f78f5eb75f4213d8d986bc78f60f247ed23ddc2552fcbb8355c0160fb559d32707
-EBUILD spirv-tools-1.3.236.ebuild 1220 BLAKE2B e8d490e3840624a5533e37486e6f4be4729620f9380f4a06a6a39d5d5039aa89842ab4943d9d1c46a894a0ccfb3ddeeccead254fddfa8c0b92191f4c02d31592 SHA512 e5beef1c4b15767e101aa9611dd2cb128385b15daebf0419cd79ac6f6a1db553800bc95de3d73a535ae436bb7268a4d645059ec08ba1d64a966e92673477a003
-EBUILD spirv-tools-1.3.239.ebuild 1141 BLAKE2B 1cc452ee8a984411a5c15bd4fb1c6369fb4d41823d291f296ce0f53c1e3d65565de9c3ded4c27abe3d96bc182501f65078c4756c8ec4a7dda49dbaa3c150914b SHA512 fb208a6f71c34b9a95130758edc5d350e404b96478606dc01db1bd4cb9775bb56c74dc1b4ffd7ecf8b3c87f9a81d9718b8e6bce65ebd368b32e19a9d27a3f6cd
+EBUILD spirv-tools-1.3.239.ebuild 1139 BLAKE2B a8254b1a1e26f1f88c930d01d934bc9e4f282969999b8dcd823ff5c697f20a7d7800c0ce1c9da1f8d88089ff923543ca23e6ac4749fbd0284a2668cfa81cb423 SHA512 7ba92485860b9d0ea68b501d2f4e70d422df78649df97a24c96da266d693d2ac2a350de4e6f8783d96b603a6fe774155496247b7eb1d5969b11bef5bf8a8ad38
 EBUILD spirv-tools-99999999.ebuild 1147 BLAKE2B 56595323992efb3c2e9a255b3b57af95c38d3a12c59d4d8a3f1afd0b6d3758dbe1f3bf8607ae359591ef3b382c654f1e89b719bd01fe21021c15e4c32a6923eb SHA512 88dc7e115dddedf124c30d3233591a47827f0f6e5c755f67230ed830ba8625e7c6224d97042fc721a0d1b06305ecdfef20c0535074e2dfe75df1a5cad4739727
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
deleted file mode 100644
index 07404b32ae4d..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
index 414c2a0ec445..a8099b02d704 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 47abc670d80c..65bb863da278 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.3.236.tar.gz 1764629 BLAKE2B bcab4628979aba6121779f876010cca18308b42b2eea5f7e2c9ab45855914a5ef8f2f217a9853feca461c2fd002ad44696b60ef229c4a2f187aacb7e68ae3dd4 SHA512 f4623a9076896403ceff2c97b02bbda0692535be01dba0a51a1faaa015d9c57c47aaa0960505b94553f24b4efb9ebb84adac5a949d341bbb13898d734e6c722c
 DIST vulkan-headers-1.3.239.tar.gz 1804393 BLAKE2B ea7ab92539aa32a6973bb590b84e4004195eea1f41b3499b33c1f915514243e7d06c603f0dd9feb4d04a455dd732940f512d2acca150372ebf02b007e670b27d SHA512 d7b0bf3f41f0f4a43c89c13cabfeb99401b069e6d0358b03befef465cba7e6a34e1608e62d981d0d905f5cc6327334cdca4e249ebb2305ce1ae81ebcfb62dc20
-EBUILD vulkan-headers-1.3.236.ebuild 629 BLAKE2B 72d6d01c3264aed6d25a0b83d5129f27e7bd778a1d1dff74ec353e5ae5b060f702748e3f58e53ccbd737822e16f15078ee8635fd62a4dd4d4e2c8d312e1714c4 SHA512 787656faf06f78f40061c99142e38140592111956f9e210dc3ca6439c1f600f4a2825213efd3b3aeceaeb9a7e311030606cdeaac1cd0822eece38c479fc5e521
-EBUILD vulkan-headers-1.3.239.ebuild 596 BLAKE2B 2a93cc3508c46b36dbb3a76111476f6879834b67d6e4fe9b04f723db1a03211428058e3e430ddac668adb9e2be47ec1c9ee75c61e9012e26d9b90a37d3c7decf SHA512 2d16f0bc0e019df2d9f106668f255288b6e38b47cb5e459a1213b6d4a9311884aa9d61d57543fe85085369450932fa2b02d25d0fd85f98631584328cf996d8bd
+EBUILD vulkan-headers-1.3.239.ebuild 594 BLAKE2B 6faa9ea68b845b6d6fc5426e4eeeb9fa133a11bb420931496137c9f563005e6be84da1a8b2ab97afc9dfe55443589aa4ddbee028712e964f5bd24d219ab9e8d9 SHA512 6b72e8ccc8a6d85669eea09484848283aaa81b10a09c48c0f5822a94c108d956f4a7f2ca1b2db07965f94bda667c380c9194135eebadcfa7e38294814484be6a
 EBUILD vulkan-headers-9999.ebuild 600 BLAKE2B 0daf239aa649fb07a0cf75f53b709fdd45da34d5ab5d03bea21de97dd15871a440859ace5089d7de99665af2b1eac52ab4b312bad809d22ccb5a1ba858828a8b SHA512 c5c5e86b12dec0b97c1dcc1ef5edfa993665f99ff573892e7426ee7533829a72884e8b5eb4b19ec27d289c8cdb0c383299aa41c05f543e6af54455b2ecf06a1c
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
deleted file mode 100644
index f0c4031a7ba5..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
index c5f1434ff61e..872d26d1d2b5 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 7aab82ce647a..5d2d2644fcdf 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.3.236.tar.gz 880927 BLAKE2B 0d2b885057d063946140489eae4fb08ad8ff3172d23243f746c74090a20990901b18126cfb41efdd38b24f7c2e7dcd62dd3453f0f6130c618632592a4ecb1d31 SHA512 aa3b934ab084a29ae2503be96f0af69c52b693525cd5bd641c85b5a6f79ec3b7a48ba1b08a1a898229f80086bd5fc819b8ad4019835490653edadcf2d086b9f3
 DIST vulkan-tools-1.3.239.tar.gz 775603 BLAKE2B ff2b07454b603a72f0f07c575c09b431f0ec996bab2d5adc66d8d5f1456b0897f3796a33c5658949c92f895b67cbc67ad777975697693cc677db69400549e824 SHA512 9397f71dba2b741dd43c101472ab5961e64b46a7252fca1aa2f3b7c2afbe44b789a25c13536c8eb5dbd6600d0c741330493b73177d805db38ff1542364ef4764
-EBUILD vulkan-tools-1.3.236.ebuild 1946 BLAKE2B 357ff477e3502a3a7cc5f8c40b88214f92227a24cdd8f70d9c833c7d52241d78a8851877a00c9bc1b4794508991b1a67eadbb220b00d8ae654c50906bb6e1391 SHA512 d9c971f9661be7bee81ade9a830ec9db694a02f31df706997ea8a94099f9c5f0d5e94f1c5c60f55b67f4b4a29494bd70a8a62667f0c0907b420bd9a6320d8df8
-EBUILD vulkan-tools-1.3.239.ebuild 1897 BLAKE2B 6387ac9d981139e527618075ee4fdfa00d133f88c3289597667d34b2c99b652ac37df3242663eb912af231b73b30b29cd9b696ddcdeb1b9218afd3f9fcccc16b SHA512 3f1fce7ca1e40488450db1857c4cbfb911a398f85f614422a4e0d0f7879555da263da349f9a3828c88834ece9c1f7be6ca15f56aeabf851712c8ba8cad793b5e
+EBUILD vulkan-tools-1.3.239.ebuild 1895 BLAKE2B b62ab9d1a808a44ec9b5c756cb914e0807ca043e9515e89320203c39b4d18613cf1c8728eb97a609b1e815e096ac0731dd4061bcc8d224de9bb3198dc2869531 SHA512 11e950158f1ee4dc2c0d4960c4496f8e518f7e02b9ed90ebd643b1270fd2515dd7f1a9cff617d11f3d7bfa850b2832b7a5ba0686aef868ad58c8b02852ab9e70
 EBUILD vulkan-tools-9999.ebuild 1900 BLAKE2B 6599fa23b8bb2e178420e33d7e6d093467a72cd0b04028b92c59d0434458f80f81b6e34eba26143e76c831624f222080cf7cf1811941e36f0addc83139fc2d83 SHA512 c507621b6a5535d02371d4cf3c3bb12edc82b5322ebf47ae9c52af04090c4f0ac292f6fd89244c9fb7592c4d2698c2f2da896f1665222e3235890b128dbf12dc
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
deleted file mode 100644
index 223c7aa75fbf..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
index e080f1475cd2..e868c43fde5b 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 84e2245454a0..c407b94a0dfd 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +1,9 @@
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 DIST xfce4-dev-tools-4.17.2.tar.bz2 353571 BLAKE2B af3ec3e603b2224ee47feefd63eb3e0be6a83dd2d442e8372d71c2aff910a5fb7818c9c93d0347ed239749d14f83f9443c2bde05a815e7449b6ae564186a1b6d SHA512 f08cdfca8c5753fd58fa3eefa56a3ba94bbc708ecf93d4872f3d843720840ef6d57d0af7fa7fdb11d8645f082338d7668bb01c6e531aec8ad89c6cd627529124
 DIST xfce4-dev-tools-4.18.0.tar.bz2 349125 BLAKE2B c82496de1a279a3ce57f895a52ee4eab98d2d174cf7109ac70790d9f1c8a6812196f4ff5bd951352b2345496f0ebf4113472a7e1f9e3826a1d02b163e4108f6e SHA512 59f858b633d95585a74c9b9515a0994744f4355ab3813e582e10c776454ac41c86296a9fbd935d5dae88929ec09ec9c30f48629c7addb5729e6bea108d304f7c
+DIST xfce4-dev-tools-4.19.0.tar.bz2 368601 BLAKE2B 349e3dcf69c1fc1f0af052546d78b86ffc89ca81b66c27e8b7058f549adb0c6a16e6c462a6f5e00e66dc4b419dd2ea7fa43c210d83153e23254b8b5ae5a77fbf SHA512 7372efcb686fe6c1e42f17564d693cbe24792d00fbf131faff46040c8940ad355067d4a4cc5d5de5ec6b9707943c5db5de84eee4a4ff894ef8c33c3616a26044
 EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
 EBUILD xfce4-dev-tools-4.17.2.ebuild 629 BLAKE2B 67dc7710e79735b17caf0f59b60731da8079b3b5e28ab25562d2bc662dc9f6e0183cbe2c330361997ebd256146f5a6fbf7d9220b7251dedf6ed85c68f8292c52 SHA512 deee8675a7e3e9694f9fe303a6de33b925e84fc2e5194f7b4cdef464d03f71ee68afa71764296fefe0cdde68d212c5922cbfcb87b09888e5bcc2cd8a684c8aa1
 EBUILD xfce4-dev-tools-4.18.0.ebuild 627 BLAKE2B ee0ab2ee51de20f04815ab0e97afcfcfc4d77ad753b0efaef17eb5d249e04a72aaf50ef317fd0216a92525bf3cfd38b8d84ef21aa84d9a77061b1d2176287547 SHA512 d37e99fd5d57454f33bea94352e07f09ac64726a087390475724df1ef174db22c91de786fe4748d83107335446c8e589541d58b961754116d457592454162f7a
+EBUILD xfce4-dev-tools-4.19.0.ebuild 672 BLAKE2B cefd34949e5ca824dad4609cd9ad7424d35f0c4e9da13bd28221dab894ea6a79d51f91881aac0500101deb539c17e1dd6b479326037277225c15ebf0c2fdad7a SHA512 b8c0343caf7847d9b89977057135d78ce0e7f5e066a67fabf26dabe83d1b9e3af97e7f92f30746d5566ad78500b37028b22c69dd77238d29aba169f2ccabeda3
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.19.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.19.0.ebuild
new file mode 100644
index 000000000000..8cc84c957f67
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.19.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-dev-tools/start
+	https://gitlab.xfce.org/xfce/xfce4-dev-tools/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+"
+RDEPEND="
+	${DEPEND}
+"
+# libxslt for xsltproc
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 24c8de4ed97d..9d02100206cd 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 4e97933cae83..3427683d1e21 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,4 +1,4 @@
 DIST git-lfs-3.2.0.tar.gz 3270970 BLAKE2B fc235d48e44f8a0f446b05914cd110e6486481482b2884483dcf04198a3275a633cd8090e1591975f8b84ba678c258581e3510fc0d478d5fc72abf6aa98bd5c0 SHA512 c2ba8cecd5b3519a032f446b0c3043352f37f3c67ff3c2304a38beb176f0ae8efd1deaeb8bd54a35d7dd7dcd988da67249c896dffd83fc293b165a3e6bb02d66
-EBUILD git-lfs-3.2.0.ebuild 1602 BLAKE2B 21a4331030a8717d3511fe5deba1454de1631e19974ae913be263782d1445d2ca8f4d3e0a95a19348609235370d7591d392d7642fc9a0feb60863c81bfda34cd SHA512 3643ccec1c9efecb3770b8b666eec95ff780c9b3b9f6f4b937d50657d28b350823683c1e8464792510cad6195f67e0643cedea1cb15440fda982057d2dc4f519
+EBUILD git-lfs-3.2.0.ebuild 1609 BLAKE2B 1508a506b26a5e45eea308efa27eb59314c84a5b8d37264e12b340d5a3878815889b93b24f8e351ffb5437ec078c796dfb8f43f480203b1f19c65d038d086421 SHA512 e1abcc127295be2f626ebf0e127431d9b552337211e30123bc127f4e19f6f5d024e73618e853f1dddf55046f882d626b5f88ca97992f5cbd4ce9c94d61d86b66
 EBUILD git-lfs-9999.ebuild 1596 BLAKE2B aad901b9de9744c4bd1afed9777485adaebe92244c3c92f8072782470f6697ad8ee09ee7a952130363837169a0cc47c4cd9971d03442ad5222af8bb4087176e8 SHA512 94f1d214d9f9d5aeb7037c091318fbe6820a350f6107cb6d62527bf56b2c307164ab322218da2470d1f7089101aeaae1226e454f45dfbf55607598f7b02d6529
 MISC metadata.xml 477 BLAKE2B f26242dee1117690332342dbd12f3739eeff572ff6e64ffb979a18c6fe7fca5e305beb08c9aab02ceb4c9dd1cbab6401a3a31d326f5d25d1ee30fb62fd711673 SHA512 9ae6594f42265b3f33cb977eaceab2a5fbb45f3e6a7c64c7cd4cfb88b8d56da0cc6f9d7564beda45969bb525f537e7a3e7d3b764456f3210c3e4c16e9d7545bb
diff --git a/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild b/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild
index 902cc0ce27e5..f1b4691ef003 100644
--- a/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index 64bdef3f0a8b..59281f6b338d 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,3 +1,5 @@
 DIST python-gitlab-3.12.0.tar.gz 264005 BLAKE2B 64215b0c2950b1d238ff0e69e88de463ce2645d7c3911963e516b50874b49c4e822f8e27625fa33e6d27a703cc3bb3377151a9bc9c49b0b49ee7bc57db5dfd65 SHA512 76f55945a821553b4b477629dea674956459836df227e70817480b031559317ec97fef6c332d0dc42c4dba0d556ed1118e1cded8f116f4813bebe411db9e7a47
+DIST python-gitlab-3.13.0.tar.gz 270646 BLAKE2B ff7e3c35525ac1bf1cb6dc6e668ca9c8aeefb12073636f115c8e078aa4b9f623f6d847d8487e85e9a325b6f0ad1ef93826631cb32fd86c0bd9023688aac5add9 SHA512 373347392d7030c817a8dcb4cceea71d0609f9e09dce348514c1ca024307094b1a72e287c871ce5fcba9b9d4cdfcc7dc6b4495e2b225b845a3dff2e2dfc4fe82
 EBUILD python-gitlab-3.12.0.ebuild 1015 BLAKE2B 75fe0a911ab5d29347dbbe810ce4edaaab291b1cf99c04ab34e497ee6e220e53c162128ab2695244f2f270b954a856093ab8972de33e7a43a98406ca887633e6 SHA512 87b0a40eb9b2b8e0322d7ffbb90362786ea5a7ffce603c84221d863d64f02f4cfb83753d1b634752d27a08cab13a15229d926604b6a4d4868c86a6d002e18764
+EBUILD python-gitlab-3.13.0.ebuild 1015 BLAKE2B bb0888cfcb311f454d6b13692aadd4d6fc287e67a5bd138a0e7bcecd0c67b91edb72f6608a632365176fa670183f91a8a223ac3bc5f2051eff488b54c4dc3735 SHA512 065ba4145a7e3a2857446e97d722b4bfa3ec2895a5897da674a130aa06b64cf7609cd8f6406908810d0831ea1c647d4a67e57b4e2890744be272f527b5e7496f
 MISC metadata.xml 467 BLAKE2B fe85595edfdf791a5ae099188cdcffbbb80802f62a7ce0f95576f2b217e91e3b835fdf4989a196678c91e66108bc969108fadc1b04ba026273c8bb71dfe52d6b SHA512 8e3332d042520e9ae097575c6b25ca3f1b9b706676fc79f54bfa639be6baabb060e2e0da290008f6ea4cf592e4b538a068abb593f7019b87d4b9aedeedc446eb
diff --git a/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
new file mode 100644
index 000000000000..2fad79ea4fa9
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+BDEPEND="test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND=">=dev-python/requests-2.28.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.10.1[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b585eb0a9d78..3188733f9162 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 918ba1cf27f8..94302ea1b4af 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -93,6 +93,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 				17.0.0_pre20230225)
 					EGIT_COMMIT=b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817
 					;;
+				17.0.0_pre20230304)
+					EGIT_COMMIT=2708869801ae00f4681f6b2d9d69b25b3fce26b6
+					;;
 				*)
 					die "Unknown snapshot: ${PV}"
 					;;
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 2616b88311cf..776ed2d9a1f0 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mercurial.eclass
 # @MAINTAINER:
-# Christoph Junghans <junghans@gentoo.org>
+# No maintainer <maintainer-needed@gentoo.org.
 # @AUTHOR:
 # Next gen author: Krzysztof Pawlik <nelchael@gentoo.org>
 # Original author: Aron Griffis <agriffis@gentoo.org>
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index fe2cb23bd896..c659e2b3847a 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/spout/Manifest b/games-arcade/spout/Manifest
index a9ea1815d706..3311604ca2b8 100644
--- a/games-arcade/spout/Manifest
+++ b/games-arcade/spout/Manifest
@@ -1,5 +1,5 @@
 AUX spout-1.3-Fix-implicit-function-declarations.patch 741 BLAKE2B dd3b409214e90dbfd54ca5d03381bec51b82977a0441a926d6763ef0fbdf6df4651477b2c1bcf610109783aa0c8a0153db36297ab64a0ae6ab4061384e989983 SHA512 74069a48a52e8b11e09ae716b9015739cb5ca317dab5203fbf9a7ce45b884d11e67a1de6b364bde1f57c45f421e44857fff032370104a27df5299177c7c33e94
 AUX spout-1.3-fno-common.patch 279 BLAKE2B 173f83694ef3c55590436ba144efc56a9f1082dce69efaf3d53d3243d485f8fa993af9c9c1b7fc50bb75e44cbf51f6c0018bdc4727390e4a99e1b7b572d726d1 SHA512 cccdc26be30bf00f9539841db74e809edf088dad6130731ba1323975d5926bb3e392ad10dc830f13c9ffc5ce2a4a086e0f00955f5f44a2c234f5846e71f781ce
 DIST spout-unix-1.3.tar.bz2 92144 BLAKE2B 4512a3f47fddfbed7471fe81f8a7fa296f44aa12b3e3b69c0d665a4f95c82508460ab007a798c098ccbea68f1ccc827699f8428203e1217ea7a493e96810771c SHA512 46ed12a617a4084e8a5d1da56799fe7784ed288a254385b109ced6138ce904e658a44af445c1577112a3701a0b108fc886e3d06df41743b0d82b028eb8a846d6
-EBUILD spout-1.3-r2.ebuild 1043 BLAKE2B 8acb985f19e6608a63ae96a79819a68ceec2d4443f3ea62d26d7f0e7012d035f2ce8096343b6bb24cea2bf8ee2d24e252f91892ba3e06e6c67076758556d334e SHA512 356cd10dd989851cf31ec788837bfc029fa45809cf3c66af183e4eed22f5a56b8dd60a777101dfbfca674e9742ed7572a009fd54a41fa9718a93dc65f3b96cf7
+EBUILD spout-1.3-r3.ebuild 1095 BLAKE2B b8971a6fb2ec8fc5e6136e1077f31c29d9d91551f1dbfa5d981a059391d5ee859c6911b155d536cfc9f6c386ffa51ba134a678e578ea13f3211ef7d0bdb1ebb5 SHA512 7adbd14c4b9df87c13dd640c38a56a74f2770c1d0896ca205700ace66fe17208013ec6524c50694238cbc31911a038fa00c00a618d73a06822a3faf534352efd
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-arcade/spout/spout-1.3-r2.ebuild b/games-arcade/spout/spout-1.3-r3.ebuild
index 9ed65f4f461f..9f30a8242b0d 100644
--- a/games-arcade/spout/spout-1.3-r2.ebuild
+++ b/games-arcade/spout/spout-1.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop readme.gentoo-r1
+inherit autotools desktop readme.gentoo-r1
 
 MY_P="spout-unix-${PV}"
 
@@ -25,6 +25,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3-Fix-implicit-function-declarations.patch
 )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_install() {
 	dobin spout
 	einstalldocs
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 5f6aa4084c6d..9242ea760242 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 171cc54e3c1e..6511dd87ba0f 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -3,7 +3,7 @@ AUX ppsspp-disable-ccache-autodetection.patch 753 BLAKE2B aa580bb2c657830bb07961
 DIST ppsspp-1.14.1.tar.xz 46414036 BLAKE2B c0076550aea53a878e199c5767bab005df266436d0dc7acb1dc00537c4709854287202f8c5525871c93b103a59406d03b19481a644f9d5985f83d8703659d457 SHA512 b33e43e14eafeea54d40f4f0d332d4f683b80ef6dace66e6101199e7141829b7858c7f94d5a4696393022c0453fcd7ce77858279a31b2ffba5bfcaa72e675b18
 DIST ppsspp-1.14.2.tar.xz 46414560 BLAKE2B 3b1cc4a1f7824be4fe0e9abaf52df333965a9b2000bb412b71ea8308a75d4f250ff80c8097856720eb6339926e0b73bb725844f6cabeededc0c2475342a003a9 SHA512 767345235faa54c6a0c19c41fead43f67c39d7f84cd3d573523a745cd082166910090789a985873be047ecaf17513ef318362041f5dcc2b068b1ff061d787f79
 DIST ppsspp-1.14.4.tar.xz 46405556 BLAKE2B 6ba958e8bcefffeeb0d05f3c14cf7381737a02deed27c45d564ba4e556af5654e51ffad5c8a8f880ce85b8916db4ed51b8be13c1ca01f7b6d7b28fa266425605 SHA512 144f5af637f747c745a34d28c95d498cfc736777240ad4eb0a08721af2fcb36106cf93a73d49df0fb572ee7ec78b4bc0965c9f4b3845e9457a4d7c967b8389ec
-EBUILD ppsspp-1.14.1-r2.ebuild 1396 BLAKE2B 4072b882c9da55834b1af5a26da56c8b6871ea68caf78288eb196d86986d0ce518f466c99a1f1370195f9ef51ba73ccb73d87066226b2096a603904b2fea3ffc SHA512 9f16493b367d290b5ed3f94755b9d25595ba6666e03db24bf75db3b004f1549dae25908cb52870a455eefc01a7d016699b4998ac3a021ddfc8622367ab31f69f
-EBUILD ppsspp-1.14.2-r1.ebuild 1396 BLAKE2B 4072b882c9da55834b1af5a26da56c8b6871ea68caf78288eb196d86986d0ce518f466c99a1f1370195f9ef51ba73ccb73d87066226b2096a603904b2fea3ffc SHA512 9f16493b367d290b5ed3f94755b9d25595ba6666e03db24bf75db3b004f1549dae25908cb52870a455eefc01a7d016699b4998ac3a021ddfc8622367ab31f69f
-EBUILD ppsspp-1.14.4-r1.ebuild 1396 BLAKE2B 4072b882c9da55834b1af5a26da56c8b6871ea68caf78288eb196d86986d0ce518f466c99a1f1370195f9ef51ba73ccb73d87066226b2096a603904b2fea3ffc SHA512 9f16493b367d290b5ed3f94755b9d25595ba6666e03db24bf75db3b004f1549dae25908cb52870a455eefc01a7d016699b4998ac3a021ddfc8622367ab31f69f
+EBUILD ppsspp-1.14.1-r3.ebuild 1400 BLAKE2B 5acad2270d57e0cba9621ccb88960eb0221ed5daf8cd1c0b6b33aca85db691ea99090aa639110a1bcf34029635feeb8e46020f88e3d96b45cc4ed027130dd618 SHA512 ccbd52acd0b060a1637f4f6a12065251c3b7d3ecc3f2b1f4fc5a5a5dc52485d887367d09ae78c1148a424d95135a66cd20237e3ba8d5f64e63b8628c0ff20e00
+EBUILD ppsspp-1.14.2-r2.ebuild 1400 BLAKE2B 5acad2270d57e0cba9621ccb88960eb0221ed5daf8cd1c0b6b33aca85db691ea99090aa639110a1bcf34029635feeb8e46020f88e3d96b45cc4ed027130dd618 SHA512 ccbd52acd0b060a1637f4f6a12065251c3b7d3ecc3f2b1f4fc5a5a5dc52485d887367d09ae78c1148a424d95135a66cd20237e3ba8d5f64e63b8628c0ff20e00
+EBUILD ppsspp-1.14.4-r2.ebuild 1400 BLAKE2B 5acad2270d57e0cba9621ccb88960eb0221ed5daf8cd1c0b6b33aca85db691ea99090aa639110a1bcf34029635feeb8e46020f88e3d96b45cc4ed027130dd618 SHA512 ccbd52acd0b060a1637f4f6a12065251c3b7d3ecc3f2b1f4fc5a5a5dc52485d887367d09ae78c1148a424d95135a66cd20237e3ba8d5f64e63b8628c0ff20e00
 MISC metadata.xml 526 BLAKE2B 19d0378d36d2b1d81ce404a95d98488b54f4368c72a7397b6d7c9a444edec9c19d146295cfc247a75aca1e1b5d1643161a627b80ea76aa8d43189a5eb14380c2 SHA512 7a8c8a7c05acdc110422d7c38552c8106d1886a672e6bda1212ce9cba737ae5e89e6624010d5bc3149b8da7c061b10295a721c74e7377587ec52ec7be2237855
diff --git a/games-emulation/ppsspp/ppsspp-1.14.4-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.14.1-r3.ebuild
index 53b2b98de0bc..9653b9ec6119 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.4-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.1-r3.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	app-arch/snappy:=
 	app-arch/zstd:=
 	dev-libs/libzip:=
-	dev-util/glslang:0/1
 	media-libs/glew:=
 	media-libs/libpng:=
 	media-libs/libsdl2[joystick]
@@ -52,13 +51,14 @@ pkg_setup() {
 
 src_configure() {
 	local -a mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		-DHEADLESS=false
-		-DUSE_DISCORD=$(usex discord)
 		-DUSE_SYSTEM_FFMPEG=ON
 		-DUSE_SYSTEM_LIBZIP=ON
 		-DUSE_SYSTEM_SNAPPY=ON
 		-DUSE_SYSTEM_ZSTD=ON
+		-DUSE_DISCORD=$(usex discord)
 		-DUSING_QT_UI=$(usex qt5)
 	)
 	cmake_src_configure
diff --git a/games-emulation/ppsspp/ppsspp-1.14.1-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.14.2-r2.ebuild
index 53b2b98de0bc..9653b9ec6119 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.1-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.2-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	app-arch/snappy:=
 	app-arch/zstd:=
 	dev-libs/libzip:=
-	dev-util/glslang:0/1
 	media-libs/glew:=
 	media-libs/libpng:=
 	media-libs/libsdl2[joystick]
@@ -52,13 +51,14 @@ pkg_setup() {
 
 src_configure() {
 	local -a mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		-DHEADLESS=false
-		-DUSE_DISCORD=$(usex discord)
 		-DUSE_SYSTEM_FFMPEG=ON
 		-DUSE_SYSTEM_LIBZIP=ON
 		-DUSE_SYSTEM_SNAPPY=ON
 		-DUSE_SYSTEM_ZSTD=ON
+		-DUSE_DISCORD=$(usex discord)
 		-DUSING_QT_UI=$(usex qt5)
 	)
 	cmake_src_configure
diff --git a/games-emulation/ppsspp/ppsspp-1.14.2-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
index 53b2b98de0bc..9653b9ec6119 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.2-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	app-arch/snappy:=
 	app-arch/zstd:=
 	dev-libs/libzip:=
-	dev-util/glslang:0/1
 	media-libs/glew:=
 	media-libs/libpng:=
 	media-libs/libsdl2[joystick]
@@ -52,13 +51,14 @@ pkg_setup() {
 
 src_configure() {
 	local -a mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		-DHEADLESS=false
-		-DUSE_DISCORD=$(usex discord)
 		-DUSE_SYSTEM_FFMPEG=ON
 		-DUSE_SYSTEM_LIBZIP=ON
 		-DUSE_SYSTEM_SNAPPY=ON
 		-DUSE_SYSTEM_ZSTD=ON
+		-DUSE_DISCORD=$(usex discord)
 		-DUSING_QT_UI=$(usex qt5)
 	)
 	cmake_src_configure
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 4abcd9411790..6dfcc570303a 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index 7f51b69e4a8b..c127cf9afe84 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,3 +1,3 @@
 DIST freesweep-1.0.2.tar.gz 93986 BLAKE2B 306c0e87448534c23c7754f9bedbaf9d72ee705bfdb3cc08a004076bd56a117f4bbb19f4676282edccc57286b5135d6714d6ad2e94a903235c8f4bb9a305ad77 SHA512 1695bb29efbaed5e6baf5faadcbd685e8e6b4ccb5d52567a833b5f5eeb69200fc220579fea7d6907bffc92a06e9b220bca494e8597394820a421f81f0af1d3aa
-EBUILD freesweep-1.0.2.ebuild 594 BLAKE2B 82eb1012fe39bb870aa1019d9a499740eb69443f3e4f62e1bd2c3cf963ea2e6f9d329426e8479b19ee50c6daafb9b069f752a0006c9b05e4c8531904be385543 SHA512 9d337152160815f391343763391d0aaa0a19eb71d3f51b873c75ef6763cfa9756d46add5e2900540efcede45d35eef35cea85e7f90f633a1831c28d03e7ff97c
+EBUILD freesweep-1.0.2-r1.ebuild 732 BLAKE2B 09d2039b1fa4329e8d700b55341d709fbf53da457a792571d563eb4ef3768a63405dd049c0fde73ef56eb7bf2880cb950b9f024a7509c5a9025618d3dca208c0 SHA512 5e8c2384c15aafefd2fe50c0d767a63b97d83dabd925db769294e4c7f858445a69469382a801bce911d1e6e5896e4a4ae168aab69e71749485e9c41dd8bda016
 MISC metadata.xml 338 BLAKE2B a77722d450cf98aefc1863f0ae843136c7d0846947422884bbe565033566bd17fecdbe67fde708c624a3989c2082e9b07797d3ddf87c4ad01c579ba896d970cb SHA512 5cf55926ac66e6476db9ffde0ca7370f11348bd3785913794c2226706e42de3e045a8d33b39f68598f47b4e9f59885751dced131e9389c12a0db16908eb8bf38
diff --git a/games-puzzle/freesweep/freesweep-1.0.2.ebuild b/games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
index abe5e0cb0e2b..b2a002295f08 100644
--- a/games-puzzle/freesweep/freesweep-1.0.2.ebuild
+++ b/games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Console Minesweeper"
 HOMEPAGE="https://github.com/rwestlund/freesweep"
@@ -17,6 +17,14 @@ RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	sed -i -e "s:configure.in:configure.ac:" Makefile.in || die
+	# Clang 16, bug #899002
+	eautoreconf
+}
+
 src_compile() {
 	emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
 }
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index a70d2e41558e..55782453e72a 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,4 +1,5 @@
+AUX xblockout-1.1.6-configure-clang16.patch 465 BLAKE2B 8f1ed90b83dd9ec1d5e558f4a10987dce5eb574607b5d3c13d7d27f100db434f5e1d581cc31fd790342f3beeb8815c8e14772af0a6ac4f9b2d183893bd23c750 SHA512 37b811669fc5cc15fd2434c06180b5908a71ec1ef3523302fde25e50dfc5ca8b7716324055ba8fa53ba122ceccb2c32915968574575e493a3ef50c9f0c0fc285
 AUX xblockout-1.1.6-font.patch 1535 BLAKE2B 5ae0fffb0d04c69123bb0c1098bcbaf2053551530d9f7f6f001ae693d4826148d16f4793009c83b286a7c9df8669e507145e39f2c7aa6bf4638ddc1e97bab15b SHA512 f74245e8d97859fa692c82f69657a77d31e84f249b5d29e23b16f072d596e85a51800f4af4578ba194151a6d0c5b577bad7a40a95d0477f31d2ae8147bec585d
 DIST xbl-1.1.6.tar.gz 136504 BLAKE2B 253c4a950def66abaef3547596b569542ea0dcd180fa5e81a7cb581d9dc23b2038b39c1059ddd36cfc89275ef3fb2a25d174ada71ab1818e408818613559a33e SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0
-EBUILD xblockout-1.1.6-r2.ebuild 1306 BLAKE2B 9ab7a3c65fca5b98d06b8db03e2ab2d957e3253de6a0e916782eb94d808b4e4a778aef4250ee93b3900456fecdf421f872a96fd8fb0d2897d7a663e6e41ba2f9 SHA512 43b4d8c77cfa59d6af9b811b256d931d87adcf9628e1ca01f088cc9fd797e53d173c191f33a06286baab360bbd3792a1ef644ab3cf28dcd1de44de0860f1bf44
+EBUILD xblockout-1.1.6-r3.ebuild 1349 BLAKE2B b6008030de4f480e08f227bc21b06193454a601b6ce3c8ddd1cad6aa2e9798b4d56c148b4328833a0fe122cd9b3b1f5e8643a3551bea283ab4e95ea431d2740f SHA512 041ac373b5b12c3794051a2feeb20ef0b0f674e2879b06858a54193c32acda156b87ece176358489df442825378fc5e65cf9b0c9eaab2fa8850b206756703b2f
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-configure-clang16.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-configure-clang16.patch
new file mode 100644
index 000000000000..af322fedd337
--- /dev/null
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-configure-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/899012
+--- a/configure.in
++++ b/configure.in
+@@ -127,6 +127,7 @@ dnl AC_TRY_COMPILE("Prototypes",,extern int y(int z);y(5);}y(z)int z;{,CFLA="$CF
+ 
+ AC_TEST_PROGRAM([
+ #include <sys/time.h>
++#include <time.h>
+ int main()
+ {
+ fd_set i,j,k ;
+@@ -151,6 +152,7 @@ AC_TEST_PROGRAM([
+ #include <signal.h>
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <unistd.h>
+ 
+ volatile int c = 0 ;
+ void fct(i) int i ; { c++ ; signal(SIGALRM, fct) ; }
diff --git a/games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r3.ebuild
index 914ab6d1ac1c..f433fd8aaccd 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6-r3.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="X Window block dropping game in 3 Dimension"
 HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
 SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
+S="${WORKDIR}/xbl-${PV}"
 
 LICENSE="GPL-1"
 SLOT="0"
@@ -19,10 +20,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/xbl-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-font.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 src_prepare() {
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
index cb37ef85d737..f9673f20f206 100644
--- a/games-puzzle/xwelltris/Manifest
+++ b/games-puzzle/xwelltris/Manifest
@@ -1,5 +1,7 @@
+AUX xwelltris-1.0.1-c++17.patch 4539 BLAKE2B ee72d6780104be6397646168b67dee6cc22ea70c9d502c83ad7d638a6e5a2068753ddf77c5dc52bf9a22196ae3c14db04e5a2d5c5bcd758ffa5ccbec625ff560 SHA512 2606178327a5d596ae908b4651ec0e1560a34ca7460cb7f77cab4facb53e10008abeb70ac2f33d1878736d19781efdf5df4052e7ccbbcc3d241b2033633602e5
+AUX xwelltris-1.0.1-configure-autoconf-2.72.patch 2509 BLAKE2B a690b29d1d15987bff53eff700ff5892b610bb2b9da7f17b19ce6e5d4b90611a3994ce053566756e7d96fd831f53d8c88aa9485203c103282ac5bc94ddcf6afd SHA512 96fc7aa38eba37420513cb49cccc15f47710ac9741f8ef89acf77705677c1be75adf8151e4ea283d9fffacadb66f5fec9b18a6d08d0b12be43bd1aaf23c18b4a
 AUX xwelltris-1.0.1-gcc-11.patch 317 BLAKE2B d8de25ff359ab2dbf15f953b1689df4f056e4ef4991da1e98935ca1c51d7c46ea3321827702eb0b92c595cfed85c52c156d23c9d700e51f03c681b50f6c25b1e SHA512 3afd9b2f5c6bd684a4392d72a9a482b0bde6ff86a4027cc749aaf452add5d2ff59a242c39d198c0e0625f90d0d14c4b6d319f397b7f7b65742b3320cc8712250
 AUX xwelltris-1.0.1-scorefile-dir.patch 615 BLAKE2B 77dd21fa7650bb2d940422aebf80bd9c82188c577bf7a498e7537b88218dbbfae3be8309588798b03e7590a002a317a8171202b9b0aa411421160d776109a7c1 SHA512 3bc2e6ef0b44ead08103441e9e4e13263b108986461d263a30fc0125b25d687e74e7e49d3610fc2207a370125aaf79c839e41584e97e989b2e6dceb1478a4919
 DIST xwelltris-1.0.1.src.tar.gz 422822 BLAKE2B c6eda0d294e79c5715bcaa593776ecfb0cdc734386fc4e9a6825dd090340c2744a251ad1e753421865151928608e4aebdd5050b0091a0799b7d1da5a0b3bdd60 SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536
-EBUILD xwelltris-1.0.1-r1.ebuild 1513 BLAKE2B d03090d50bb7244ac69e16130ba6969c2effc15c41f58c59e3ffcff1641215b14a98496a733e721ae507b5f14ab4588beed33e079cce0463149253cf01a3a707 SHA512 5174af72f10786b2e072e90c936bd4bcd7838fba0b9e190e10ec95023100f998492b904622055e2313311eb46182c0b0ae7bdc76add0a5a2ca9bf8acd66d4858
+EBUILD xwelltris-1.0.1-r2.ebuild 1693 BLAKE2B a077084f16ac9fb5e15b05aea5a8b1c635a7a72a7aed183b1de87bd64737ca7e17a25af58ba2ae6a60253a7584695238ea8f726c1258badac36fd58cd000e6ed SHA512 eaad67fcd9482f1479fe3c214b9e22c08dda31b1a6d68bd889d264db6b4e2a48f7cf814ad0a6dcc8235de1f978c6ca4415150640da5108cbb4fbafe7251bc0af
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/xwelltris/files/xwelltris-1.0.1-c++17.patch b/games-puzzle/xwelltris/files/xwelltris-1.0.1-c++17.patch
new file mode 100644
index 000000000000..2c62d4752975
--- /dev/null
+++ b/games-puzzle/xwelltris/files/xwelltris-1.0.1-c++17.patch
@@ -0,0 +1,106 @@
+--- a/src/image/convert.cxx
++++ b/src/image/convert.cxx
+@@ -273,9 +273,9 @@ static void slow_fill_histogram (byte* pic24,int numpixels)
+ 
+ static boxptr find_biggest_color_pop (boxptr boxlist, int numboxes)
+ {
+-  register boxptr boxp;
+-  register int i;
+-  register long maxc = 0;
++  boxptr boxp;
++  int i;
++  long maxc = 0;
+   boxptr which = NULL;
+   
+   for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+@@ -290,9 +290,9 @@ static boxptr find_biggest_color_pop (boxptr boxlist, int numboxes)
+ 
+ static boxptr find_biggest_volume (boxptr boxlist, int numboxes)
+ {
+-  register boxptr boxp;
+-  register int i;
+-  register INT32 maxv = 0;
++  boxptr boxp;
++  int i;
++  INT32 maxv = 0;
+   boxptr which = NULL;
+   
+   for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+@@ -407,7 +407,7 @@ static int median_cut (boxptr boxlist, int numboxes, int desired_colors)
+ {
+   int n,lb;
+   int c0,c1,c2,cmax;
+-  register boxptr b1,b2;
++  boxptr b1,b2;
+ 
+   while (numboxes < desired_colors) {
+     /* Select box to split.
+@@ -642,12 +642,12 @@ static void find_best_colors (int minc0,int minc1,int minc2,int numcolors,
+ {
+   int ic0, ic1, ic2;
+   int i, icolor;
+-  register INT32 * bptr;        /* pointer into bestdist[] array */
++  INT32 * bptr;        /* pointer into bestdist[] array */
+   JSAMPLE * cptr;                /* pointer into bestcolor[] array */
+   INT32 dist0, dist1;                /* initial distance values */
+-  register INT32 dist2;                /* current distance in inner loop */
++  INT32 dist2;                /* current distance in inner loop */
+   INT32 xx0, xx1;                /* distance increments */
+-  register INT32 xx2;
++  INT32 xx2;
+   INT32 inc0, inc1, inc2;        /* initial values for increments */
+   /* This array holds the distance to the nearest-so-far color for each cell */
+   INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+@@ -710,8 +710,8 @@ static void fill_inverse_cmap (int c0, int c1, int c2)
+   hist2d * histogram = sl_histogram;
+   int minc0, minc1, minc2;        /* lower left corner of update box */
+   int ic0, ic1, ic2;
+-  register JSAMPLE * cptr;        /* pointer into bestcolor[] array */
+-  register histptr cachep;        /* pointer into main cache array */
++  JSAMPLE * cptr;        /* pointer into bestcolor[] array */
++  histptr cachep;        /* pointer into main cache array */
+   /* This array lists the candidate colormap indexes. */
+   JSAMPLE colorlist[MAXNUMCOLORS];
+   int numcolors;                /* number of candidate colors */
+@@ -749,10 +749,10 @@ static void fill_inverse_cmap (int c0, int c1, int c2)
+ 
+ static void slow_map_pixels (byte *pic24,int width,int height, byte* pic8)
+ {
+-  register LOCFSERROR cur0, cur1, cur2;        /* current error or pixel value */
++  LOCFSERROR cur0, cur1, cur2;        /* current error or pixel value */
+   LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
+   LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
+-  register FSERRPTR errorptr;        /* => fserrors[] at column before current */
++  FSERRPTR errorptr;        /* => fserrors[] at column before current */
+   JSAMPROW inptr;                /* => current input pixel */
+   JSAMPROW outptr;                /* => current output pixel */
+   histptr cachep;
+@@ -814,7 +814,7 @@ static void slow_map_pixels (byte *pic24,int width,int height, byte* pic8)
+       if (*cachep == 0)
+         fill_inverse_cmap(cur0>>C0_SHIFT, cur1>>C1_SHIFT, cur2>>C2_SHIFT);
+       /* Now emit the colormap index for this cell */
+-      { register int pixcode = *cachep - 1;
++      { int pixcode = *cachep - 1;
+         *outptr = (JSAMPLE) pixcode;
+         /* Compute representation error for this pixel */
+         cur0 -= (int) colormap0[pixcode];
+@@ -825,7 +825,7 @@ static void slow_map_pixels (byte *pic24,int width,int height, byte* pic8)
+        * Add these into the running sums, and simultaneously shift the
+        * next-line error sums left by 1 column.
+        */
+-      { register LOCFSERROR bnexterr, delta;
++      { LOCFSERROR bnexterr, delta;
+ 
+         bnexterr = cur0;        /* Process component 0 */
+         delta = cur0 * 2;
+--- a/src/image/sublib/IMG_gif.c
++++ b/src/image/sublib/IMG_gif.c
+@@ -406,7 +406,7 @@ LWZReadByte(SDL_RWops *src, int flag, int input_code_size)
+     static int clear_code, end_code;
+     static int table[2][(1 << MAX_LWZ_BITS)];
+     static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
+-    register int i;
++    int i;
+ 
+     if (flag) {
+ 	set_code_size = input_code_size;
diff --git a/games-puzzle/xwelltris/files/xwelltris-1.0.1-configure-autoconf-2.72.patch b/games-puzzle/xwelltris/files/xwelltris-1.0.1-configure-autoconf-2.72.patch
new file mode 100644
index 000000000000..bfcfd9ddd3c3
--- /dev/null
+++ b/games-puzzle/xwelltris/files/xwelltris-1.0.1-configure-autoconf-2.72.patch
@@ -0,0 +1,106 @@
+Drop incorrectly quoted chunks which aren't relevant for remotely modern
+systems. Breaks with autoconf-2.72/9999.
+--- a/configure.in
++++ b/configure.in
+@@ -48,24 +48,6 @@ dnl On SCO Unix, there are ELF and COFF binaries.  We want elf to
+ dnl provide for dlopen() and friends.  With help from Tamas Laufer!
+ dnl ****************************************************************
+ 
+-case "$ARCH" in
+-    *sco*|*SCO*)
+-        AC_MSG_CHECKING("SCO-Unix.  See if we need -belf")
+-        old_cflags="$CFLAGS"
+-        CFLAGS="$CFLAGS -belf"
+-        AC_TRY_COMPILE(
+-        [
+-        ],
+-        [
+-        ],
+-        CMFLAGS="$CMFLAGS -belf"
+-        AC_MSG_RESULT(yes),
+-        AC_MSG_RESULT(no)
+-        CFLAGS="$old_cflags")
+-        ;;
+-esac
+-
+-
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+@@ -105,23 +87,22 @@ fi
+ 
+ 
+ AC_ARG_WITH(sdl, [  --with-sdl              Turn on SDL support instead of X11],
+-              sdl_support=yes,
+-              sdl_support=no)
++              [sdl_support=yes],
++              [sdl_support=no])
+ 
+-if test "x$sdl_support" = "xyes"; then
++AS_IF([test "x$sdl_support" = "xyes"], [
+     echo "SDL is ENABLED *******************"
+     IFACEOBJS='$(SDLOBJS)'
+     IFACELIBS='`sdl-config --libs` -lSDL_image'
+     IFACEINC='`sdl-config --cflags` -I./sdl'
+-else
++], [
+     echo "X11 is ENABLED *******************"
+     AC_PATH_X
+     AC_PATH_XTRA
+     IFACEOBJS='$(X11OBJS) $(X11IMAGE)'
+     IFACELIBS='$(XLIBS)'
+     IFACEINC='$(XINC) -I./x11'
+-fi
+-
++])
+ 
+ out_lib=${LIBS}
+ 
+@@ -169,47 +150,6 @@ MCOMMON=./src/Make.common
+ AC_SUBST_FILE(MCOMMON)
+ 
+ 
+-dnl Some specific OS stuff
+-
+-case "$ARCH" in
+-  *hppa*|*hpux*)
+-        # do nothing
+-        ;;
+-  *solaris*)
+-        if test "$GCC" = "yes"; then
+-		AC_MSG_CHECKING("whether we need -fpermissive")
+-		old_cflags="$CFLAGS"
+-		CFLAGS="-fpermissive $CFLAGS"
+-		AC_TRY_RUN(
+-		main()
+-		{ exit(0);
+-		},
+-	        if grep 'option `-fpermissive'"'" config.log >/dev/null; then
+-	           AC_MSG_RESULT(no)
+-	           CFLAGS="$old_cflags"
+-	        else
+-	           CFLAGS="$old_cflags -fpermissive"
+-	           AC_MSG_RESULT(yes)
+-	        fi,
+-	        AC_MSG_RESULT(no)
+-	        CFLAGS="$old_cflags",
+-	        AC_MSG_RESULT(no)
+-	        CFLAGS="$old_cflags")
+-        fi
+-        ;;
+-  *aix*)
+-        # do nothing
+-        ;;
+-  *darwin*)
+-        # do nothing
+-	;;
+-  *)
+-        # do nothing
+-        ;;
+-esac
+-
+-
+-
+ AC_CONFIG_HEADER(src/include/config.h)
+ AC_OUTPUT( \
+     src/Make.common \
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1-r2.ebuild
index 6d69ef032900..8f50a97e4b6a 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs prefix
+inherit autotools toolchain-funcs prefix
 
 DESCRIPTION="2.5D tetris like game"
 HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
@@ -26,6 +26,8 @@ PATCHES=(
 	# Look in ${EPREFIX}/var/lib/xwelltris for score file
 	"${FILESDIR}"/${PN}-1.0.1-scorefile-dir.patch
 	"${FILESDIR}"/${PN}-1.0.1-gcc-11.patch
+	"${FILESDIR}"/${PN}-1.0.1-c++17.patch
+	"${FILESDIR}"/${PN}-1.0.1-configure-autoconf-2.72.patch
 )
 
 src_prepare() {
@@ -41,6 +43,9 @@ src_prepare() {
 
 	# Ensure we look in ${EPREFIX}/var/lib/${PN} for score file
 	eprefixify src/commonfuncs.cxx
+
+	# Needed for autotools-2.72 patch + clang 16 (bug #899014)
+	eautoreconf
 }
 
 src_configure() {
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 2380c36cf1f1..3df65747a5da 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 30baf22d4194..de145ff5dbdc 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -25,5 +25,5 @@ EBUILD stone-soup-0.26.1-r2.ebuild 5945 BLAKE2B 3badf2dd4f9a556a6a956aa9aac7f41b
 EBUILD stone-soup-0.27.1-r1.ebuild 5732 BLAKE2B 9ae1528fb47c13dcd52ca5d56c5208f5144acd50ca59568993fd4b6dcb748e36e37539d6ca91001329b1ce011dbf6aa40a997b4d8dcce4e4185e8aa5a0694252 SHA512 4ebd380e1ffbd803bd4011dd6fa45b8a6893b89dd50dff76dc7f2c37a80d4328d153b1f57eed65f0e607d12ec3e61cc5013de01d10716aa5dc38fdf51a49768a
 EBUILD stone-soup-0.28.0-r1.ebuild 6329 BLAKE2B 8aae9585ba9d9ec85d7617d3502618027ff2b2f01ae25d7d7660ad37606c2015f490d25644699fe043b5cd27b77b9477246a6877590670e444b83f4867cad3ac SHA512 efcfb66010b5276644f83776b3eb0d47fb2366972a2d2844ed81bfd80e0b5069ee127bfb7566b7d9dfebaddade6f61871ac2bfbae03afcb1f16963e6f4c6bd62
 EBUILD stone-soup-0.29.1.ebuild 6287 BLAKE2B 17da6360011f74cbba5f98e4e49c14f17130be92243cdc2d34396fb2d99342c0958ede8f0c003633cf85b2ced1c20555a5e13373617c85d36aa372f027df37f2 SHA512 90d1276b112f2f8a8f29ab7de60b6389c6fd7781fce33596f055f38a96be10235dcce04a621c22e50ca5671e7bb4669f1fe04c11de5e1ba402348ea0891ef65c
-EBUILD stone-soup-0.30.0_pre20230129.ebuild 6332 BLAKE2B 60e78f6b1b3e56c6299ab4620f5ad73f633fc28957e732c8e943afe413387c8db6ecb5ba562f161949960107832383034e0c91f771d5db4ff76dc5268dcd8a16 SHA512 72e5cdae4d76c13fd3db68df9c7fa5f428bbaa5952c3d155659971f8950e947e819ae6894a2249009ef6d8aa7a60e769734422ebafe1f428d037989ead97e859
+EBUILD stone-soup-0.30.0_pre20230129.ebuild 6330 BLAKE2B 85786712dea821bc954f5893555f3a5d2b9e6382e5c744e573cfc4fca4250ac1a8e10fa2781af88a144316362154c7d036ff7cf7f5f64fd56dee1af822750c5b SHA512 bdad02e702d05224376ae0d2ea33adf79e8ac2715b486d4f07149bc877c90823361fafe70ef975d525f0146441f4f33175e1515cf141f78c840accdae1204d1c
 MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
index 7d2e05402a44..61ab7b0bd76c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # 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"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="advpng debug ncurses sound test +tiles"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index c042247dde71..8b563fe95e13 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest
index 56c6e181542c..9f6df5c8f3c5 100644
--- a/games-simulation/lincity/Manifest
+++ b/games-simulation/lincity/Manifest
@@ -3,5 +3,5 @@ AUX lincity-1.13.1-build.patch 1476 BLAKE2B 941fca117f259915c0e55fd8febddb5c3b6b
 AUX lincity-1.13.1-gcc-10.patch 1540 BLAKE2B 9eb02f6f5820ddb6fdd0edbd25921f7f2a01595f1c1ac3d70e0683bd3fa625ee5a477e5df5d616eb334648ff01d8379970ecb72d272abadbd4867cac349cb0fa SHA512 433929f62f2dc425304bd34ccfdcbb92cbef17486c3628bb649d0c74e0fb68c5c5ab4219a2eb1028d197769ec02566db221c2e9666cfae84dc49e96f67e8d215
 DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393 SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc
 DIST lincity.png 5377 BLAKE2B 2238140719a8c1b094fbe6d7b52b9224245f2c36f970e04aa3fcaf6090409145f17dad2c2a83f6528e695fd9d26d9c053c45978502b7e44f73cf25719d7ed3aa SHA512 40a8955fdc8397662ef0d084163e7dcad59e278429792bd7096e193a0d04791c2355a0dbd2c1f72a032bbfc71bc4e27e37a3d0d4e82de8e7170bb70205d983a3
-EBUILD lincity-1.13.1-r3.ebuild 1065 BLAKE2B db35b616bfac1b21bfa5140cc77719f846b5e0563e29709386ddda93c685e2060ba5284630973d6e269bbe60c525e75e4ccaf6dea875f81efa55b09c5c676078 SHA512 9d545ff078ffdafdf7a6716ca0909c6ea2d670b89c48d2af94b32c097e7e1639ef928d7e0e40e2986d8bf32a4558973a4a3f93c72655d6055a101955e2f0ae4b
+EBUILD lincity-1.13.1-r4.ebuild 1142 BLAKE2B 2563a372701292a9e6e8857b77d519b0f7eda3ba249378c14598936cb69ce5b601c7a8e62314e491ef8d45d5b884f764c85c5501b931672acb4f913e2ae6b5b3 SHA512 180f8b27869be2c89df002d1a3fb6ea61cf38f7e0ea8c392d522c5adc1674867c3818c43eb297dc5a0c5b53db59f76650e1dc013cf9bbb7e9adc54fad2d1fd1f
 MISC metadata.xml 331 BLAKE2B 593e63be77f20f26d1f8e8b9a4eb77ca71db1f34edba26420edad3f7578f10f41b9deae0f4caeb74767de6afc1948a989a005936ef33f3f46c315823c88730d4 SHA512 ced143eeec08adb0cf97914ca2995271dd2303b715335f5f4e10591fa341c9ddf1889d75abba8cb9dcfc51effaf8f082752d9842844fe5a3c3b81cf23224d745
diff --git a/games-simulation/lincity/lincity-1.13.1-r3.ebuild b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
index c80cf4adcb21..29d3d9a64773 100644
--- a/games-simulation/lincity/lincity-1.13.1-r3.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="City simulation game for X"
 HOMEPAGE="http://lincity.sourceforge.net/"
@@ -30,6 +30,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-Fix-prototypes-and-implicit-function-declarations.patch
 )
 
+src_prepare() {
+	default
+
+	# Clang 16, bug #899020
+	eautoreconf
+}
+
 src_configure() {
 	local econfargs=(
 		--with-gzip
diff --git a/games-simulation/senken/Manifest b/games-simulation/senken/Manifest
index fba7775cc947..469d5760ac89 100644
--- a/games-simulation/senken/Manifest
+++ b/games-simulation/senken/Manifest
@@ -1,5 +1,6 @@
 AUX senken-0.3.0-as-needed.patch 947 BLAKE2B 0de09e827bf94bd9a4e2f289a3a685dfcbfa8860e9f2d3f343fb29ff4e345984b88f7c731add1f58a9a179061cee1e93ec3a4ec718e8c3f0dd80a4a4730e79c9 SHA512 6f1f5ae454b9f186624a2ac9d3d5d802c973fadcedf236d83b47020302645c197683ee8765c9b3536866d5281fd37ce94ebdafebde5b5653c1a2188a81fd6a44
+AUX senken-0.3.0-implicit-function-decl.patch 809 BLAKE2B 1f56ca0c90e329c0c54908b7a2f9ccd5cd3585bd46ed246fdfcd20e9ac1e64200703b91c518f99d2f34ded79f2d86eebb8da182ee73db0fe9916d53bb878087b SHA512 f61a5bb885ea93db74b4c5e1285fcf0aea21e68c5a616237cb58ceee5f57beb5d62f97d3c3ff06d777ff4552b0c9377cf32f943877dc5d36feea8708e282006d
 AUX senken-0.3.0-warnings.patch 1099 BLAKE2B 845bca95ba6ef003a751a096e3895386efe7920ac707249c229cfdd5593dd23c44adb96f985890a353233c7fd38f5f705b21a1e31b53b3dc6ae21523a01b2adf SHA512 5e48805adcec08e8deab671df7bf5a8303c29d8d2679bf9ce6608674d225e5acafc3f0f66b07c0362f9da735263773259db8f77dfe7028f268dbe13ce67e6b10
 DIST senken-0.3.0.tar.gz 1391010 BLAKE2B ac55f61c6a1c86ca3a891190f562e91aaed56f19f08dffe2a17016dd8ef5e35a3e1c6188b402506d063c4ee812a43f63bfd45b58e102c4a1199a733ab336a8dc SHA512 df0c15cabf667fb7b56db40baf03fcae6695aa9ec0e42a7db682ff20877a5b89ee67e7799e762b4a78cf0f3fdee7f001419091f0683df74ba1bbe6b9501f0272
-EBUILD senken-0.3.0-r1.ebuild 1042 BLAKE2B 7ecaf1e570aafe0330125f839c32cea6e19a101b36a6154394850d113aa402dbffbe4eba54a3248da82de8d6a53a36132175bcb736a038edf6cae7052310404b SHA512 787ba69b0fd4fae23977c2b2668c1bd07a2536dca0d4fa53926e8f4a8f052bb6ee9902cdea117c9befbbff27c8e76096589389af623b38a20515af9b98ef24d0
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+EBUILD senken-0.3.0-r2.ebuild 1213 BLAKE2B ea6a965e73b92b72178e2da5fb7420bce4f04b19bf48903fbf646dc41d99996adb517038104d3bb38f377ed1c44d1560dcea06c3045708200ccb2a98042c0c2c SHA512 db17a525be4d7bcce6e1d648fa8a73fe5754da20011b3495320ee1f0bf235f7131207b9f358f5c81572cdc9c54c4dd714f0532114a33661a0b25e201a083d0ae
+MISC metadata.xml 326 BLAKE2B ccc701ef796e6e50f0c8fffd0a28d9c651d11b81d18b16360b51e2777cb3ad4fc79a4193913cf46ebfb9cf10001972ef45c09916d2bb503bc721bf096c05a17f SHA512 69b3861fe88897ca4332c8212472ad9c0df93aaba22fd77bf41776f6f830d0813b98eb822f5335c3b79752db4965b257e40f048b87814a52a2e40e75e6133093
diff --git a/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch b/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
new file mode 100644
index 000000000000..f4792cfb0649
--- /dev/null
+++ b/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
@@ -0,0 +1,29 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -47,6 +47,7 @@
+ #include "client.h"
+ #include "landvalue.h"
+ #include "gtkhelp_reports.h"
++#include "support.h"
+ 
+ #include "sdlwin.h"
+ #include "utils.h"
+--- a/src/gtkhelp_reports.c
++++ b/src/gtkhelp_reports.c
+@@ -5,6 +5,7 @@
+ #include "player.h"
+ #include "client.h"
+ #include "gtkhelp_reports.h"
++#include "support.h"
+ 
+ /**** HELPERS ****/
+ 
+--- a/src/gtkhelp_reports.h
++++ b/src/gtkhelp_reports.h
+@@ -17,4 +17,6 @@ extern void update_population_report(GtkWidget *window, client_t *client);
+ extern void setup_info_treeview(GtkWidget *window);
+ extern void update_info_report(GtkWidget *window, client_t *client, int mapx, int mapy);
+ 
++extern void update_info_window(GtkWidget *window, client_t *client, int mapx, int mapy);
++
+ #endif /* GTKHELP_REPORTS */
diff --git a/games-simulation/senken/metadata.xml b/games-simulation/senken/metadata.xml
index 1c3ba213c494..36d202f38fa2 100644
--- a/games-simulation/senken/metadata.xml
+++ b/games-simulation/senken/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+<remote-id type="savannah-nongnu">senken</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-simulation/senken/senken-0.3.0-r1.ebuild b/games-simulation/senken/senken-0.3.0-r2.ebuild
index 206d6b75324d..a9c9fdf39deb 100644
--- a/games-simulation/senken/senken-0.3.0-r1.ebuild
+++ b/games-simulation/senken/senken-0.3.0-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="city simulation game"
+inherit autotools
+
+DESCRIPTION="City simulation game"
 HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
@@ -16,13 +18,17 @@ RDEPEND="
 	>=media-libs/libsdl-1.2.4
 	media-libs/sdl-image
 	x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-as-needed.patch
 	"${FILESDIR}"/${P}-warnings.patch
+	"${FILESDIR}"/${P}-implicit-function-decl.patch
 )
 
 src_prepare() {
@@ -31,7 +37,12 @@ src_prepare() {
 	sed -i \
 		-e "s:/usr/local/share:/usr/share:" \
 		lib/utils.h || die
+
+	# Clang 16, bug #899022
+	sed -i -e "s:configure.in:configure.ac:" Makefile.in || die
+	eautoconf
 }
+
 src_configure() {
 	econf $(use_enable nls)
 }
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index bf50f7640355..64b7914ad676 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/etswitch/Manifest b/games-util/etswitch/Manifest
index ba98cf7a68d1..7e5c53e649ae 100644
--- a/games-util/etswitch/Manifest
+++ b/games-util/etswitch/Manifest
@@ -2,5 +2,5 @@ AUX etswitch-0.1.14-desktop-entry.patch 464 BLAKE2B 5058044958c26fdb6c062f3ea6d2
 AUX etswitch-0.1.14-fno-common.patch 462 BLAKE2B db3d0f548546b4e6ac629b487285fc3ffd537f788b16adb5c38335b0bb6ab660217a97d3aaa0bfa52940b9b6841f868f3f2af6500b8c397773fe16752e721934 SHA512 3f14256c4dc884192868bc7ae4ff386eaacbbf9c4ebf8554a0f4eecd79602bdb59548d1f3b37a39bbc8be3bf0e083614a2793f9836c0feedf993ce717d528a46
 AUX etswitch-0.1.14-glibc.patch 628 BLAKE2B e6a7228a90417cda917cd4218496643e6bb2fa6b41886b48cdbb17758591d6a5742f6f427ccb6dd75d78403d1d394bb5324fd63848260e35808ba5d232a4e2b9 SHA512 27249584033beb4cf81b37e387a814a7b213d4108f530bc21494196916fe395c15767e384c62257dd3abb1d04eb104c0863b7e2d80cfae4927912a836b181019
 DIST etswitch-0.1.14.tar.gz 165811 BLAKE2B 3d52b9dbddec9ddba914cf8e3ecb5013b2b7eac0b9a655d1be60c01cb77639d8ca2906140fc3ecd097005aaef5b11bf4ddd2ac88a5d2e0ba26aac9f2f1593248 SHA512 15447e728b8c6783e663bb76dd64a03b57ecfea6845991f4deca73ee5c5b8c2f87e92d842a46948e48468898eb036f17cbaf365887ea30c1b724db9133f9620c
-EBUILD etswitch-0.1.14-r1.ebuild 574 BLAKE2B 9d39e81d2f70388dc1f8f161e5ad243c02270d32b0c793ef1051766b9c5b1b93bdb48c64f1ea2ea360ea9c3c78b6d65c0fbaf0e6eefae75ee53b60f15aedfb5a SHA512 397752da0821dcd25ec6c286f6cc055ad5f477fbc8e8c41407bc80994721d0b7a2d6b515538a1bdd9634431c29fd39cc0ea76ee3c291615e528ce9e5c7083965
+EBUILD etswitch-0.1.14-r2.ebuild 635 BLAKE2B cf73e25c187e257fff86001b90afd860b9a35a6cec7fd3e03fd0b5cf4929bb375828e0ea98980249fa2d4c9f783c296d1de7872562a54c5d999f7d54f9a686ba SHA512 03a5eda9d44d41f98f0df23247ce3e80a56f88e880c23cc7766c726ca8389f744ea89b70e5d9932f37fabb7f959055b8b6ee0864c4fbd95ce682370ca86d4ed2
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r2.ebuild
index 61b5ce230018..51497a7c6f71 100644
--- a/games-util/etswitch/etswitch-0.1.14-r1.ebuild
+++ b/games-util/etswitch/etswitch-0.1.14-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="*nix minimizer for a few games"
 HOMEPAGE="http://hem.bredband.net/b400150/"
@@ -25,3 +27,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-glibc.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/games-util/gamepick/Manifest b/games-util/gamepick/Manifest
index 79341cc7fa6e..78c07bdad6e1 100644
--- a/games-util/gamepick/Manifest
+++ b/games-util/gamepick/Manifest
@@ -1,3 +1,3 @@
 DIST gamepick-0.35.tar.gz 156725 BLAKE2B e761fead9528397d0819ff00ca0153d63ee7fcc7ecf2d8bd39c3f63e937d13a72be23758a53e415d8020466c3500abc64ae10c09384682f4e8bd2dea3305fdda SHA512 bd77d6584cb9bb5c358179226d20a1995badd7603332bde6692ecca6c30f26fe06e6ea202e04bd40c006e9f43ae8fcd885a09bcb696227be3da823dd68d5053c
-EBUILD gamepick-0.35-r1.ebuild 597 BLAKE2B 8ea9d60a90b12296f5b29a0daf18ddd733df1cea444493c7e7b3a6f60baf275e425c9541fa5a71fcb520cd042afcb5292cae19b1f5315c7e732afa0a5957ddfb SHA512 eebebc15194ca764aa1a7a7b820652c900bad5e9f778e710a6feed02abc2d87dbce612e9d275228e21f6285c7d7ffd76a60eba7ff076b6c5b2d285754c4bfb5f
+EBUILD gamepick-0.35-r2.ebuild 647 BLAKE2B 3ed41c18cc1dab03ebbc31c2d5da2001e28d8710fe86e128cf25d00021f014626622b7c89c106d2b86202cda2cb3182ad726b7ebd3bb985ef1674537823f9f26 SHA512 3f1e51f7c39fcf0099f9a2e76570eb8f03ddcb4659154647c5446ecf7a9a30b68573b9699273cb64e81d37f641c82b6c8f2c7279a626215a106487c06990c032
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-util/gamepick/gamepick-0.35-r1.ebuild b/games-util/gamepick/gamepick-0.35-r2.ebuild
index 097f39d276ab..5c150da179cb 100644
--- a/games-util/gamepick/gamepick-0.35-r1.ebuild
+++ b/games-util/gamepick/gamepick-0.35-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="Launch opengl games with custom graphic settings"
 HOMEPAGE="http://www.rillion.net/gamepick/index.html"
@@ -19,9 +19,13 @@ BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's/-O2//' \
 		src/Makefile.in || die
+
+	# Clang 16, bug #898998
+	eautoreconf
 }
 
 src_install() {
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9c67abc19ba3..a268975b3fa8 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 4a4ddb125f00..9552e647c241 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-calculator-43.0.1.tar.xz 1205840 BLAKE2B d3044efb5307505485dd55c3401d0c21cc379bcfc6fdd4f0285d093c05e76f9c167c5bd65bdf899c7f3aed892258b65538020a70e690eeb459147e6bea15a94b SHA512 94ec47a03dac017801e9c499aceb2f5f6fd1c79966657c79b123476dc7f3a4a2c3e179c80763e965207b58427157cd6e072260bd79ab98a39eb011cfe3ef7c72
-EBUILD gnome-calculator-43.0.1.ebuild 1534 BLAKE2B d707ce5beebe31b067a40a0895c5277a4836ff05b707fe96b7668996f094139b1710df8b745a0a94b456d512843dff82f22882d06fb7aaf0e37fdffead3bfd41 SHA512 d1d606416b6f099f71925c97a7e2f8748ec95953d3123307a4933e7f993cde039e4ad764646f3a1e4ae5756117936a99adc21c2c7ebd940b1e3ad5bb684e897c
+EBUILD gnome-calculator-43.0.1.ebuild 1587 BLAKE2B 7f7fef9008bf8b093a7ff77e1b6ba807f822c06718d12e4049e9259a904e20572992d097591b0577beb851e03590d7812c105d661ad63c18be0fd3b6fdd2b594 SHA512 7fd66b50481a89b48945300c89ad02f50f463e6d174eee1fb61504051681a6dc2ca2d18a74ff49265536aa83c4cd1d0065cac85ab25d3d740a222e414d9d6694
 MISC metadata.xml 553 BLAKE2B adbc4947ab50307c4bf5fca7e9b6cf2db5394b9e3a335d2de56a0678af3f1674d0641835179d2ffad62050292e02874add35125918f922b66fddb64c7e949941 SHA512 960975bcb5b0bdecc83cd80eb8d0d70845a1080a9c2490aa674cf775a44925b9196953a20c88a4197feaf8e8107f98acb6843164292cafb92bde5d1de18242ee
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild
index a16edfb257c2..4e1076f78454 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild
@@ -59,7 +59,7 @@ src_configure() {
 }
 
 src_test() {
-	virtx meson_src_test
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
 }
 
 pkg_postinst() {
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 0efbab9482ee..e460c0db0f81 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 4288125023f7..7007194bafe1 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,5 @@
+DIST gtk-4.10.0.tar.xz 20471568 BLAKE2B 8fed349e7854a7845232da556b2949bc4eaf5d3aaface86c6e2c3a505aefeb754e3147c7a10f82e0fee713418bc8d78186942e98d59a42ed7288d48d88e52f28 SHA512 1283985ed64035e3b183cccc341dd38029112e8277065f8b39be56b4f489aaf03efc0ce5f9c36ddd746a776be3772f7606f1c54fd84292479d63d86b94281159
 DIST gtk-4.8.3.tar.xz 20297060 BLAKE2B ad0f9e2998f3748afe4a03317e6d0438bfd9eaf804f202e96724541cce20597b7b6e69d5c50ce319450feed4f4a5653c0d99b949b23ce3a40c46a12da7e2d85f SHA512 56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754
+EBUILD gtk-4.10.0.ebuild 5753 BLAKE2B fca451f2e97bbbacd8350b5bf3811d9e1269f59386941dbd9d902c55803cb2c7cba35be51102cdcc087434a4afed966cddd8e0d8daeecef989681a17e860c136 SHA512 c3dad76cee78f2b612df2d4ff493a00b209ba87e3db7ac7477b017f950ca9dad859f1a4004c4fad0bee58551afa51155e74148d5a1f0ae50e2721124591aa2da
 EBUILD gtk-4.8.3.ebuild 5697 BLAKE2B 7922fe293e49c01fa1d561c46805f3e3d41fa1891ce2d445cacfa85f059416986f3ce12c75736087c0dde47d001b71d5ab110a2d4615b91a4a3d1478e3f653b2 SHA512 9e9a9fc842dc89af1931b8a0c00ed6e6a065d4aa9b9525baa56fdea56747919386092846eb35a299e68d47af0f1f885f20ec16afb13685e6855fcbe7649cf551
-MISC metadata.xml 761 BLAKE2B 9bfb7757b82761ef2285e2d912376112958df4400ed93bdfc4a3f195cada9caf927cbced29820f6db049b8e5b7f2246d9264290ade62ba3bde8975491fd6331b SHA512 6ba84b2e3eeafceb179339561ac5e9fbd94dc34b71da768d9ca909818cf0c9ec5fe04906ed33aa58bc56929323bc41272223faee908052861fd1c6f8bbad95a5
+MISC metadata.xml 849 BLAKE2B 729466a39564aa6c7dfc1768319061645d6b46297d653eb79092fcd4f1319e74e87723d1bca1ca5cde1490d47bb4984abe0407d555a9fb84bd2fdf83f41ad9af SHA512 3f8f67936202a7daa7dd9015bc2569930b70f9944cff7821f7d99376660c873537ab64e1c81189c0ccaab7a48d392da715b456a9dd3937dd7b045b8491cb820e
diff --git a/gui-libs/gtk/gtk-4.10.0.ebuild b/gui-libs/gtk/gtk-4.10.0.ebuild
new file mode 100644
index 000000000000..162cca71d230
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.10.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway cloudproviders colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.72.0:2
+	>=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?]
+	>=x11-libs/pango-1.50.0[introspection?]
+	>=dev-libs/fribidi-1.0.6
+	>=media-libs/harfbuzz-2.6.0:=
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libepoxy-1.4[egl,X(+)?]
+	>=media-libs/graphene-1.10.0[introspection?]
+	app-text/iso-codes
+	x11-misc/shared-mime-info
+
+	cloudproviders? ( net-libs/libcloudproviders )
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? (
+		>=media-libs/gst-plugins-bad-1.12.3:1.0
+		>=media-libs/gst-plugins-base-1.12.3:1.0[opengl]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	vulkan? ( media-libs/vulkan-loader:= )
+	wayland? (
+		>=dev-libs/wayland-1.21.0
+		>=dev-libs/wayland-protocols-1.25
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-core-2.46.0
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.8
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	dev-libs/gobject-introspection-common
+	introspection? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+	dev-python/docutils
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		media-fonts/cantarell
+		wayland? ( dev-libs/weston[headless] )
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
+	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
+	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature ffmpeg media-ffmpeg)
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		-Dprint-cpdb=disabled
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		$(meson_feature cloudproviders)
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+
+		# Documentation and introspection
+		-Dgtk_doc=false # we ship pregenerated API docs from tarball
+		-Dupdate_screenshots=false
+		-Dman-pages=true
+		$(meson_feature introspection)
+
+		# Demos and binaries
+		$(meson_use test build-testsuite)
+		$(meson_use examples build-examples)
+		$(meson_use examples demos)
+		-Dbuild-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
+	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+
+	if use examples ; then
+		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/gtk/metadata.xml b/gui-libs/gtk/metadata.xml
index ba004a3523be..738bf162e983 100644
--- a/gui-libs/gtk/metadata.xml
+++ b/gui-libs/gtk/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="broadway">Enable the GDK Broadway backend.</flag>
+    <flag name="cloudproviders">Enable GtkPlacesSidebar to access cloud services</flag>
     <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag>
     <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
     <flag name="vulkan">Enable support for the Vulkan graphics API</flag>
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index c3ed98b54608..e6955fffa5ee 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,5 +1,7 @@
 DIST libadwaita-1.2.1.tar.xz 2023892 BLAKE2B 1adb99f360cded03450575206d23d9d9a6e50b2e7afc3b58a7ecee2b35b09896ab03a584a8f21fca0ea95109d3dd4df46269428934bf7563b716aaaa117fc85c SHA512 e7de0a5bcd01cbabf5a25fe5b81ba2488b0a33bfaa78e3aa12b64d6373b7ffe958ef7d7b438633edf38dff52d58efbff0365c9d7c191fc895ec7daf62eff1605
 DIST libadwaita-1.2.2.tar.xz 1938256 BLAKE2B 4ef46d1781e73d18edea75f663d29c6b8570e40f3d0d8987626104e3a49d39f0ca348ae215a8d572acf062a6320750df055efbd70a63ef1403d79e6d70e2b5f6 SHA512 65bf576145a4cae199dd927b27c295a72b6615d549186ec216a8aae3337ebd3d2b102eca75133a4211c4d2841e32d4e4d510bce72c3424eee1e2d4603b5642e1
+DIST libadwaita-1.2.3.tar.xz 2950664 BLAKE2B 8c76554d603992e99240782a2b52245d5f2149d4eca01a79828bf321545bd249d7742246372d09d7351584b48762f1ba3eac8aa3a391ce658f0025a2ebb1cbce SHA512 dd8eb41df7f8b0f71c711c6d1f350b147e52e37f8d0e5df2a7264c6bdff43b8b0a787c243432039ca1c991f22b109229515c4bc8a10a29ff4c93f1b53813c8ad
 EBUILD libadwaita-1.2.1.ebuild 1487 BLAKE2B dab9b1cec346f1b20f34ed1347479a58f9142cdbe534c1f2e32ef38d35d92c2760bc38816bb93597481096016410adbc1f7e40733c08a1721b191da36b09f596 SHA512 414540cd74d85c9163636932801cf5d229c0feccb8544ae0e684cfadb432a4036411252a19114160aececf66c4a4534dd6f85b571750d8642c6462dc6ad7fea5
 EBUILD libadwaita-1.2.2.ebuild 1492 BLAKE2B f8666af672936a976cf4233669b7654ea48b6f1472f5237400a5e8b032b1a2b0b9aa75e5fc13c662c2c6c640edd6ba5bf23d4c97a4fb2df23dbd282f53ae8da7 SHA512 6b5a64d0348d01bc91292be4d9adb7e0c424c9d51d9f540aa2132a3f7eef564b09a25a46ce0153f6434f668989c2946cbb1f7fd175902d1d3a42b4fdcf9b11d7
+EBUILD libadwaita-1.2.3.ebuild 1492 BLAKE2B f8666af672936a976cf4233669b7654ea48b6f1472f5237400a5e8b032b1a2b0b9aa75e5fc13c662c2c6c640edd6ba5bf23d4c97a4fb2df23dbd282f53ae8da7 SHA512 6b5a64d0348d01bc91292be4d9adb7e0c424c9d51d9f540aa2132a3f7eef564b09a25a46ce0153f6434f668989c2946cbb1f7fd175902d1d3a42b4fdcf9b11d7
 MISC metadata.xml 351 BLAKE2B ae57c9eb56cb12bf754b28c2e6620c09ad7ccc79396fd0476e99e52b93bf6d3900fc84ab55fdf11d98e59ed9e247cabf6f301d45bc5e4c453c0fcffc49b144cb SHA512 dc1333518d24d60f69a180ee7369c4b783f234bda36cd65ec66d483db86f3123eca5ed10cd8aadc7a183b707d698a159d7917f7ebd1c342c212f15e90cb8d5df
diff --git a/gui-libs/libadwaita/libadwaita-1.2.3.ebuild b/gui-libs/libadwaita/libadwaita-1.2.3.ebuild
new file mode 100644
index 000000000000..11c36e9c0796
--- /dev/null
+++ b/gui-libs/libadwaita/libadwaita-1.2.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome.org meson python-any-r1 vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME applications"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+IUSE="+introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.5.0:4[introspection?]
+	dev-libs/fribidi
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/appstream-glib )"
+BDEPEND="
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+	>=dev-util/meson-0.59.0
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dprofiling=false
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_use test tests)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test --timeout-multiplier 2
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install libadwaita API docs unconditionally, but this is intentional
+	doins -r "${S}"/doc/libadwaita-1
+}
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 463dc13ea2cd..6da982126896 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,5 +1,7 @@
 DIST libhandy-1.8.0.tar.xz 1796032 BLAKE2B 15929cfde5e01b25e0ccc4dfa94bb0d12272b02a5c5196fcb3a85a898bf8384faa4101114e14f44d53f326fa5321254bba85e3c7f41e426ebd116e2d3dfd96ca SHA512 88f37d310ddc26a26612648d9f7beff6e77347a2cf59f682690dc838c3ec1bad9408ed39571c6cd779bea3d334a9c275ba3789d45c11c0a3e454617d41cc0035
 DIST libhandy-1.8.1.tar.xz 1801348 BLAKE2B 48d9f37f333bbebacd265a802c8fad6aa4c5a2c5ffaa879ee61fd02c92e10b9c60bd01f6bff0afe4573b6e8e3b16fc4633b25c98e5c7e0adb787161ee1aeee88 SHA512 ffcc8dfc0687e3410d1c1b10b56a974925688eee4a971baffc9adafc3585e5e3f4e91b04c6ab1aea99b1d582982a28bdc13c07cdf2af523e1af0d724229b4999
+DIST libhandy-1.8.2.tar.xz 1778096 BLAKE2B 83b8316b22e7bd37436d5fdad0bd270dd5d64862bca97d358b0c2a1c6b7b0e18e0f472ce453719dfde982a427fd7c0c523b042d7721415602d3e7b9c57399509 SHA512 ec48c66a95b1e9158d3e072e1cfab6d538a9235966c790f1e4d4f2ec40a251c8818f505d031285a53ce855da92b7919d3a26aca4160d93241925da1e8cf4b748
 EBUILD libhandy-1.8.0.ebuild 1310 BLAKE2B 49bf62afa3ef7679b9cfa9a60b5254e1d07a24ad6cbec63f8e9dfb398f2782d530bf32c0b2ddb1d8cece613c2547ec22ebd8785fd140c4e08cbe06413aa09c9e SHA512 6a9720e795763215c4e3157049fdc53c1e5e3ef6df24f4da1e175a4e6d4fad8f563dcac41b9e11d1819604161c8cde7c3faf917d697a6585eaa5f0aaf196cea5
 EBUILD libhandy-1.8.1.ebuild 1336 BLAKE2B 4e928c5ce7317fdd2a90b14b526d1058b4e36e50366612099b03cade06ecdcb809d897807dbf20b8df4fddd6e5676a73acb7aa59280e7e095c7bb4bc2b445e23 SHA512 0742808cb9fe658db92c262702db606ba711e8fd84e2fea7aa412e47dd0dd13b650ebb2512fea9cef502db672cfc887c01f805469552dfe79dbf041f659a3e3e
+EBUILD libhandy-1.8.2.ebuild 1336 BLAKE2B 4e928c5ce7317fdd2a90b14b526d1058b4e36e50366612099b03cade06ecdcb809d897807dbf20b8df4fddd6e5676a73acb7aa59280e7e095c7bb4bc2b445e23 SHA512 0742808cb9fe658db92c262702db606ba711e8fd84e2fea7aa412e47dd0dd13b650ebb2512fea9cef502db672cfc887c01f805469552dfe79dbf041f659a3e3e
 MISC metadata.xml 453 BLAKE2B 3b7a719256d86a2cb3411691777d24bb9638760fc17312e299b9895c8a75e088a438db4a16cd81846564b655ea27bdd1f27b3220571b71a264e5171f22ebdac7 SHA512 8d2ffbe79d880deef5f132e3a10ecfa4a044553a075a63904b4938b15bb47104d2ea731bdc5472bfcb816c4fcca83453b81ec1b3dff29f3ce0968a79d22c5106
diff --git a/gui-libs/libhandy/libhandy-1.8.2.ebuild b/gui-libs/libhandy/libhandy-1.8.2.ebuild
new file mode 100644
index 000000000000..1a9f78259e46
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.24.1:3[introspection?]
+	glade? ( dev-util/glade:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index dd866e9b0a56..dc424f52a121 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,5 @@
 DIST wpebackend-fdo-1.14.0.tar.xz 43068 BLAKE2B e5b06e7313a0122578fd668cb17a0f28e8f67ba4831b80616979ebedf15ee4fde94f610b5c7e4831ce90c51e11573ff8fc8f4970237230f5d3184b8aead21ce6 SHA512 9eda873adda854e1e498236215b7e240076caca52adca4f60277fb26db8ae9e6436b27a9b25ebf95612835acad82b764ccd21d8ae997e8802665dd79251083d6
+DIST wpebackend-fdo-1.14.1.tar.xz 43188 BLAKE2B e4e2ae5da7ca93847644e5f6cbb97251f394ab6237b59868e727e89ea57f8676c8319a7a944a4b5080161187d6b5c6937af3913976f215ceb99b42b5fe86c5c0 SHA512 711ffa968852818f080dbb2b222168b61d0d20584b6022e309be7f1a06128440c91d30e61673a30f89831aba4b30dbc0cdae560b3d5f6c8ac462b5445a4c9e8b
 EBUILD wpebackend-fdo-1.14.0.ebuild 667 BLAKE2B 6ffcfbb980921cc47cdda79aa761113ed744738f8f753abaf232d3505b8ab51d028b20a51e6abc114f4bc84447ef6ca9a87ec1441c815d5069588327f71f9e39 SHA512 3817365bb335d63365aba4ef2b7464b70783a53d5b0d341af3ff2df8604922dda845389af4e37cd9ceda101ffb2e353f01ffe25cc345c5b7b29977205170f72d
+EBUILD wpebackend-fdo-1.14.1.ebuild 673 BLAKE2B 83c96677335dcc62778414b3036e66a8feb2a0f77a89e5932214d6943bd0321017593db46fc0955e7648e3cd7ffcf28d2fb6b03789458f70cb7e6cf5e26ece71 SHA512 298b5fd72f5e13e61810ca6f2b589d68cf9252f6829682f4ce945fe8cb06ec19a24181b35a14101d2e8c123dffcefbb9c91fbd65b8717c471d6d902b48eaac06
 MISC metadata.xml 350 BLAKE2B df50880a0744703272cd3aecfb9dae45d62e4233a0c5b3e1fdc06b1d05f814bd57c8b1a4b20cd88a97bc2c22a22bd84befd15c9c3ab094aeeae97346d8713ed0 SHA512 a1bdbe1182fd4545bd83a55d589dd17dce2b306510763f2305e7e43dba6c28c7c5cb85628ccc7eb3ce763b694f0b1b172b19d5aa72ad4c686e600d6ba4ebe765
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild
new file mode 100644
index 000000000000..a831404745c4
--- /dev/null
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.14.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="WPE backend designed for Linux desktop systems"
+HOMEPAGE="https://wpewebkit.org/"
+SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="1.0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libepoxy[egl]
+	dev-libs/glib:2
+	>=dev-libs/wayland-1.10
+	>=gui-libs/libwpe-1.6:1.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dbuild_docs=false # hotdoc not packaged
+	)
+
+	meson_src_configure
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1b8adfb26cf5..f6b750eb1b81 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index 581d043e46aa..e5e8144d4ecb 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1,5 +1,7 @@
 AUX plasma-pass-1.2.0-fix-loggingcategories-dir.patch 1033 BLAKE2B c306aa4a3ffd73520a3979d8b73ae91065da21f60467d839bd1ac617bb074529337bbcf306c786a1aad3644cfd747d1a1f789be352cad73e98d42741ee71f9e1 SHA512 ee13f4f3e81fba1ea7be84f197ccfef7105c2d360f39d888ff2ab903109d3b5c728554fa596816efdd07f83ec7e3fb57ba3ccb798bf827453643f7f91aafc321
 AUX plasma-pass-1.2.0-no-werror.patch 1002 BLAKE2B fa3e277368aca8eb55d26aa1cc05fdd4929e856a7c29188570ade8e07e56b5086aacea3eaf031049560c8971a4840ab7f7f5f3d267dcd26ecbe47055e21d3889 SHA512 aa9bb752b20068fa8c56a650181d78bd718e2ef9b8e9fd04409335e1cfc06db14df7587246e2b47e0b701dd98729fc14b0134a2aa7f75e1dd4b2a800cc9e7550
 DIST plasma-pass-1.2.0.tar.xz 34324 BLAKE2B a6fce04ca5b29066f026e01bb62a2ba4f312795bc4e0676fad82e7a7612ac29386b34047b74cda68ee1cef1fe08cb28ccda6c214565f18573594c281a3dd8658 SHA512 4ac72af97a8026022459c46eb3d8dec1489dedf0ea47ab8c71a5ab92a9c5e2faca92ef2ed512e5cd0cc181a6aa7b6ab802ae98ce525e97818704e0bf58e4603a
+DIST plasma-pass-1.2.1.tar.xz 41608 BLAKE2B eb7f73be34bf014f6947029976a2922548ee307356da3f42bbb96ff6b14db91be98df2d0656a4bdc04b5d03d899f6eec06f4de5450f6d9f528a150c88530f670 SHA512 eff989e045ece776a5f2696c09381ecd8f49ba83cf7de89840ab1cad89bd15e33b9b331d9c91d16956a3d5b8e5f67f52a1aa176abf1d8023b57c18573c8ce5f9
 EBUILD plasma-pass-1.2.0-r1.ebuild 1052 BLAKE2B ca7e1026bb36de1f793f550f98ac9755426150ca0d91120533d68c1f59306b963b56634344c401a7ae749dab7328e4e13d2cc4e1e390b537ceee7b2d895a7b14 SHA512 da56ffb2aff1b59c1ddca6aec104f30ed2f16fdcbd37e3352ace4ec91aff69d8c94129af75eebf5e80bb2d060a13040e2c96d715bc7bf2c68bf7eeeff43b350c
+EBUILD plasma-pass-1.2.1.ebuild 951 BLAKE2B 9c9b5f327fb4d84c63cd639b6a602669fbb158411da6710db9a70cca771d4017581bb799f2a215b6c6811ce41c634429be1fcbb708ca61df9db338ffdc9e519a SHA512 09e6087be9b7079befe0686c6634da6d4e551594bc55d9c40a96a99f1529acc76db44f41e5d8ec6ccaa61c2e0354377568aa4ac6b3ab85f7750e63522c0b4894
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild
new file mode 100644
index 000000000000..06f4c7189511
--- /dev/null
+++ b/kde-misc/plasma-pass/plasma-pass-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.102.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet to access password from pass"
+HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass"
+
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+	app-crypt/gpgme:=[cxx,qt5]
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	sys-auth/oath-toolkit
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 59c719bea947..bd388c589f99 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/sil-abyssinica/Manifest b/media-fonts/sil-abyssinica/Manifest
index af5524173e7b..705d9667c19f 100644
--- a/media-fonts/sil-abyssinica/Manifest
+++ b/media-fonts/sil-abyssinica/Manifest
@@ -2,6 +2,6 @@ DIST AbyssinicaSIL-1.500.zip 1852827 BLAKE2B 59b29242f39fba70b60ca23363e82d09335
 DIST AbyssinicaSIL-2.100.zip 1087315 BLAKE2B 2171c552f6e3b8b8bd6dc1ce07d00f72f6d9b7b18d85d1dcb9ca38540eb206c11b23eeed7e7f542592c531e4dfee4ac1b6886e49916f90ec78f7b86b5fda75de SHA512 cd3fe03426542adc2e6df905bbe22356be5d627a7333697d2927c19f00ee684ae744379e2eea584c905ae07df4b12164c2c091a7f8e8fa2002cd11fa0736f7db
 DIST AbyssinicaSIL-2.200.zip 1288734 BLAKE2B a6a19752a2c0fd0206705a325c9ab7fae0a803e97580066526a6d374c45698d82035df7b8e6dca038cb6ac01a17148247018dec0fe2dc6506ba7def5aa657fc9 SHA512 2f9092c4f06c2e26e03b8a4d0b31d18f6d7cfac9f0f89d8a05fe4de6a6caea4684cf63df83dc24c26db0ceb02602d3d2277143020c40b6170dd9f82bf0373d45
 EBUILD sil-abyssinica-1.500.ebuild 653 BLAKE2B 55e662eb597340eb1aa07964ea9efd4b51ce0248edde07eb89ad0bc3a268e0d7bf86dad429eed5952f9b32278f69d4e860550ba9ed653c50d2969df5541df3ad SHA512 98f4ca2ec90cb4b90c9d7f97a0ce7a2ef395831e92dc08231b4c36e39658607275a3ef9a3a16bfbbff5c240118dca7480ffe6cec8a65410478e4f9221ed24aea
-EBUILD sil-abyssinica-2.100.ebuild 655 BLAKE2B c208334ded9f5dcc32db45c0290e275659bdfc59a7289a319bc6eeb352b53b9bc6e91e00256bc324197fa6ef907b2e7d72c621ad1762604538ee05a09372a52f SHA512 406bf01952282e451136672d26cdb1ff2ac585eaae6cdc304022fb39d4b18a8c83a1ee1e9353bfb22ed852f459e4f65d1a839a7f4be6f5f3d9ec57b5971bf53c
+EBUILD sil-abyssinica-2.100.ebuild 653 BLAKE2B 04194eb99046d74b36bd07d5489a626696129c02c27b5fdf266e95c6d24b4bbd6a7eff78fa01694142bb25bc823b6b93703d064ef31124824f6abe3c8d924efe SHA512 009d7a88c635706103165635fe7067c05fb91c9f7b4c441fe8d6c91b6b84befd3365c4f2e664439d16ba50c6112fd714b7729cf0f5edce9d5552477b31a94968
 EBUILD sil-abyssinica-2.200.ebuild 658 BLAKE2B 238c978eeb53af6910e6bd500cfdd4db98adeb866107dab78043c5e559804defdcb7c274b34372f182e4d5ac3b4f0edbfa3c617dc715cd871a0e7af2799f0186 SHA512 71a4255423c2d14142f026925f53d2922c472da37b9ed9d21f69b772e453eb612a4f5129958a8c71bd6a9d97fd10e23011dafe6ac8ecde42e6b6a2886ba63663
 MISC metadata.xml 1079 BLAKE2B 16d45f13756606ed3d08f22a78b8cd166d122c3e315ed1820842732146f3f141080c452a85ad4c748702ad76b12416d80f2bc1dea600489db3a2617dacc5330a SHA512 32c34f2705a0405497e1ebce0aca8d9347eb31a596148733d6e56f85cc797951728e39aab44c1c5d659222c65d58eaa8311f4f9c6f2dca8bdf425cdc6db1e3d8
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-2.100.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-2.100.ebuild
index 6602b29510b9..de5a92ed5ccc 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-2.100.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-2.100.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~loong ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 ~sparc x86 ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-doulos/Manifest b/media-fonts/sil-doulos/Manifest
index 1c770174f828..efdb5638bd51 100644
--- a/media-fonts/sil-doulos/Manifest
+++ b/media-fonts/sil-doulos/Manifest
@@ -1,5 +1,5 @@
 DIST sil-doulos-5.000.zip 1347526 BLAKE2B d6f5ea4ce5e5cf264dcd59a96e7bb328fdb7cce66d07e30743e8381ec5631eab6b32cdd929940d75bf7b9bca3f102fdd8619f56a813c022ea90020d4fa2d7429 SHA512 3698b3f330d34cfa2be93f9dfc87c113a0b3e174a40ce9c2277bb452161cda61aab4688338ab3aeaaaa3cc684cedc58bbb3f066392e3911246a230d1a9fb02f3
 DIST sil-doulos-6.101.zip 1532281 BLAKE2B 845ec45eb338a0afc3bd0bbb953adfe87c3784dabbad6ab017e50ba0a1249e5e3f795e090dd4ef2b80b32379b38c372c2a6876980a3ff72362eeccc7a72c3bc9 SHA512 2fa2455a7466dd23cbacf7f6aa46996e88ec7c9fe002cd0b31ab90c7dfecdf57a3418327eaecb517183be56d0459b61bc96d60639534cc0f2939ae66941dc867
 EBUILD sil-doulos-5.000-r1.ebuild 584 BLAKE2B e3dc43726f7b3d3d2795b2febae360d2e9a6f08cb52f032e5fa05611a9cdea0f3c482e6e9f956a530e0589ae3422d0a9a27d89af5c0cb34983d607437ba42206 SHA512 2b869841eed14c288c01eade7b70ea00dff4d692c07e0e17c227f8f3d617311077c97d666e4c53b4eed6253cd73f0a7b86b86b21cde9854ad0f32df230965e80
-EBUILD sil-doulos-6.101.ebuild 571 BLAKE2B 7be85ab78039fe9962e5a7d479d4cd219380fa03a25f37aecce43487f781265a9d03865e64aa1cc690a46fa401a598d7cd46028a957ee368ba342dafa2b44462 SHA512 78b28b3d2172b2f6a33dc39581f0a3c03c520ed52dd4abbb4a304c223ff99b52e1859bc97cb3c1bdc93ac98dd5fc3d7661abf0f9ef592949374060e91e37af91
+EBUILD sil-doulos-6.101.ebuild 570 BLAKE2B 3a205c1b4fbff923751910748473a35d9c0b4ee9ec256dea48ef2ed7eeb946b61831e9ef106a5555eadd927eba65b113f03c2d91d772da742696628ec95509bc SHA512 f37d3c9922a2fb58e770944f7b39a7d0de3281606d70e52807ec11a7c98b88d84db94c25cfb2efbf2fcfe0fec03f0857a1afd86bd0e81626e68b6d50935fcadf
 MISC metadata.xml 1108 BLAKE2B ff47c845d378a1b8d9f7a36262cb1c1150c48e914a768ad34b5e9016a23384aba60026834761efcccd2508548ac62ba16f2bb58d6eaefdbe7c65a11a1739cae0 SHA512 70f703bacf933399de27a543ff276d87762f88615685f629bf0c569a384009e4fbca8b268343cdd6bbcf75afbb9aefdbc39d56ae34bd661f2f9e7db6e49a15af
diff --git a/media-fonts/sil-doulos/sil-doulos-6.101.ebuild b/media-fonts/sil-doulos/sil-doulos-6.101.ebuild
index 9c799138a38c..5102a37ae67e 100644
--- a/media-fonts/sil-doulos/sil-doulos-6.101.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-6.101.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index 3368aa0420df..a1b17bf9a045 100644
--- a/media-fonts/sil-gentium/Manifest
+++ b/media-fonts/sil-gentium/Manifest
@@ -2,6 +2,6 @@ DIST sil-gentium-6.001.zip 9720134 BLAKE2B e1e9bf13db0fe0435e9e3feb9a5cd0621f6c5
 DIST sil-gentium-6.101.zip 10319709 BLAKE2B faba7fdf4215788cb28fbe86de08c182969551e9a4c8fc4022285b095a0842331898d1f65e3e241797e8b1c0d45e035551ce5b27b49955a6b6867d9bf4b97420 SHA512 899ae8e54caf8fe012e94c6288cd59bb0d7bd8bd9d494c7b1fb5f68ac439d218d848d604d4895fd07a7262e99b9082ac43391f0d288ac31892f7ba7df4d4f38d
 DIST sil-gentium-6.200.zip 10935378 BLAKE2B 76c3cdf20aff9720533c6bc669877866347ea1e5b61f9fc360ba8c12ffb3b66db9d57a2c1342573bac528bfba9fcbd2304aaf372fce69bb8366f012fb273bec8 SHA512 8ecb15121f82a39852802126b336437756159c169ea6a428c6e9ff63f75d9f56671a2a1a9e050421ee661cb13c2b77d87b1d3d77d71eb075ba899e6a941588ed
 EBUILD sil-gentium-6.001.ebuild 739 BLAKE2B 97eb3f1135d28d96eb5145f0c3acd9533a759e431dde4f4a4b6658bca63593e08b116acc1c07f19ae5ba4dead245ca22d84e2b7238351f069a86aecf8572aa1a SHA512 5507095542d028439776576779ab6c55150dc070cad24b261bfed9b11b6ac54111b8d492890029d3d9315ebb84b79a4c0d8d9d9604ffedb8611df9383e6577d3
-EBUILD sil-gentium-6.101.ebuild 740 BLAKE2B 54cda2ed18b9862234dbc3f1370614d654422de03c85cea78b52b6818ec0daf4ae3d314b4b038ca6492db72370a621da8558a6f5c6fe7d8f7a77b6c6e4349b00 SHA512 f79477a26383a520761bbcb5246dadb450b4a3c24aea37821dfc660a96012b9fed1e1362e196021d951c865612ea4d9ac7c0a7877b5160205979b1b9e8a79e32
+EBUILD sil-gentium-6.101.ebuild 739 BLAKE2B ddbb128e717410fd96c30681cc5cbbcf9eaae46f31fc61793ae0538c7fe3fe6a1c0174e31c113a78f937bc6fd6079b12b580604ee53d9a2a79ec9c9ae316443c SHA512 1aeea9c4dad7c524296e64a3e7ac0d3b22901622863342fc08c4a2a7f394640257e395f3811410623acf5c2197de9b31a4ea0ab8490ba26918f51358e51b297f
 EBUILD sil-gentium-6.200.ebuild 745 BLAKE2B cd79579046f16e4684f7e75da7ff0b5d0057069696e8c943a8f04742c95a948b41dbb4b047e4971a6a93665fed095ceb529ffc18fb7acf35c59f5f61141607e6 SHA512 d71ce1fce77bda0476f6a460c811d126eca906b30dda4fae4c13934f5728e5e6bca141697fa1a62291fe43ba33974f148204a4235f64fecf4964301796fd23d4
 MISC metadata.xml 1026 BLAKE2B 3ed9aa0aada31fa43e8cab66490f697dd6b6d1224f495f52208233f89766f463a2d7cfe27a0631b293312d9deed8d3ac52c307315105de2e29ade7237e6cddea SHA512 3522210300e340e94ac7d4b5da47cce6ded63ca2776e60e9af8190f645ff2111e839248d2e56ad39818b8604988108c87900071dcf96e435f6829c9f0fea6ae3
diff --git a/media-fonts/sil-gentium/sil-gentium-6.101.ebuild b/media-fonts/sil-gentium/sil-gentium-6.101.ebuild
index 0c3672680fa0..34ea25b5a2b4 100644
--- a/media-fonts/sil-gentium/sil-gentium-6.101.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-6.101.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index fbeaaa61c00b..389ebecc9668 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,5 +1,5 @@
 DIST Padauk-4.000.zip 1316567 BLAKE2B 466d9aedad691afa7ae94a24652b156888cda2a926846fe705c953e711b00bff7c053b1f6d4e4ae4989a6fc91d87e984539315b84c0fff10815b8cfd18b80da1 SHA512 3ed97d5e8b47f8883bcab980aeb4247f4878ef8306773abdc4d1387817a3bdd5d8981c01cebbcd6b1c8dd7507d30a3b2879d607df66fcf7bc33d3db5d029016c
 DIST Padauk-5.001.zip 2005243 BLAKE2B fa6206465f1b803ab4da4504a5607d507e98631ccd0819cee043b09b735e3d5c70ea451f0c9248b7705df6421e509abc2edcbfa735b68278cf7bea3d73a46961 SHA512 30ea868452c28ffbd59e9648264ab89c2316c5cecdc69017498cafe8921dbf843d83dbf0b15406eebc300d8fd273f72ba60aa20b39a8865370212ab8b0cad047
 EBUILD sil-padauk-4.000.ebuild 489 BLAKE2B 253961ae4315743c2d21062ddf77bc11298d3554689cc00db01c1d10cd526b068ab6671599fe3f946bf115ac792b4fcd7703598b973173f5d83a368371b17789 SHA512 9726fae6320f7a4bf8c08cb7eac37c0b5eac2488c8d50f9346579cc7ce256fd08f339d022e3636fe5bc4971754dcc6e3fcabd87cde826378e842a58f93fd9f3f
-EBUILD sil-padauk-5.001.ebuild 482 BLAKE2B 703bdd6f6860ad3b03387f358513720b55bf71b4ea7275e9523ffdedcbf8998d62ff12aea83b21865631e8be27158574f052bb696a855b95181b68759dd904f1 SHA512 f329f3db5a41e4e573962b14212fe9cb0e24ea188e1c048d459397e0cd7dcb712d58e1bea6504d77a7cda4c05321d2ebec502fc22bf01bc4d9b3ccd6407b5392
+EBUILD sil-padauk-5.001.ebuild 481 BLAKE2B 15d0e921c089a398e2b45597509a6973f200f994b4854b1f1a1e283a2f7a82b11daf026551aa0a64d77287c249a8d310564c1bde42c229b014e3dfdf1da93bf7 SHA512 12dbb266dbd9708531312a6bc5db2c15b13a979ad180720167462aebf78b223291e28f483c059ac16bce405c09a561fabecbfffa3541c7fb4813f893af24303d
 MISC metadata.xml 415 BLAKE2B c0e161f608e6b211fd17d819f7925608525c73de2a310f9bbff99aee64dd5e6ca644ceaaf658debd37e73a8a6641821ef13457ed4dd5b5e4ef0c1fe39657d343 SHA512 c0a5544675f3bb2276ce8f673ccc472ece76162e61c1ebb5585d51deffd9c3dd2148f3935b043b620a11c9fe197e76d4c5b7be43ba8375874ba6dec94cfe1282
diff --git a/media-fonts/sil-padauk/sil-padauk-5.001.ebuild b/media-fonts/sil-padauk/sil-padauk-5.001.ebuild
index 1006f8f8deb5..8666192d300e 100644
--- a/media-fonts/sil-padauk/sil-padauk-5.001.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-5.001.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ded43723ffd4..eeae144eb4c9 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 342c58dcad7b..12b2fffc0456 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,4 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 DIST alembic-1.8.4.tar.gz 867788 BLAKE2B b7bc5ebcaebc5905a9a2e45be21170a72923fd6af6d9f97b81bdc7e8b80bb037ed3f667ea15a5b96194b33687010fda455e4df8355f92fc29aa000beae32cae8 SHA512 2473f4b9afe3fddbd2d0477bdc85d93697e413410253a7f7f0f030fba919dfb63dabd2d2d13829f59f3f901643ab842d230a9f08fb667e2c16cef0e751a8a687
-EBUILD alembic-1.8.4.ebuild 1588 BLAKE2B e68b3555e92c0755490cca94f4854d151fd78e98ce74bb1bbff79c7ccaf57c1cadfd9ba667a32a4dfbb5c2877c45f78c3a395eabeb2298cc253b8fe46e36c3a7 SHA512 13a120d0f7f1099735a41fbef97528d3093b4d55c7b68604cb88a2d4669215c2c194a1f69a37567f26ab95b2e4a83480f63e2db35110e60cf7d88dbb27d0fb96
+EBUILD alembic-1.8.4.ebuild 1546 BLAKE2B a659e953e8e583f47fe7666bb07402711529a6bb73882b7adc774a23ebe0dcab37e2acebd91e6045edbdad20019eecb5a2d4cc45c5ef4f471a62df1e0c496313 SHA512 1d02598f85e6b27877c559bbf9f617857e49cf1775118226033f064c9ed2613e3403d776e26a5ef82858b4397f1f16cc2a5b1072c881e4d0793a3c05168f3c12
 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1
diff --git a/media-gfx/alembic/alembic-1.8.4.ebuild b/media-gfx/alembic/alembic-1.8.4.ebuild
index e3d734f5b507..f3bfe4a9376b 100644
--- a/media-gfx/alembic/alembic-1.8.4.ebuild
+++ b/media-gfx/alembic/alembic-1.8.4.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-# py311 needs imath-3.1.6+, see PR #28265
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-single-r1
 
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index c4d9acb97f22..51321ce19e7b 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,5 +2,5 @@ AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52
 DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
 EBUILD fontforge-20220308-r1.ebuild 2782 BLAKE2B e606ee0c6542c488e6af89dc2b6cd064b07b1e7c8e055d34682261be5da5531e12c57b20889bc85d37f7bbf21aedbe9a739323c58f389ddd0ed6745b87b8245a SHA512 af5a9009e57f75e77e1b1bcfffbee3ce31bea35e6732c655b21f5a9d8777c74467d53aa4930852a66e42f6098dfe569711c618778ac7256b1161bed3ae405d12
-EBUILD fontforge-20230101.ebuild 2810 BLAKE2B 894caeb534da296b48cc4cd44078ecd20ebb8aa91404a07ca7fd09523656055a7cdc56d8d0329658b227f66a7e3af826fcae119fdbc8a3ab3abd3dd922748931 SHA512 1e4f85c21a162ade003bbd5c0cc06d90a3a0996d904042f0a4cb12d634a5dafba10a882289e4bf1bd69d95d130cadb908cf99974e2705b915d071aff3acc7c12
+EBUILD fontforge-20230101.ebuild 2809 BLAKE2B 47727551a64eb953f9e812f8914bd7d3c64f6ab1056b6c595ed777a630ed10b0bb75530b4748cf6e277059abde21be10334d116371f5b853371db7299c3768eb SHA512 8a0442e8420b160d48e40d4873daf07eded3202c0191dd9a9f6fa8980a686b0e67d03c6f3b38bfd51b1593da121b7c1a7728db5a9f2d8e0410b35d988588735c
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/fontforge-20230101.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild
index ea1aee2c6a6f..c8d28d29388a 100644
--- a/media-gfx/fontforge/fontforge-20230101.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 8cc3b3032ed4..9b0fa9a32500 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,4 +1,7 @@
 AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2ddfddb97efbf43bf888a6e00fc47e9f60635f8d482a6b227335e0e7ef028e663b8b959a18658ba300ceb925704e977b8cb SHA512 4b6e00823a4cd271ba72b382b35694737d6944cbb123465da4243a16cb5cf6bbf3a8d3ecc707ded6e74df47ac76c5ebe1f789aebfc7c4a7b0ecd8e926d32c120
+AUX shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch 1835 BLAKE2B 7538be63cb6ca6c3a0a2706b652e7a804be03926528186a5348fc11b9c3bb815bca276d1bc4f9f09139dfdc69b5691926e7e55f199c192bd24cbb6582ed91c7c SHA512 e182c8bff3e22e31570fcdf2e23d481189d7ccd7fc95b69131c5fb222ca7e257d29e9eb41313b05fd9d7d7b7f726a4345a3c5d9fc0a802df42053fd1dba1f1bb
 DIST shotwell-0.30.17.tar.xz 6533460 BLAKE2B 58ec94f21bf465dcc19760f40235db7d2ad7d00c214802cd3ad6cfd67cb1088a5999f183c8ae36398e492a1b387e6ea717a9b8d0f31f4ef369e67c10150ae57a SHA512 f680b6f58538fb7b584594d00da7fe997dbc766583a5b5a85943b3df905dbc7192d3e7b5c7b47b6bd1221280995aaba878ea1afff9b042995bf30fbcbce5f7ea
-EBUILD shotwell-0.30.17-r1.ebuild 1922 BLAKE2B 9d0196fecccc9f2a970864ab39e5c8f12c9803bcaa538281f0695d4171ba8b0bffe9694ef86b3bd2fea5475c316a1a467e767a610bdb382b900e3fc5cfc09062 SHA512 5a0631c325964b4b601a6c53824d42838165ac47a520bc37607c2e63b2efd0e61c3de6d4653abe64629766805611682112bb76eedd32bc85b31d4c9145f17314
+DIST shotwell-0.31.7.tar.xz 6610144 BLAKE2B b8f69237abb987508f565d5bfd59123fabf2fa1023783362b189da2690a2b72d5908e13c1371097b48db9eddf1b1361b0b92ca1b5e86287dd35b484bbf119593 SHA512 6653cbc2b2147f65d615f6ea879d012e6a5c5b55c9dfcdb8ff9fecf909ee6f5db96ac8124608d8223e0a95ab26508064b9376a293a2bd4fe05a821988400f42e
+EBUILD shotwell-0.30.17-r1.ebuild 2003 BLAKE2B 1b00a0247eccac96d54b539b268544453d62341afb6bd84f0c707480e2e39b0dfaf686ee011fb0b91fbaf77c190ab72a8cbb6444080943a67237f01b16656b4d SHA512 844c5db5695d761ccb9bb08927d519898f777859dd2d967e37456cb1baceab564f7cbfa3609f1f518ce440ac28b55bf4619af1fce75384acd64cf39e59bddadc
+EBUILD shotwell-0.31.7.ebuild 2030 BLAKE2B 1a9935aac9de68539be322b2bd3302653125e854293c8413f2b15fe9525ebdac92727637ebc2d8e5cb750c52b4e732d954538256a3d66ee23c4b041d5998ad36 SHA512 b8d6aa7433be49d3bec26ade9c938235bcab41b3a4b06209dc84d8f8d5a3ea2b0bf70067a1ef7b657645fb043a99cfa410ccf72b9fc3e30516b983ae05aed391
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/files/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch b/media-gfx/shotwell/files/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
new file mode 100644
index 000000000000..76e959266fc7
--- /dev/null
+++ b/media-gfx/shotwell/files/shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
@@ -0,0 +1,57 @@
+From cd82759231e5ece2fa0dea40397c9051d15fd5c2 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 5 Feb 2023 20:44:49 +0100
+Subject: [PATCH] gphoto2: Add missing cheader attributes of delegate symbols
+
+---
+ vapi/libgphoto2.vapi | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
+index e9387b29..67cb2098 100644
+--- a/vapi/libgphoto2.vapi
++++ b/vapi/libgphoto2.vapi
+@@ -340,19 +340,40 @@ namespace GPhoto {
+         public void set_message_func([CCode (delegate_target_pos=3.1)] ContextMessageFunc messageFunc);
+     }
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextIdleFunc(Context context);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextErrorFunc(Context context, string text);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextStatusFunc(Context context, string text);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextMessageFunc(Context context, string text);
+     
+     // TODO: Support for va_args in Vala, esp. for delegates?
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate uint ContextProgressStartFunc(Context context, float target, string text);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextProgressUpdateFunc(Context context, uint id, float current);
+     
++    [CCode (
++        cheader_filename="gphoto2/gphoto2-context.h"
++    )]
+     public delegate void ContextProgressStopFunc(Context context, uint id);
+     
+     [CCode (
+-- 
+2.39.2
+
diff --git a/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild b/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild
index 3eb97823c813..332fa0c27c41 100644
--- a/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.17-r1.ebuild
@@ -51,7 +51,10 @@ BDEPEND="
 	app-crypt/gcr:0[vala]
 "
 
-PATCHES=( "${FILESDIR}"/0.30.16-optional-wayland.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
+	"${FILESDIR}"/0.30.16-optional-wayland.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-gfx/shotwell/shotwell-0.31.7.ebuild b/media-gfx/shotwell/shotwell-0.31.7.ebuild
new file mode 100644
index 000000000000..2e50785196e9
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.31.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8=
+	>=net-libs/webkit-gtk-2.26:4.1
+	net-libs/libsoup:3.0
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.12.3
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16
+	app-crypt/libsecret
+	>=dev-libs/libportal-0.5:=[gtk]
+	media-libs/libwebp:=
+
+	>=app-crypt/gcr-3:0=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-4.0.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:3.0[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr:0[vala]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity_support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		#trace
+		#measure
+		-Ddupe_detection=true
+		$(meson_use udev)
+		-Dinstall_apport_hook=false
+		$(meson_use opencv face_detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 5155f40b20e7..45875f62039c 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e-r1.ebuild 3461 BLAKE2B a34d84cfe0afafd62515c9d9d42328c0604c02ad4fece0c3853bc02810646d667605f915e67d2ac837903ce3ff82303e3a40e9bf0270f65895adb2ce8eff2226 SHA512 03f204fe28c830c62846f7a249515bdfcf44555a321342e1219a434f89f05935f17f77b023baf8f55dcd0832588a2f6c5e35d041ab685c20d9e5cb4659bee415
+EBUILD transfig-3.2.5e-r1.ebuild 3468 BLAKE2B e728ee18f23e7670dc5398cbafa7fe7bb896a266fd9e6071d62827d387d1ffc7c9bff83d678d71c199ccb01b5c200802aa8b7c8ee72a8dc08e1a576c5e837794 SHA512 b4d70b5c04cdece6c8d1951f81f643e493e169ac28a2c2273c38d3657fe4b4d06fd773d737c930b97beafb9a97d457bf392cf8d95eae6b129db8ae8be24d4ced
 MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index 51f33e7fd865..cb083514b625 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	media-libs/libpng
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c07f60c2dc1d..0c5d0bc13111 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 1c3866932407..75c5c5cebaa1 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -5,6 +5,6 @@ AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa6
 AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
-EBUILD allegro-4.4.3.1.ebuild 2965 BLAKE2B f4a09321d24fab20994a9f95ad57d972ced2cf85301e45a77a8a4379b8feab4eacd6a9a46dbe81667ba01091feef712c677e42e1460e31ca7f291f979f1ebb57 SHA512 79c7c4dcf05afd5d01e004fd7a480935df93aee183e89c2dd3b1bd244fcc93bffa4aeb4b6cd03b2207bd7719ef58931b503b6f468b30bdd15e62ea1f679965be
+EBUILD allegro-4.4.3.1-r1.ebuild 2957 BLAKE2B a9c0dd799f88f1408c1a778c6987078f0d7cab2cf5c2c865ab82e4f20351f58a099d1ef5b2bd479e0e0b976444a65a28ac33709920810c8b230b20447df82c22 SHA512 6d3b257c7ed3f2e456460ce7db0be41f4c5f546b92d7cd592fb1825b636b0f6fc592197d78f2ffa3d9c4972d082f39f536fc9ea3485bc169256b3ec688ecc8bd
 EBUILD allegro-5.2.7.0-r1.ebuild 3237 BLAKE2B 80be7f4da46edb78bbfdb30103ae98ea8dc847796d1fa22e90897c9ada3b590b1969f19037f2e9aa1478547104774000e97c882ed8dbb68aaea68c2e81594cca SHA512 d442fe907c67186cddf16af5ac37ccafde5eb27400f8deb547fe3eac7c82fe43c72d123f916b497e17f54237a88a660c04408e4fc4390b5608fa255ab8f86b79
 MISC metadata.xml 1110 BLAKE2B 77e957371031de557c917ecab300859e8fe9d6b5cfdb10497988eebfc80a748e36e4b34011d5cfbf2beacde1eda0a7807c2aeac4cc244ccb577ad3df0b867022 SHA512 71eadeb25bf069159d6719505f9a1efcefbf3731cb7e113703977c898dfeffc3caf7227e2be8605a95860d1aa4e67deed3f53de403c5cd63b585f236551121ff
diff --git a/media-libs/allegro/allegro-4.4.3.1.ebuild b/media-libs/allegro/allegro-4.4.3.1-r1.ebuild
index 962b6267f1c6..73ee0de87f3c 100644
--- a/media-libs/allegro/allegro-4.4.3.1.ebuild
+++ b/media-libs/allegro/allegro-4.4.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,9 @@ IUSE="alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X"
 RDEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	svga? ( media-libs/svgalib[${MULTILIB_USEDEP}] )
+	svga? ( media-libs/svgalib )
 	vorbis? ( media-libs/libvorbis[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 5119e33cab0d..53c7ae52acad 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,5 +4,5 @@ DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d64
 DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
 EBUILD alsa-lib-1.2.7.2-r1.ebuild 2538 BLAKE2B 6a8af298898c8bd961cadb570ec4e726e400a3395c128800bf0a67565f4b344db488b5cf7103257050ae6f00f9793a3f122df1542dff3e57461c3153eb681326 SHA512 ff3c657b3a089750dfb785fc0575974a89a8d88ac2db3729fe5a890db2301cb3c0d06c804cf5e465943b9cde52b99f680f94869559de371a442c557480f3e494
 EBUILD alsa-lib-1.2.7.2.ebuild 2550 BLAKE2B 4e1a6b75342bad5aa78742b1ce08e151fcea3116a60cebad6d8dacfecd6f594d58b162c763936a146cbd4b72fa3ee044509fe727997a569a503ae80b914abe4b SHA512 bd4f641cf08c996c19fe91278031616714fc2a125f91d354e17cf5bed3a4514b8e9c1c44daf07c31101d75111741e23d08197ee05b21dae8ce35fe49f4ce19f6
-EBUILD alsa-lib-1.2.8-r1.ebuild 2544 BLAKE2B aabaab3f0d3e0d7d6cbd9fefd47774936649a85768c737d000d4927e2443ab5392c2a45fb8882cee1ae61d85d63f9a756187230781c2650fef556d2e878bd7e0 SHA512 88713c9a01a945f1708594b72d0cdbc09ff4036977c0b58ad937904a398a0441f3dae58f06b15b0e49a96bbaf4f008897ab7e7785b5f947502dcba5787667546
+EBUILD alsa-lib-1.2.8-r1.ebuild 2543 BLAKE2B ef21172a6e1d2cb5552254b57e1de4ce829d725f9e7ba2eabf46e7d56af4643373ffa80b4828468876a6195ccfa1e77b24c75e669eb59ea4d08f32328b1d81b3 SHA512 8f84299d0f8ba6f5d00c8617490b50655c037688c9cd91009fad144823dba7394b5dd7e680873b43269b89c34073668561762006f54a6a8c53df70a95353824f
 MISC metadata.xml 624 BLAKE2B b2f57320a348a39867c5ee362a9bea5df1518b4fa41cd99468fe87fea487da85e188889a7c77f0380b3beadd1807c86b444886d953263c218ca3746bc1aa2a5e SHA512 79f2bbc1d17edff04dc940355646e84583164407598c2a26d8decbfda3ad5de62e2926ec12c929c3b06a5fc7e9c1bce4a40e631d2bc4038979f9e240b7a33c09
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
index ff1b03906cab..451a5d847c1a 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index c4e5e5772b4d..5d8f3feb431b 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,5 @@
 DIST alsa-ucm-conf-1.2.7.2.tar.bz2 33011 BLAKE2B af8ce94b5eebb84e2420e96f9052e9ed1055f3c37aca088add6f98d562bba67b856ac5ec16adb3f1893fd612eeadd9d342b83ea615b213ce7d9ac010a0f5d4cb SHA512 b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db
 DIST alsa-ucm-conf-1.2.8.tar.bz2 37843 BLAKE2B f2281a3a5d8b4fcbc4c75ce99a911a4ce3230abfa6f6d0aff8e175fe1b870750f43c087339490ed9f4d5ab314fda391e06e41cbed79239a16326a8f2d02ac262 SHA512 a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca
 EBUILD alsa-ucm-conf-1.2.7.2.ebuild 517 BLAKE2B 41ab7ee7c44597bdc2ccf4d3d213deb759cc17d5d5fc0802c582dacd5c26a1ed44b3005e805b74fb5473144e82a28726e982d47268a159b42d07cdcd6ad55cd1 SHA512 82a04a52b13ded3d16f122a24c57526626139f40793704b7dadd6187029b3884f3b517e9d50c333752d18d25192a5a196d0013dad1b22aa426103c0a2671c0fe
-EBUILD alsa-ucm-conf-1.2.8.ebuild 521 BLAKE2B 44c6e80b5609e4c9c14c1721f3a0523a00e514d071951c1823742b6069185603642d3b1a35d7962b4754eb1796728e169a70f2aaec8859724a7cac35f65d8521 SHA512 7b54e05e943789391f5222c627a309cf0ffed07b782c5e10223bac386d68f20b28dfd75e3f84a21bb719be385d809751d5d848a18f843a57029db9eeb58ce15a
+EBUILD alsa-ucm-conf-1.2.8.ebuild 520 BLAKE2B 9ce9e3748911f68fd89a85b0fa949fc92e9a90272280242040214674c4bbac8ae788420ba60e1d6568cc2de4b2874ccb6b265e2b76869579101b1e7e2031958d SHA512 87be6e89a560d11ec159d331d9c9b7fc882858806018d4eaa8d8c658af287840fe39487db656509d938c892fa7b376a9e52046e4749e10f9971f453e35d4a984
 MISC metadata.xml 457 BLAKE2B 68d8f949d705562928ce4f6a25faf692611f14d63e659723ca5095be6befb5c03bf7dca73a158973d58ac242626a8a4b6f7d8835377e21d5bc8d2307906fee7b SHA512 8b65e913e4d6fbdcd2c760c383d9d026cf053dd10a63689b782f19f88b199443542488bacb08fa02ffffff09165813323dcde06529c9ff744182b728aead0c6d
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
index dc1ea7723545..d6afa2ca1cfb 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 7709c3545571..b68fbc41a58a 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -3,5 +3,5 @@ AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f9925
 DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
 DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4
 EBUILD exempi-2.6.2.ebuild 1367 BLAKE2B c14b4815a8745d6a8bad3e3539ab033c2151611b8dddf382df5649f67d758c52c1c05c2c62d5efa95b339c79b2c76c1d2023c49d9dc0e6a449a5ba6c2fbe9ac8 SHA512 558a7ecde81272289d1932b1a8e64b0f00b9f45cdedb83cd8e0cc10f0d7d291227b1816d87bf9e92b908bd6de1a41a1c021bbb8776e69c10d7b9ed5a86266f94
-EBUILD exempi-2.6.3.ebuild 1312 BLAKE2B 7078a2324b002828a6b5dc2df6f51ed06208a60d2546978f772e1504830be5049840ad16e05d9d964ddf86f21b2eb6332ca59672dd671ff1cd556974b4dfb274 SHA512 8ed15a7c1e99bfb6449f53c127166e3fd77d2f6179bea7302022c922fbe53cf89b5260d741f48cfea63413464d9186f098eac5f28335e477c6c9c5bc1688d338
+EBUILD exempi-2.6.3.ebuild 1311 BLAKE2B 7257a735a1d87b9f76d5b183caa270d573112eb675a639227bd08f4d0ba92c01b8bfee332a0c8870afeb9b03dc765be4e2649a77441a63446f31e2704c52b90d SHA512 d013f400f1d654ea1a6259f1a91bc701b9eda6062acbe7e41af1e85b69a43e2bec5e90f46af91c80958836f701ecbf76447cf5dc1de62e2660bd62b96068b642
 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.6.3.ebuild b/media-libs/exempi/exempi-2.6.3.ebuild
index f62e573756f7..5f8e20ad775c 100644
--- a/media-libs/exempi/exempi-2.6.3.ebuild
+++ b/media-libs/exempi/exempi-2.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="2/8"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index df52b3cfa6da..3bcfe4a8d452 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -8,5 +8,5 @@ DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a65
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
 EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f
 EBUILD fontconfig-2.14.1-r1.ebuild 6669 BLAKE2B 15edcc9a23bf962f2de32be9afd712c846859bcd5969155f8d739d91e409f0ca0f540c0a9708d01053c13ad3512b6f64bbeef01a1f8c19167bbebf03f68fdc50 SHA512 28c1238f9128b0d058e92dcb749fcda4ff0b873b7e3c48c13da548a264202170a2d05e1150d555d2437ff9252b60ca0e41d7f1e3d7c4461e732d9d688a5d9548
-EBUILD fontconfig-2.14.2.ebuild 6577 BLAKE2B 74082d3bc14b060faca90acd264f53b870aaf0a5dc3e201af86bcefd900f3616baacc172612623b7f5ddf1edd065b556a70460fc9b1e3ee3d78dc971e8663fcf SHA512 a0c9702e6afe3bc4b903f0ff28c3f8984fa369fe2e25bf938493b3abe1b56870053946352a6d9c0db02d9e1eb76341aacd0cee4a25da709cf15b76e3f7007f90
+EBUILD fontconfig-2.14.2.ebuild 6575 BLAKE2B 4fcaba1dd4d5a643a4b6e83080bf108667da2cb000581f05da4f4f1a0b6596c3571205002533992ddb02b3443435798dc30d7533e7f9ab6c259fe516e4f3f9c5 SHA512 6c138bfb68062dfd8737b949b21afacdc1a1abf0f2df99c0ef1d9ada970c5591c9a66164e5d9d3de8ed0c31c4484640595f1381eb6e49a2ffd9fae68bec7980a
 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66
diff --git a/media-libs/fontconfig/fontconfig-2.14.2.ebuild b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
index 6f673e9ce5f1..950f3e3d8665 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 52df954f3efb..f2bc5d5b9c73 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -6,7 +6,7 @@ DIST freetype-doc-2.13.0.tar.xz 2084016 BLAKE2B aa88eb5a30223a683348902624827bd7
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
 DIST ft2demos-2.13.0.tar.xz 333952 BLAKE2B 34155615eb967dda2b62e47bb4095a6bf367dd79b7bd93dfc4dc172476b3bf704af4039623d55ee08d2d6a5365b4783e86a570e34b70af2e543bac64d40833b0 SHA512 7d686e9febdda587b74647cc38fa22f0722d0306ecb05430e319e05b6132c999d20728bcd7a6506b8d8ad45a6859443e2b69d766802497357a8f0ba3352404ba
 EBUILD freetype-2.12.1-r1.ebuild 7496 BLAKE2B fcc0d3e6f1653833dd198ef64b8963209bc3bd4d1f797a55279b4e767fb38b029b159a4ce6074d783ce508e9d5a1697c9c2bf73390fdadba7bea5473884c0592 SHA512 c24692f86ca40baeba2b8edaff0a606ccbe1c9e28fb6d3e24b171a79c090da5bd7811594d1b6420769ec059307e721335d090752588413b7958ba6cc83cdc2f1
-EBUILD freetype-2.12.1-r2.ebuild 7549 BLAKE2B 5b11d278de8f21551cbf83f5a004a97ce3bfe664ef0f1e3fcf11e1fa105f2d567ff276e493277d7bbb5558cd55b7886bd9a67f04a174efc88ddd5efd5182cfc9 SHA512 5ba9081735a832f9cf6c6a02c4e216450a520649902293a256e89b69385c84ae7675c326e2d9e7e6ef3006590270dc22292b9fc0bd00514088d1a368e965bc7a
+EBUILD freetype-2.12.1-r2.ebuild 7548 BLAKE2B ef9e1da55f4f3d104bf19c60889d3339091a9044dc531a06c073ab9721f9740c403c1bebeef4b72ae5e6b4886679ea0a85a0c39757878c42db1609844b89c179 SHA512 52c837f72616ebb22edcc224f5c28b8222ea2db344d4605fb80ba1dea9366a31c8f2712520be062a84dea91ccfe271223d3026cac341642a79ae65402f8f78cb
 EBUILD freetype-2.13.0.ebuild 7489 BLAKE2B e95ed8a66be0b20ce00f8d226b888b1426e50c800fd66877e2d02b6b12e142ba6d0b58971b76b112a31897ded6b0ebbaa586b577d208e576825d89bfd50483b1 SHA512 6b3a761ccdbe54b1355287572d17465be7275a846c75aef4bbe31800de039cfc48e1b5a5c7da58510e1055b496e49d55fdfffb7d93915f8e801c7c204db986b9
 EBUILD freetype-9999.ebuild 7489 BLAKE2B e95ed8a66be0b20ce00f8d226b888b1426e50c800fd66877e2d02b6b12e142ba6d0b58971b76b112a31897ded6b0ebbaa586b577d208e576825d89bfd50483b1 SHA512 6b3a761ccdbe54b1355287572d17465be7275a846c75aef4bbe31800de039cfc48e1b5a5c7da58510e1055b496e49d55fdfffb7d93915f8e801c7c204db986b9
 MISC metadata.xml 1306 BLAKE2B db0f9487a62f002883a1850bbf90f5df4007215ce432440023a9c637ec79333576db4ebe4d3275f088a9225848eb508ef1b409c4c67ade051663d822ad5cb9ec SHA512 464c6f6810572f9f9194adba7b85ed8dfbe1c1b3dccafd5370fb555547b7a708768e2f302baa437cd5ab06a9da34a00d5aec7a48bc2903b24b8dab9f42aaa493
diff --git a/media-libs/freetype/freetype-2.12.1-r2.ebuild b/media-libs/freetype/freetype-2.12.1-r2.ebuild
index 47376670dfa1..6c23e071a484 100644
--- a/media-libs/freetype/freetype-2.12.1-r2.ebuild
+++ b/media-libs/freetype/freetype-2.12.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit git-r3
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 312af785c6ad..6a368c745c64 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -2,6 +2,6 @@ AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 EBUILD libaom-3.4.0.ebuild 3246 BLAKE2B d42b5eb01f7383b4f4abc0000614251af08d02e1560babcc41f74d13711d6f3d17205b4fbe82011e1be39ce89a7a5694ea000f26df94676a7d7179bb0737034c SHA512 a965cec35285846c6df630d59ce520f37f423946e6a9130d8af72aaa48e9f80bc8df80e020b73bf4e5be8584e23f44fd054bbb6a0d7fb9c1002de4442b4301c4
-EBUILD libaom-3.5.0.ebuild 3316 BLAKE2B 5616909ee67e77205383b4b831ad33354ad8e79ad3e2f2d578af13eac94e4fd96fa6f6d8ba407bba9339da5ec6bef731fe211f0a4fdc7ed8834001c93b260d57 SHA512 1262d608dc58236ac8d79296932b1a3e57b7319a0694bcbccfd8fad0a4599bce3f8a7e5d87290131d334c1376c51b59c0be5b355e96d7297258ca3d32a65d619
+EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51edf1cd6f34bea2aa42cd42941c7d259a2a947ca063e3add31c532c0ea4a894de212de625241cd1c3d5e928a87 SHA512 d88224575368b6aa4dbc83edf5970e7a1c5bfef9c1500a9b28e3bb91e2d1586c8b86c03a3756743d8e7c5ec63028b269a276572f9a1c9dc9fff5e02fd6b3f5ed
 EBUILD libaom-9999.ebuild 3320 BLAKE2B bf33c13e06959088801581a56cf0b93f80182ab3c3804e3804eee6392cb022584cb393387b3555a66a76ef7ce3524f919fac6112c47803607a0f471924f03df3 SHA512 d31d6dc3d64a5bafe94151de76f2ae335546425fe057c24d9ed61e9f735bc7be83f32752fa5028879b18ea34f2276d85e3a29e73d7f4e9c76d2c37d739a39784
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.5.0.ebuild b/media-libs/libaom/libaom-3.5.0.ebuild
index 8355329eb80a..6f7ae830ed32 100644
--- a/media-libs/libaom/libaom-3.5.0.ebuild
+++ b/media-libs/libaom/libaom-3.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 782e8a2bdd8a..8fb0628f19a1 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,5 +1,8 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
 AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
+AUX libmodplug-0.8.9.1-timidity.patch 415 BLAKE2B b227b051a542879127230963e378419dfec4d10b603d4b0707ab24e9d150d37769763da88db0c893aa08e6ba930013b91a195f8f764dcaa231adbcaecb9bedf5 SHA512 b0a8847698e335b11ae4f729aaa729cf72dc5be3cd890d4a11c258480e9178f20d431786acab22a1edcbadc64858f204a9e1ca6c99e81b8cf9d9dbdc52596dc8
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
+DIST libmodplug-0.8.9.1.tar.gz 238609 BLAKE2B ae992de04e38d341bc561afe042afd83c09bd2d8e71773ec82a2a541db9e462a163b0175cd5307f04a4449b98bd57ab4852e44be04a06f1a265bd728c3434aa6 SHA512 7eca5519369c66d96069f2c56cd087e60fb8c4d04ee994c410b5ab0cef2480fdd95dd0602a01310fd064fade23abfb841a3f5ddc12b31187e23e24f10b780d8c
 EBUILD libmodplug-0.8.9.0-r1.ebuild 842 BLAKE2B e2570155daf60061e0acdab6a8e2d28980c494f9c4ec071f135fbbaa5139519e710a3d9db5e3325a1a660ac0831ca094a76d9e8f35ffbdb429477e5319d80b5c SHA512 da152ef21563f8f9289f5a2f97f6e47eb1cbf814e94994f5f135f425129df81fdb6965500ea7e3f6bb50f127b500d927c000bc444bb72a301a0176c76a3a526f
+EBUILD libmodplug-0.8.9.1.ebuild 955 BLAKE2B 77aafbf6c9787d1090498464d155263b978648e5b186b66de6894f8dc8307e761c34c471e94eb32eeba74e76aa6331ff41aaf24c1e47a239c01427a6c4a13a8e SHA512 448a619bc1e9dca53bfe5ace90636524b0d548da9e6428b888bd3b1e1b25a45ccd9aef78653a71d587653e7cb97f666d04adbf22c3e9d158f01a52014a68b977
 MISC metadata.xml 396 BLAKE2B 5e597902d3b70673452b64143c3adfd810e5040fd19c2e542719755db89bd3d36fe2928c42a4a3195c12399f7318d1d21efd2564558aed4ff214a750e65863e5 SHA512 2d630e3182fa888c31810aac8d1249259df1516dbe267711a8540fb6f9f81373d5b801fe448995b2ed20b3cf0d70d61b9cb8d12dd812663f74d311868fcdcefd
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch b/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch
new file mode 100644
index 000000000000..152f157f26cc
--- /dev/null
+++ b/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch
@@ -0,0 +1,13 @@
+diff --git a/src/load_pat.cpp b/src/load_pat.cpp
+index fe78731..a52dec6 100644
+--- a/src/load_pat.cpp
++++ b/src/load_pat.cpp
+@@ -56,7 +56,7 @@
+ #else
+ #define DIRDELIM		'/'
+ #define TIMIDITYCFG	"/etc/timidity.cfg" /*"/usr/share/timidity/timidity.cfg"*/
+-#define PATHFORPAT	"/usr/share/timidity/instruments"
++#define PATHFORPAT	"/usr/share/timidity/current"
+ #endif
+ 
+ #define PAT_ENV_PATH2CFG			"MMPAT_PATH_TO_CFG"
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild
new file mode 100644
index 000000000000..9aac27f16761
--- /dev/null
+++ b/media-libs/libmodplug/libmodplug-0.8.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PVR="${PV}.r461"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for playing MOD-like music files"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+SRC_URI="https://github.com/ShiftMediaProject/modplug/archive/refs/tags/${MY_PVR}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/modplug-${MY_PVR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.9.1-timidity.patch"
+	"${FILESDIR}/${PN}-0.8.9.0-no-fast-math.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/libquvi-scripts/Manifest b/media-libs/libquvi-scripts/Manifest
index ebb9722a2005..d84f36e89839 100644
--- a/media-libs/libquvi-scripts/Manifest
+++ b/media-libs/libquvi-scripts/Manifest
@@ -1,4 +1,4 @@
 DIST libquvi-scripts-0.9.20131130.tar.xz 322080 BLAKE2B 57a645185ee121e59cca1b50e4952f9abef67ce5b02f65176a23e3edd3ca50e57a6f70ed93dd5be3dbdad0a57b78aa669c386d1806bb3e0c0c826ac84cc66019 SHA512 97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02
 EBUILD libquvi-scripts-0.9.20131130-r100.ebuild 817 BLAKE2B 9747d9cecba4eeef689ba34bbfc5a4f5c175d494a43a86d54ee7901fbb387a51827a759a1f1effe21de7359b624e3ef98a4b372bac14568b49582d3d1c9cd304 SHA512 11ec05193f1814834771789c2a452e482daf764cf287b54757864711c2069beffd1bee00007b46c97594b8abf90e229b6ce37037c735b0079d71438c0e4ca2ae
-EBUILD libquvi-scripts-0.9.20131130-r101.ebuild 833 BLAKE2B 82dd10f43ea6295f6ee5915580da7bac2a85606ad8b1a715e87296131b6acfb9adabb65ff13157214da22c16b4d3d179f77ddf6d1e9490b10a39cd8f0c9e0d55 SHA512 7d514b18075132d6b9b0b9788197b013eff4145b07ffc32624ac191cbd3e2cf6b808d3f0825ec53ce3da9dddeb038bdaa44e6fa8da372ec3cf7ea46cd951bee6
+EBUILD libquvi-scripts-0.9.20131130-r101.ebuild 831 BLAKE2B 0d2e9076d588e2bd26a4781bfa49fabab42d18efcf5e2fc296487d58eb94b2d4e5eab7774e83acbf588149cff92690ad5163e9f662d59956287e870aa0fff68e SHA512 a07f4555c4d906bc070f868e786dc0802e5d11416d06574ea6f0cf0eb0fceb7ca51270383a608db00503d3afba302ff7e9b732a5880a5e55274ef901967567f3
 MISC metadata.xml 334 BLAKE2B e5583410be0753d6b5ae1a0c2fcf29c3cae42391633ee7d95aeb164c26fbd576376821ee2e8fec6a06e1e16e4a4813ff6a04cf5394f2fd2f9476e46290ebf272 SHA512 87faf3e940e97632fa9feb95c519741e5a051e12f3d91f727cabbe1e7013acdd7c9c65cc6a703bcfe0330bf7b3d7790d7f1184661c7f79eb23914662e12425e7
diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r101.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r101.ebuild
index 4dede58b7ab0..2cd2f30e520e 100644
--- a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r101.ebuild
+++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="offensive"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index bf9b3a09c50f..0af5b400b91a 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -9,5 +9,5 @@ DIST libsdl-1.2.60.tar.gz 438381 BLAKE2B 32f00c8f5dc51780bfb48cdfa41ca46ab64dc4c
 EBUILD libsdl-1.2.15_p20210224.ebuild 5059 BLAKE2B 1dc2cdebb3c5053b32b575abb49193c0feeaf1007c7446bb5e1c023b267785cf92c0503793572b840de822ead7936bc3387b890b80370eca5e8b20fc2a83398b SHA512 f676a7866500b2ee49e7da7b7b0d922b51dd9ae2477f847961590a88211655394537f0ddac7fab0b3cf4b52973e192bc15788841f92459d53407392369eb47b2
 EBUILD libsdl-1.2.15_p20221103.ebuild 4960 BLAKE2B 3464a6523798271f547da6a856910d75a123f5f200e36ffb04f4ca77b94d42c7739cd8c6e8e02be0b3a31c381ed485e43d250c2539a8e0ffeaa7dccecdccc5b4 SHA512 ed05b921ae942f7843bf970f9a7d082582eb742980cfdf25556847182ec7cd71bd006108b27e15d9575b4b66f9b04dae3252f76e153f21e221cb3297ee2f06a0
 EBUILD libsdl-1.2.15_p20221201.ebuild 4953 BLAKE2B 54575a80085622fdc111be48175dfe19ee9c95a7bc82291dafaef72bef8333eb8ce6a70338572a73390c6cff74973c27b92fb645236e9fbebe02fcbf4683329b SHA512 dfa19a7c9ff3a75ef79249a8cd15a51127e8b1b735338346746f59854907e56cd67030545a5e94834fb67620987e83edadfbd778d6a0ba8604f6843a8820a35b
-EBUILD libsdl-1.2.60.ebuild 1011 BLAKE2B 88e7878d5c370a56f4063755d385885324b2723783364b3efbbf377a59829ee05cd1151e44f6522d6935fee975c98cd2489e60aefb42650e518820454a62cc11 SHA512 bac11e2fcef8341a2a76aea4c0bf3a1a410633705b5c2176bc59afedf8f9643fd755174f55ebb0ac0893b98751bbbe4e398833b2ddff98123606cd851c3e2b40
+EBUILD libsdl-1.2.60.ebuild 1010 BLAKE2B ce0348dd6a384d9085715916175f0b7b692b6819e2168af98c92ba8900fc9280f39242d9eef7c9973662cedfeed074734b6fffb3b21c407862fcc23f02a4860d SHA512 9b3ff3720c6719809faca291e94cd3316a6dc879398b5e47adea92b5a719f3a29b1cbc22e16f72c90f7ec55715156832b1a521a25fad3133fe67864e356e815e
 MISC metadata.xml 1499 BLAKE2B 8dd0fbe5e6f71338330483fa433316564c420e0cb9f52297fcb6c34a452bae23e25963effd2caa43c099e11759eca3c65dff64b5957460271d27b188688887cc SHA512 be99021a150b521998a455243f68d89c980bf5610bb67d1475746d7b64b009baa83294c1b2ddc101f3c164e22765ce073b9e27c07ca5bbbe9eaa4f75dc4fd305
diff --git a/media-libs/libsdl/libsdl-1.2.60.ebuild b/media-libs/libsdl/libsdl-1.2.60.ebuild
index 7121bb32b6aa..2e5682244867 100644
--- a/media-libs/libsdl/libsdl-1.2.60.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.60.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-${
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 # IUSE dropped from real SDL1: aalib custom-cflags dga fbcon libcaca nas oss pulseaudio static-libs tslib xinerama xv
 IUSE="alsa +joystick opengl +sound test +video X"
 REQUIRED_USE="test? ( joystick opengl sound video )"
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 85f5a47dbcc8..229b790e2b73 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,3 +1,3 @@
 DIST libshumate-1.0.3.tar.xz 110868 BLAKE2B 56d2304208dd41e1c6dc14b76bd6c5cadfb3359576c1c74405851e63be06deaa92bce4fae7bb91855fee53f561dfa84ccbb7ff61eed2f3195d6a93f76e3e2668 SHA512 dc72955bdbe6eee3d4d82dd884c5e74341fa5de25af388d3cc41a368170e4d8f5edf32acdf320e7dde9bc6ace94694e166eafb864887f66a60fb4053d12e1462
-EBUILD libshumate-1.0.3.ebuild 1576 BLAKE2B 8c8181bd1eb91764f155a9447d17a11432b04509b5bb60a2dfddb25e3e180280d8b48ff78b18317b8e5d944aa896c2b5a555970252abd5c76220a1a8cc142067 SHA512 cc2ccdc28f1a2f455866fc21cc9dd2904aead703161f0a217b45b9fc15e7642b495a72d00c40fab21b11f6a7e8d6bf5681d4eb9409b3cd0499feac91dc47a56c
+EBUILD libshumate-1.0.3-r1.ebuild 1585 BLAKE2B 8fe5f3dcffe7899971a8a88884aaa7070bbb2a64620116a5a8743441390f5f931a5186c346a1436f5eebf2a48938ba5308ca57c2175870600fba504e9f3856c5 SHA512 3be14fc9eb6a51a7b64875b430eaf6654b71f8034ff829256f0913395bb13a96db7bc9aa12a9eddbb6bf243af40b750a721e33edf65d6d403cbc9f391e74dc25
 MISC metadata.xml 351 BLAKE2B 0156fcc6cd262dc795ba78bf80f0ff69452458d8fe7116f2e3712f46c31b232cdc4a10a7d1b2fbf566a723ca7bc8a7c61b8299730e702c3bb40c6fa94c2647d7 SHA512 a4944c1629f135d09bc2d49fa0ff8d674076d669d312d7650113b2f5f89704faf67ff34ae0392684aa97459c6117b99ec8fd822817c99a6a02e4959c59dea095
diff --git a/media-libs/libshumate/libshumate-1.0.3.ebuild b/media-libs/libshumate/libshumate-1.0.3-r1.ebuild
index 1f569a3f57c4..87e77c9d22d8 100644
--- a/media-libs/libshumate/libshumate-1.0.3.ebuild
+++ b/media-libs/libshumate/libshumate-1.0.3-r1.ebuild
@@ -60,7 +60,7 @@ src_test() {
 src_install() {
 	meson_src_install
 	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/libshumate-1.0 || die
+		mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/html/libshumate-1.0 || die
 	fi
 }
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index c3106a0bbbff..04070b8981be 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,3 @@
-DIST libsidplayfp-2.4.1.tar.gz 794289 BLAKE2B 828e2d807e40509eaa4f9d2df5c5a2e43ee15176b035f77e9a0bd311468b16460e89ff8fd460ec409d8c84b18d6f711f4a98a0ad7b949c02489ab53c88a4f300 SHA512 8be44c62bb14831c04fbd0a0efe690e8fa80f1ee7150d046055580728793659914b2466b2bf7d8757ddb4c1025ae6cafa2c95830007160fc87dd87dc899bb609
 DIST libsidplayfp-2.4.2.tar.gz 800857 BLAKE2B 1c9471e9e308c1ea5cf544f8dc2c37c637f79aac38d703e0d22dcfd8b18db2b75b98d66ef2aff190b0634ab468fbce1a46de9c65d3b7f02dd40bdc879b20290e SHA512 38b13a7a9740d43e8f6c8a6d410a4f136a44c893d6d671f0f6e66cab7f2e508ab0e108c90213c7fa91389683e0ba4008f36964f7ef455cca56c9ca5366092878
-EBUILD libsidplayfp-2.4.1.ebuild 672 BLAKE2B 2ea17f4a44c75233f5bd8ba7cd273a9c7881385643623c49e5c4513aed5bad0022680ba2f13ad557c5c4c2dbd0529d8ee5d7ba920bfcf411a5ab4e5c6b299117 SHA512 b6555f22398a1c7a1663928a8e579c0380eaf955fae30cc6960b624a3c53354bfaeca39e753cec5331fb0ede00459c45537dea30f154d6e7fd00ec3b9cafc80d
 EBUILD libsidplayfp-2.4.2.ebuild 672 BLAKE2B cfc37b16bfddd7e622111a952f29ca72a9c56a5c6869aba70fe3ab1c1204c051f0cfd70f0375043d83bf79fda48ab9d651872a9d7ef93816b4df9b7b7fd0dab9 SHA512 d322cdcb576f4f36f7211a48cef23775ae9ad4b69630fbd8825d15315db117908958ebc4329d417b905ec9f0a98aef386885a05ee385975967011691f9c8a5c6
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.4.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.4.1.ebuild
deleted file mode 100644
index 174917107585..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-2.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 ~hppa ~riscv x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libuninameslist/Manifest b/media-libs/libuninameslist/Manifest
index ea9122aef47b..cc6bda46435a 100644
--- a/media-libs/libuninameslist/Manifest
+++ b/media-libs/libuninameslist/Manifest
@@ -2,5 +2,5 @@ AUX libuninameslist-20211114-slibtool.patch 2399 BLAKE2B bd5f8534506b55ce42f16e4
 DIST libuninameslist-dist-20211114.tar.gz 1247578 BLAKE2B dd96a81c87e214b7b53549ecfcc0b79388a51218f3e6ecb64786d9acc4c540838e2679c4c0f634c94ca55271bb9f3a4350918bd0071c89dbebbd993758ab5314 SHA512 febd0fafe836a85148aa7ceb87888a5882e7c27968c20595026cd947e9e6c1d0246d6e585510377f0e561d36a194d129df302143c67f59dd3b82aa3d30190acb
 DIST libuninameslist-dist-20221022.tar.gz 1254897 BLAKE2B 36f096f5d8ac81f7bbea019ecb980d7faa1cdaa457f2e51986453d7e7bddc9b18cb5db59c1f01d604e2b727b68435acd51c9d5aafb983a04a615869be9bf1329 SHA512 089306ee544f2bf233b6f7acef569bc8503c291cb35243fa84eff5ba3253cf85505d64b43d8625aca7d2da433b2d2a09f4c6ba7e307d2be106c16df9eef3e5c9
 EBUILD libuninameslist-20211114.ebuild 724 BLAKE2B bdaeac23f3bd1123812fc741f1c5f21dd78cdab32bbc4fbf90404662ca8bf9a1ad60337cd873641810d1e84b3f014a2d0c3af958dada061e4faefc8c767046f5 SHA512 940c632aeae09d5d19eebd978a127716fa541a9eadee0a40a60f31fc743c56c64eb1be44485cbec5e97ca664ceea452ad7affa814bca7d21fe1bc824491c27fc
-EBUILD libuninameslist-20221022.ebuild 604 BLAKE2B 5f5f2afb6e0f55d0c105c051256a349eba91efb8fdc313dccae1d6eeb24a457d59dc68d785d8cb36fc052180d9190b57d4197ace83d4580fd877e67d7824b8cf SHA512 bf977239afa93ce74437899bd2105e2fef81c92a4a0eb4f8fb6280e784c4d49f893e86b9e83b321325418d1867663cfacf3dd18038bb058540c8d010689d5e50
+EBUILD libuninameslist-20221022.ebuild 603 BLAKE2B b021e1d7fc9c177b888fe91873b4a7739510623495f35b163c533335e224dda6468d5c7d6d6115ee91c1daacce18f0309a4fc833beb28e4b257cb3773dfaa04d SHA512 29c7c547b82fc4a0e049c12f78a0fba346bf11ef819be77f1f22a9617fdd1d23288808c5f9b1f6dc170b631417206b091d739b5af509a8a835a77a6a6a9f0562
 MISC metadata.xml 484 BLAKE2B c5aae59be58a06431b5c19c32ac89ebc77a2ca93c37e98b834e9adf11e7c4a45e7655d21621929b70fac24cc4121f50dff17e462d1d782942215aaf5cffeabe2 SHA512 2bcc9f45999095ed409b6a77b66b827395371ae177c6496056936cff949339d192288b430ff631aea20ced5b107268afe63284919a3e90d0f335427910e18f7f
diff --git a/media-libs/libuninameslist/libuninameslist-20221022.ebuild b/media-libs/libuninameslist/libuninameslist-20221022.ebuild
index c5ec437ac8dc..662337b42b6b 100644
--- a/media-libs/libuninameslist/libuninameslist-20221022.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20221022.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/fontforge/libuninameslist/releases/download/${PV}/${
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_configure() {
 	econf --enable-frenchlib
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5588f1bd693e..5c82dc52d6ec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -10,7 +10,7 @@ EBUILD mesa-22.2.5.ebuild 12662 BLAKE2B e7fec8b5b563e96173125e559fe4bc8222e59f83
 EBUILD mesa-22.3.2.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6
 EBUILD mesa-22.3.3.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6
 EBUILD mesa-22.3.5.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
-EBUILD mesa-22.3.6.ebuild 12376 BLAKE2B dc3dbd549319a17784a0d8ccf72c18633b73b1351d848c4512cfd0092a1653d7e287600b822daf1b75138d6a305e9788634a637feaa6cf7a6668883b7ce8c720 SHA512 31f8d0f64eb8bc74d8cabc8ea28ac3a49f2adda1fedf9983eb0c689dbb1df6edc79ed29d7eb2064320e015a9f6786e9af73499181eaac6aa33b4f09eb67f34d7
+EBUILD mesa-22.3.6.ebuild 12375 BLAKE2B 5427698047a112725050e8152499b4656def79c2f2747bcc0c3d7f61644adffb5f31b2b51bc1f19fa9ae1857f32321a6123b8deac69261c135fa0ed511b1987d SHA512 3060948ddd1c209339c41f01d26c89221733c0ff4f5258a7435ef37d61dfc35cd74a35b19de928b5f7826a143826ba0fbca417b5266e81cde400e767febb5a62
 EBUILD mesa-23.0.0.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
 EBUILD mesa-23.0.0_rc3.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
 EBUILD mesa-23.0.0_rc4.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
diff --git a/media-libs/mesa/mesa-22.3.6.ebuild b/media-libs/mesa/mesa-22.3.6.ebuild
index 6f8b2c21dab7..a9ba50b52c7e 100644
--- a/media-libs/mesa/mesa-22.3.6.ebuild
+++ b/media-libs/mesa/mesa-22.3.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 3007b5f4082e..d39dfe4ae7f3 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,5 +2,5 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b3773557
 DIST shaderc-2022.3.tar.gz 223478 BLAKE2B 6b00677464a916618f0f204c650a89a3a74fcfd463a4e9476f16f8ff3f1079979da2e42f30dff93ddb1d509cb117c03e50508661f8de892157334ad0e477fd3c SHA512 a0ac3350defb89e39de79eba64a3648d24fd4d764be2df3193cabc1976d4a8f6bd8ebe296b02cc53788c8b74d66e8bcea3fe1266f7ad1c7e0e5a0d70ecb842ee
 DIST shaderc-2023.2.tar.gz 222452 BLAKE2B e827a4b408fa70142896ca6c957d2569a364ca426a077ef75bd49999057d60c179ca2ba6374d1b73ff12f839b2c0ca94dcae4b466af4c6b2c6c22b11c151b113 SHA512 8d0c05ba766d2e102062233c02850fa42c19ebaac33a6aff31549a3b12c34f5c6e44ce2c368d9bcb28b09ba8bffbf398711ca61890d7745a716d016f17f9fb84
 EBUILD shaderc-2022.3.ebuild 1881 BLAKE2B 619f051d6cae80d1a1c549feabe842701ed3fcfb068373bd67fbec7cbac61b744fab621231e67bf84fe26578b0a4556e4187e459c77628d40260189d06ebec39 SHA512 d9e685805533630b631507ea3be9fdc8b6b63ada79111bf29963bce54415741dc7c8e9923199bd062b3618dd137a19ae163dc27f3d40908ac867c8c57746a232
-EBUILD shaderc-2023.2.ebuild 1882 BLAKE2B ff611437b469843e8c3b4da029c202002bb78e855c6dd6c6ddaff6cace1d42175f604fe9955500937b38337b49bfb4ed4dcebe31c78827a399b779dc152ed960 SHA512 ea77b6b2783c42996d02a5f23f89f1f1fed1524b4ea62b12397a49d3738b965ada7cbb2f4b60ec6c55833d5f05a0443c575d52af6b7b58b945d68e23828c5b77
+EBUILD shaderc-2023.2.ebuild 1881 BLAKE2B a4d47327083650f4e51841942ff69aa1b485e26c4443e78e8e9bd8547f3198d5a93c76b957b4d0a278a7c344b38f18990840ce9733e04920b0d7d9804313df5f SHA512 aec96e572cc81f7eefd6850072c9ee6b217c68d3b492f4a0265d64530e15b1cdf3b96ecff21b264a636dc4a78dbd60d5a723f3f5a6db81d05c347705102df03b
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2023.2.ebuild b/media-libs/shaderc/shaderc-2023.2.ebuild
index 3dde7114a657..c068bd989c6a 100644
--- a/media-libs/shaderc/shaderc-2023.2.ebuild
+++ b/media-libs/shaderc/shaderc-2023.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 8e2d38250057..5086d5436356 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,8 +1,5 @@
-AUX vulkan-layers-1.3.236-Build-shared-libs.patch 770 BLAKE2B 2d1993ac077cab2b7de5509bf82ae57ec8783e0a9759718fb38884740eb609cfa5f8509bf45f4bc9a81d92cf8f377c3455cc293fe3c0ba75d3388028e041a598 SHA512 e59d13680f53b51755954f68c7389d873e205aafe16ae6ca11a2c3137cce39ecfecf37be1aa66fb6e5bd122dfaafc6eea507bc958dd68e569274576fbdd83999
 AUX vulkan-layers-1.3.239-Build-shared-libs.patch 754 BLAKE2B fb86f678b9b2b76642ec3fccdd3068b9f4da2dd55f884fe4adb83b02090adb1c992a2aca853cf7b716a0006f8ff2cb2660070220b54c450f5333d5436c4b93a4 SHA512 d82a8b4ddb542b52a49c6fc83aac5af5b598371df58699838f5c646efcbd10b0ba54dd163e3c223b54f276f2209f942d65d7d32aef42d395a154cfb7aadd5b33
-DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479
 DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c
-EBUILD vulkan-layers-1.3.236-r1.ebuild 1576 BLAKE2B 11392cfe2d07d313b2a64828240371fecbb990793fc46c59c795d6158e81ba57b8029c46de31f826b2653febeb08bcfdf28a4e290f6e2dc84e72d549adb1e05d SHA512 01040d2fcd1b4dc563b55b48f7c89bfae8ef551b342fd1e79636913511f2368101ff2768c0f65d6886eff1b43589d72d5b14db875a0531e8e87b7b8b57e826f8
-EBUILD vulkan-layers-1.3.239.ebuild 1481 BLAKE2B 9d8a5f89c617acd533eae746ed7d9874738da01e59861b07617a94a5db79f813f1d7ef832d9a73353787af7b51181b1e3270a54ebf11fe19353dce521c71c920 SHA512 c3946a8251e9cabd345eccf1fedd289a49d0e3f12401faae74a46bd583c3e168c70b86aca58249906a90f6b7bb1f6033feeae1af329b9c54154fd924bf13fa3e
+EBUILD vulkan-layers-1.3.239.ebuild 1479 BLAKE2B 830d065c5956333c011b567ad9910b20a7c847d4eb59afee1f3219495a602a91a023a3e1e8d71b08bf2b0f5990a50b5126e41a5cc8917f2bb6cfcaf40bb9b3c1 SHA512 ecf247f0f9ce12744ba0db4f4bc378ed939a912ceea8341776a7553377d9260de36454c3f60195814e16ac6c20fd6400e7fe24e1a68a0be576ddde2d014caa09
 EBUILD vulkan-layers-9999.ebuild 1497 BLAKE2B f26dd0190f0de2852f4010cca9ee73d13b45d35254ef37812aed1f6efced6c0c2014ec1ce2627344b72e61d0a2ea0d37413614406db91113e0f037de4c9bbba2 SHA512 fa5cfaadf3bedc0894afdacf5f9552f3782119e4fb3974a9bc8ee3d34929232b92b629239faeac3a91982b32e2e7a4c79e6b920677334d82d16818dc76bbfd6e
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
deleted file mode 100644
index 18cedb517b09..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f29022f96..cf34d8e21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -255,7 +255,7 @@ endif()
- # files directly in layers.
- 
- add_library(VkLayer_utils
--            STATIC
-+            SHARED
-             layers/vk_layer_config.cpp
-             layers/vk_layer_extension_utils.cpp
-             layers/vk_layer_utils.cpp
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 96d52b5f8..3f75aa3a8 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -226,7 +226,7 @@ if (NOT BUILD_LAYERS)
-     return()
- endif()
- 
--add_library(VkLayer_khronos_validation MODULE)
-+add_library(VkLayer_khronos_validation SHARED)
- 
- target_sources(VkLayer_khronos_validation PRIVATE
-     ${CHASSIS_LIBRARY_FILES}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
deleted file mode 100644
index a7c08b8ebe2e..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-cpp/robin-hood-hashing-3.11.5
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WERROR=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
index 084ae5b0a9d1..c9a23ee7d23b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 0e4bc2ab67b3..976271bd2769 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-loader-1.3.236.tar.gz 1646230 BLAKE2B dd4448f32ef6f9ba25cb9bfd07549213ce787bfe21fd7d677fed55940173f583457f9082b75a497f4849afa3584fc147f3973c8d59f2a6a10ab16a10753ad5f8 SHA512 d80f979775e6a98b1a68e079b825984a03c76ecc04d9a8e979ff751f0f0825234662b15f2096a1c183f35bce8a1cfc16dda3238ad8f192f1622da74b9ee4e078
 DIST vulkan-loader-1.3.239.tar.gz 1646819 BLAKE2B 050f2e343295a367c42eb746635c1cfe05e01e1692ed11503f55efb0387aa50e3dd0f529d2212ec3a2cbbeca05fe3e60c8ef84ea66e3615582aaa370621da43a SHA512 2de62bb2997021609426c5f019e6cd1584d490001d5d436751e5e0b42107e6edfefa4dc054bce3e1860b8ba9a8bbdbf141401891415f07b48d4dadd6831a8171
-EBUILD vulkan-loader-1.3.236.ebuild 1744 BLAKE2B b60a27d27cbc4b9883aeab3f0b7c412e146410acbdf6fafc03aa21dde2633784be69ecbc9825f1965d3f4de4096e761909ae4935bb3c989f4442d29113029e6c SHA512 8688ea26b0e9fab81bc2f02d7283609c6f180313e8051d68396c5e8e02a2f14c16017a5444f2ecfc364d7df67a1d215ab70844fba1bdccbd5d0469214df1b305
-EBUILD vulkan-loader-1.3.239.ebuild 1556 BLAKE2B 104b1b82922e86e57c7976d843bc9697bf61a471fa802f217123cab3a9297dfa31a5c7aca47537a575d2a49e10d014b607b90b1bebfc56ed64300f791d8af2ca SHA512 64fd844f23ceb064a41b4293026595ff1ed6e052438c19c347a057af0c4a2482b933f3a120cacf1bc8cb2e968e22e790104db9a8c18dee2bb14a0f8aebd6c490
+EBUILD vulkan-loader-1.3.239.ebuild 1554 BLAKE2B e27d35577aa89e029eb29764a73ecfa275373c99257175b708776ac6dd765f4e056b2904df9e1c7ba95c3d3e81c3859cb8206dbdbdf75d72d06f49f5932ab85a SHA512 6bb68b91b0cb1aa75dc5017b6b5d45e24a185f04d623f2f672be62774dc3d27c6a9a560f463c713d34a85c7dc8f486fc5a909a08530fb7452a71cf9aed0ce354
 EBUILD vulkan-loader-9999.ebuild 1584 BLAKE2B 4eac72c8b9de1c8721ccdfc35ccd31bba3cb6b41cc06f66a8410c2eb9103d9a1df48b6509a237cc8d7a453a5ffdf39047e550f7a1e3a13206270b27786b27bfa SHA512 1031a3d0c76afd82d3ae5e7b3b22ca3fad65d8034709db45ba3ce9c01750ae92fcd2e0102639bc9bcf90b2037ee3723a2496cdc11eadd0219549f00418a1cf1c
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild
deleted file mode 100644
index 5e198e862d12..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-		-DENABLE_WERROR=OFF
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild
index b842466ce78c..9134cc68f453 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
 fi
 
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index eb1b751e26ce..667c5ccd166a 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,6 +1,8 @@
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
 DIST waffle-v1.7.1.tar.bz2 305830 BLAKE2B 8be098fa957f3d9cc84a72920e58fcee9ca4ab0b23a6d93b6cc7dfea17501448ff44a41c42f4c06ff81ef26c0041258b8709bcaf8abb4a593e8b3ac21e2085cd SHA512 e2ce6092c3088d0c4e85581700096954ab4f644e758b8639d2e9fa91771d2d964cd028361d346c9ae9c4ef185e6fc4c59acdee4480ee6ea6436f0d4bd61581a5
+DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6 SHA512 015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
 EBUILD waffle-1.7.0-r2.ebuild 1606 BLAKE2B e986f97e87ca173d21babe3699a5d56e41aa78c4feb94d97fe7698af76bcdf6ac505f749a5d8c3084279f126d99af1facbdb5b32e19610bbbddd8bf9b21d1f2c SHA512 51caa025dc551ac3928158f477f1241b972b664edc90f5f9278ec67255a51857b347b3a4155cdfb35d72d4da3019d9b4b37b77ab6c0d2360d7572518ac4c1eb3
 EBUILD waffle-1.7.1.ebuild 1810 BLAKE2B c0d62779a18a82cb4e570cb500531199c736a02b448b341568e34f3900e8becbc1d66c13439168f4ff3e3e277502ba3880ed3f798c78817d0306070eff03ebd8 SHA512 88e8335f4499920a8466e9db732b4644f01b0aafc5aaad8285ff312ccb51eca7eb5f47ec04acc759340d4389b3a6c2deefee376ff85058f1f4f13bb4f7d2f3b4
+EBUILD waffle-1.7.2.ebuild 1810 BLAKE2B c0d62779a18a82cb4e570cb500531199c736a02b448b341568e34f3900e8becbc1d66c13439168f4ff3e3e277502ba3880ed3f798c78817d0306070eff03ebd8 SHA512 88e8335f4499920a8466e9db732b4644f01b0aafc5aaad8285ff312ccb51eca7eb5f47ec04acc759340d4389b3a6c2deefee376ff85058f1f4f13bb4f7d2f3b4
 EBUILD waffle-9999.ebuild 1810 BLAKE2B c0d62779a18a82cb4e570cb500531199c736a02b448b341568e34f3900e8becbc1d66c13439168f4ff3e3e277502ba3880ed3f798c78817d0306070eff03ebd8 SHA512 88e8335f4499920a8466e9db732b4644f01b0aafc5aaad8285ff312ccb51eca7eb5f47ec04acc759340d4389b3a6c2deefee376ff85058f1f4f13bb4f7d2f3b4
 MISC metadata.xml 532 BLAKE2B c0c240a536c012ce3eb478dff1af25d8ddb0b9ce0d565df3a5a82941179c661552d3b6616c2851344a8c47c1a3b568b0f042e003e6133218be46313262f47d1f SHA512 d75a395ae334e6d3c364db676a654939560d591cae77c2ccc55d4c44474b168a9922b68c01349243a899feb0214d057c260f64a6a5029ee292cc86f6ade01906
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild b/media-libs/waffle/waffle-1.7.2.ebuild
new file mode 100644
index 000000000000..9dd3bad563e3
--- /dev/null
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson-multilib multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+	>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	X? ( >=x11-base/xcb-proto-1.8-r3 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/wayland-scanner
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		$(meson_native_true build-manpages)
+		-Dbuild-tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	rm -r \
+		"${ED}"/usr/share/doc/${P} \
+		"${ED}"/usr/share/doc/waffle1/release-notes || die
+	mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+	if ! use doc; then
+		rm -rf \
+			"${ED}"/usr/share/man/man{3,7} || die
+	fi
+}
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 8745944e4fda..f2a66bf69868 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,4 +1,4 @@
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
-EBUILD xvid-1.3.7-r1.ebuild 1632 BLAKE2B 67229fe865a4301bb174d128aacd2fab4f5b1f2e345511d0e00908bb224a9a88836c0f76fa467b6ff21be7085281a4d7952ca3854678355132848d5780d03092 SHA512 f7e3452256d26ff2e25aeb8dfb05c2388f82ed261423eadc91ad36f93a2bbee7302b2181f738c79bbb1ddc80e82e52848fc2fb586aa4b56d68a832159d4fb61d
+EBUILD xvid-1.3.7-r1.ebuild 1631 BLAKE2B 920f9ee60580f9d7e5ec004061c22e16633633e49f6626f953aa06b4b633fb3e4a141ce2a60f35837f45f60e5921168124cad798aef796e40c0371f68411a284 SHA512 e457caaa017673a62df1d50c7b8a090fa540528f78b6c8275e669b3945f2946bd647abc9f1e7b6abe2b1cf1e96fa390489811825f9b28c3a9473bd49de2a6caa
 EBUILD xvid-1.3.7.ebuild 1642 BLAKE2B 097970f3a38ab0a72b8e840c16d67180dd73e703910c51d96546507c80744a6cc9a25fbfdfa68823cf0c705be2993c2dd41b08008bb2d8d12330bf4a036e089b SHA512 50dd399c3c851abc650c7f05af7b36cbd13a8173aa5c736aa356d4b9390d278023da5031a9a02a0d58775a6ba5039acc6e14685f279c9d74287f74b79a436f2b
 MISC metadata.xml 322 BLAKE2B 841709000ce38ec97e44a9223e6458abf57618d1f858f31d2a31ac190495fa558f4b7d9220b11566dfd927643480001bd14dda9497fe3fc1f8aeba38ce4f3822 SHA512 a9ce57b28bae87e53a402ac2ff8ac3dc6c8011fd72d528c371b4b9107613a81829986646940140862e0ff7ce475773b35da771a5fa043e0ced9a34111204891e
diff --git a/media-libs/xvid/xvid-1.3.7-r1.ebuild b/media-libs/xvid/xvid-1.3.7-r1.ebuild
index fe5345e15cdc..0befe0945c10 100644
--- a/media-libs/xvid/xvid-1.3.7-r1.ebuild
+++ b/media-libs/xvid/xvid-1.3.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples pic"
 
 NASM=">=dev-lang/nasm-2"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2b2f6e99ebcc..6cccc432f988 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index d5b4bf4a4031..c1b467da3676 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,6 +5,6 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76
 DIST alsa-utils-1.2.7.tar.bz2 1562595 BLAKE2B dd8821c510a98d76e2986d59c01516013f01c632fb6311e6ffd2b10eabbdd68312537d977b1bf2ab48e0f181751ecf58ec1c1da3f8d4f7ee84d8f2623893a091 SHA512 1be8f617315193e6033653ac96a14bd1c3272cd9d8f3776cdb1357f35f5353652acd5975cfc5bd16278cd496f5bf409bb60432818a526282edad9a4c718a97c9
 DIST alsa-utils-1.2.8.tar.bz2 1560162 BLAKE2B 4b9676957e775be51076b4798dfd384db4eea440c682899024034d3dd593ba24f1d42b8d742c312e041a37f0dbbc12b16635d79f6e6633a3459cc21f80739b5e SHA512 882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b
 EBUILD alsa-utils-1.2.7-r1.ebuild 2513 BLAKE2B 1b6bcd11aa55710907940a1f28713bfe8ee2a871ead905858d1fae1069bbca4893a9bdcfaceddb1915fb8d80cf127eb45f02d9a55b25a9c7dfcb9b7b63105f36 SHA512 1fe83211234f6bbab673150b19775b9aa9d0fd2303b32240c698bdfbb9b8a6a0db8637093e2e29f302985326f147601b4b20406613cd4ffd3c4e655b8bbdc208
-EBUILD alsa-utils-1.2.8-r2.ebuild 2500 BLAKE2B 44bd07f8de950cd4f57c576d9566a01131f05cf7c1c2da05fad9392f24b7e1a05b818a730823ae764422e15d7b5a5debda29d956e0dffd805d81be2bb9238082 SHA512 7705d860e814eb674a9d3b6223189676084f1a570733e621d344131632dd250b752cd5dc41d4af4f3bd255e0903b03949949be88ad7a8af812f114afdc4196bd
+EBUILD alsa-utils-1.2.8-r2.ebuild 2499 BLAKE2B 8d0a943bfc5ae495db632ccd4d4148a2fb145184942cd3de6980de78cc0207d6a5cabbf7ad67b4e1ec708dab03634eeb49dbc96098cfe21bdb0f6936bcd6b5f0 SHA512 7e7e8d8dc15bcb1398d1d1adccb02960d65d116d26d41348e1a9e9e3fd7fffc4bfbf093b2458f5c5a152e2d9ea550140fc06d8e294aa62b1b86545afacf193f0
 EBUILD alsa-utils-1.2.8.ebuild 2508 BLAKE2B 8133bcdb855be091b167125d55c350996fe2d07a3d3cf503da6005abe5ecc20de7b1d94017b4db8d97f7c24c6e0be671731f5c583328894b655d7e67e0cd8c41 SHA512 8c28e46fb314798294235817746d213f7c4323ceb4f3619d8b5c459819c81782c00001e439f56b5d2d395aa2c935415c576ea5323b56abb8aa52ad28a3a358c4
 MISC metadata.xml 630 BLAKE2B 297896d48e1b947e3d8fdb0e8508846ac5f11740101a80d1d492e8fdd6bb042d629c654583d3262c00a0e33d31ecf3b6f4b3c07c73ede339b4ed168d4c5deae0 SHA512 1e26d146329b58c509ee8a9e6683bd0bc15651d942a7d400383106d3e61df0d3148322bedf0d10e445db74109ee1ee759310eb72c5e3fb1ae4ec258892d378b2
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild
index 1bc69ef78600..3c341cd1232c 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
 
 DEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 7772784401e0..c09b0c633b19 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,3 @@
-DIST mpg123-1.31.1.tar.bz2 1093324 BLAKE2B 47a845a5909874fe1e41a3a6b0ac57973f7bba69517b4ce6204a68f9f8c93b079062407fd6c1a9db42b8c7b483d3ba95a7257d1a8268b03f858f20d3695979de SHA512 d007ea94a99fde60919a173320e124c9f0079a28452533eeceb9c7bfed43810b46384ae45459ef6ac185e27ec06e153723bb588aaa4955ee2ad1c51dc58eb132
 DIST mpg123-1.31.2.tar.bz2 1093881 BLAKE2B a5c2d0a5df6067322979176498592a429c36fa06000b512e944b1f6ceeeae29fa3efeb0e5d604c8f2930aa51ae75e53be4312abaf74e43504fb1643b66b8b682 SHA512 eca285382ee3e780353834addf1336c4a2f8f11256af22f95e11efa243de669761c083c86ddfc6ac8c02a920a3c4ab4ad767efa2739fb052e9719f35ef407bc3
-EBUILD mpg123-1.31.1.ebuild 3019 BLAKE2B d90a13f1c47e1375b151b43d6ea7c3487e96a2248bc4a5285c5e2aba166df4e64bd7881b5e24878dd3fe1dd6b32e307ae438131feb7ed3c1d9210941f21a932e SHA512 922ba2273f62408348138366e6936496463b9e78ebadf255d49bc7cd258997ec4c79d30ece9306a57defb50debdecddfd9ffa35e0399627a2df64c0b7eb401ae
-EBUILD mpg123-1.31.2.ebuild 3020 BLAKE2B 71320c88ba28b7bc0cddff9a9dabf021015d7adbdd47f7eae70f5d71e581dc2d0e93c05e7a3a23afdb8d2252ba3b0360205fd47e601f6d35011b77b6467f1f6e SHA512 e2aa5b421dcb6f9ba0ef3c6a259ee6bbf06a26f890b6a0d85173ecbd5ecaad414941cf0af71bbe43a414de898d40d6c07488cb002e0acae82736de2ae44cc54a
+EBUILD mpg123-1.31.2.ebuild 3019 BLAKE2B 3712b6b382b3a26171cab36614d69bbb56b726f2557622ff1bb0fc3d125f4f605ce1240fffa682fa443f91d859994884ee68dcfe5b86f2f9b064b53a9e5529ab SHA512 fdb82d8cf805c019c08df24bcc7eb51acae4a8016c216b548e8e64ce5ee4e2fe7b1b1b2cabea9d2e730e82334dde23c846f8a7b0b9d76e96a805ba62ef5f6e02
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.31.1.ebuild b/media-sound/mpg123/mpg123-1.31.1.ebuild
deleted file mode 100644
index d82fb18c0931..000000000000
--- a/media-sound/mpg123/mpg123-1.31.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-IDEPEND="app-eselect/eselect-mpg123"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	append-lfs-flags
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.31.2.ebuild b/media-sound/mpg123/mpg123-1.31.2.ebuild
index 110b28d69ac0..f91c7af69bff 100644
--- a/media-sound/mpg123/mpg123-1.31.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.31.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index c83b0e1707a2..bf8991fd88a2 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,10 @@
 DIST strawberry-1.0.12.tar.xz 11231600 BLAKE2B 7c65d3f0a7418bd4e4ec2d5032406457066f3402efd9f2632f378c15d0c549ab516a8d09dd6d31e2e5723af36d1481614a2b355404596f2384db397ce52495ca SHA512 f29d9d59576788cfb5521a4394dd16501a6dc277c70ebff3629dc891ae70baaebc98ec07f4eda281ac5ebc6c8693c35a5a6611e014d27850beaf20125601e5ce
 DIST strawberry-1.0.13.tar.xz 11232884 BLAKE2B f2762a280ca00d080836f2d9a201161588119f26c59bdc6d5a9fd2bfc98d8dc64110e675fb8860cecd44a1406e0b869b14793644a8cfd01316b7ec823489efd6 SHA512 b870252a3abcc6accfc7b9b52563573f42fb65d8322880bcd6558a083d8e12da043e5967165dcdc4714800ce283e837c68cbf3a61a5c018a4978c7b7b5b39bff
 DIST strawberry-1.0.14.tar.xz 11234760 BLAKE2B 2dc0d1cee93ffa130da403c986c147f5d3eb59689079a0450183edc53947f7472ea5ff69c57c8ce971f03e89896d06c51bf22bcf57f97adb97067c8a35cf0e15 SHA512 bf667cb93b8f0ffdb8dc625df821bc4355e3845629ff25ed57d7999e19072edffab05f27dbea90adf0bb9a9cbe478856a292a1a6f7ed2c5f37442548699a4c02
+DIST strawberry-1.0.15.tar.xz 11230148 BLAKE2B a6ee4dac23dc3c4707a6b31f39bd794975e2c8aeab438419cf2972a1a7f3b9bf54837550db542e2c19bcf08346b04ec9d952e84529865e067c5e7df0a9e0189d SHA512 074b3da1dea22e1e21fcb1039d77e9edf898953ff0a16b28d4ad36052b454e669a4a92e988f1091e7987104149764e411ca68bd95b5f1e18f3e744d2c7dd3625
 EBUILD strawberry-1.0.12.ebuild 3019 BLAKE2B b35558cf019062a6ba15ba7f837db388299ea48a3a881c6dabd59e798caf2830df4f765d7dfe462439d886869ba576ca0cd7579d998b42daf0b1e7e6eef7f689 SHA512 5c58c3ed1ec917dbd6e620a227a4e9efffa08a5e160a9875ffcfa713fc3c7552f66f2d227262c91fc6aeec76d0f3b055c3e5720c53520b6e9b89a0142b65f18d
 EBUILD strawberry-1.0.13.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
 EBUILD strawberry-1.0.14-r1.ebuild 3076 BLAKE2B 350be6043994cd9086c488a3c3272fbef5fef56d4bd21af7a423f3b83ea4ea820db13e5d4f2c683c22105777c986bca18ffa044c66470da36b852b1671b1f34a SHA512 a1a44a9c4ab9ffe060bcd143845f0ce374bd72521d0abcea099a1fc49c8b583c4c58d929dba54652cc3361fc343008ad77770e6a8de121ab07cd5872ce2de683
+EBUILD strawberry-1.0.15.ebuild 3076 BLAKE2B 350be6043994cd9086c488a3c3272fbef5fef56d4bd21af7a423f3b83ea4ea820db13e5d4f2c683c22105777c986bca18ffa044c66470da36b852b1671b1f34a SHA512 a1a44a9c4ab9ffe060bcd143845f0ce374bd72521d0abcea099a1fc49c8b583c4c58d929dba54652cc3361fc343008ad77770e6a8de121ab07cd5872ce2de683
 EBUILD strawberry-9999.ebuild 3076 BLAKE2B 350be6043994cd9086c488a3c3272fbef5fef56d4bd21af7a423f3b83ea4ea820db13e5d4f2c683c22105777c986bca18ffa044c66470da36b852b1671b1f34a SHA512 a1a44a9c4ab9ffe060bcd143845f0ce374bd72521d0abcea099a1fc49c8b583c4c58d929dba54652cc3361fc343008ad77770e6a8de121ab07cd5872ce2de683
 MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/strawberry-1.0.15.ebuild b/media-sound/strawberry/strawberry-1.0.15.ebuild
new file mode 100644
index 000000000000..640a70a1fe25
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.15.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/taglib
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/chromaprint:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	icu? ( dev-libs/icu:= )
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+	dev-qt/qttest:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DUSE_ICU="$(usex icu)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c7325397395b..0b6fbda61ee9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ed4c6fd7a205..3b95588421f1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Mar 2023 10:39:47 +0000
+Sun, 05 Mar 2023 23:09:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 09355978e89d..eaef808351e4 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-03-04T10:39:50Z
+TIMESTAMP 2023-03-05T23:09:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQDH/ZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQFITlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klClkxAAjCz6/lzPLK6r7gif2tvCtMhcBkBf2ZEaVRvWYhzKMk93zGwkf19kgzy1
-ytcFQihnrwla5GmPprCOYu3CYl1Nv2Uk2uYfCiazsdug64YNO6jgSobtYrNGMDfd
-oWavVh5eeQTa30nh9Bx7yixKkirTqV+1bV/VYYMI9WzsjRjeKbx/xaJ3fZwaxU+2
-6HHVAePwqEsW2VhwKN0dXJteTeURXnjj8N1GUOKbeWZ4V0K5oJa5JYq5cBC0LF3O
-yr35ZsyEGBeU6e1pwaX/J7T7/IQFFpSBlYgRVtgtuT1XvIgdolbG956x0w0mW2Ih
-DTgd3CBQUTqvMOxQeLvhaxI+g05mAJ5fKkTzEdCa5hSSEawNHF/IppHIdDppPhvf
-U3nOKQmUCTbBtSYKBbwd1ZLSpispMiYnKfqnh1u6i08dVDVMYwlqhh7GeuDrTAkz
-MFkSlvI16dJ7uRdjiP0gtBzC07PfEol+p5EWVyuEu2SYmG2CaFSAn3Ba/GvU3TV1
-HjjFJKqVcOBYgx5wKLq7X8pU07a+YcOdkC7GKwfmLnojroXDBgnbENFwRJMx53qV
-IrKUjdQCNHFrswZyK7W2f0B0f+a4IvJVGI64CyJp78qEYt+upCtI1TsCVfBASMn+
-P2w0zTGoT+rWzmjoj+rcxYUkDFwznbLRSafcCGEOYyMcj8MP5CQ=
-=oI4m
+klDtpRAAplx9N3sqaceFH95SFEJogJftzOtVHWbxv7WhzZrMm54cNOQGfhRPnaST
+26gAHdEFv6ALSRywOj88i9/osN+dTP/esAWxKCRfoZHMUNELNlDF77B+9O2+sYhd
+Isyr+FL5jZnaq0a7zIs84cYCiG/NtGg/nLue1KemxDqBS2Xtw6ElR8vQSrVvvjB9
+sPIdecZl5g38QfOFjc7pAItMW1z5ZMCgnBB7GFLcqr1z0CPYIuGrXcE9hHcA9JVC
+TkGqeznNSTlVxkQYGKN4DSoyXUrjEJERKqI6148lhJ36+5yV0mlLaBKDsktNAYN6
+OrBAOdOGMAhJ9977ASrYy1CdBfeJBINZsBcZnmm2/qVe6uwJv/ZPUUQEfbMOvjSr
+hPQyEutCExKA7THyPTL77y8f0pFKKkjCXoHuVnmy7tvoxaMfaR2YWAubCTC2p+P1
+t9j2SqgyR5V8qLMH0l1P3nXEnTV4Quhw3xmkYX5V12Ph6m4rvj40odCbTq77gHA1
+BQeSl5szF1+aEwsAPyxsZqid3v+0lsJiQRRQ+GAB9u2WxuqsP9kjc+wECFnmOMsu
+qDkKHgv5q/9rgwOoZUphjt08zzSRbO6AKtKwmAeYz8b9Bzdt2dT3Ey1HYoMHnIZP
+DZNkyTGbPK74YiVsDxUDtIOhLksECSQJNWtOOf+/RVEKIwXZIfk=
+=9QvC
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ed4c6fd7a205..3b95588421f1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Mar 2023 10:39:47 +0000
+Sun, 05 Mar 2023 23:09:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 608e13efd1b8..357dd519cc60 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 971bb4104e2f..13f546b17fad 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/nginx-unit-0 b/metadata/md5-cache/acct-group/nginx-unit-0
index d03363618ddc..4c4888c1d1ef 100644
--- a/metadata/md5-cache/acct-group/nginx-unit-0
+++ b/metadata/md5-cache/acct-group/nginx-unit-0
@@ -5,4 +5,4 @@ INHERIT=acct-group
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
 _eclasses_=acct-group	cddec248f22a6688789ed427b5d47ee4	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=24b3a654ef00e055354bdd16fcabe57a
+_md5_=7175a3c971d7f7decdfe05e160cab9c3
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index b667607c9d80..23d4e262e763 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/nginx-unit-0 b/metadata/md5-cache/acct-user/nginx-unit-0
index a92c74a0a5d5..32d949601a17 100644
--- a/metadata/md5-cache/acct-user/nginx-unit-0
+++ b/metadata/md5-cache/acct-user/nginx-unit-0
@@ -6,4 +6,4 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390
 RDEPEND=acct-group/nginx-unit
 SLOT=0
 _eclasses_=acct-user	bdca122e03cd10755e7ed12b03562501	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=542cbf1964c7821f2b29a912548ac508
+_md5_=64529f54f97b88f633355de9c0b932f3
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 8595b129387f..2cc5217789fc 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.80 b/metadata/md5-cache/app-admin/awscli-1.27.80
deleted file mode 100644
index 736f21cb7500..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.80
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.80.tar.gz -> aws-cli-1.27.80.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.81 b/metadata/md5-cache/app-admin/awscli-1.27.81
deleted file mode 100644
index eb2b40911179..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.81
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.81.tar.gz -> aws-cli-1.27.81.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.82 b/metadata/md5-cache/app-admin/awscli-1.27.82
deleted file mode 100644
index cf9bb2c86fab..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.82
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.82[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.82[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.82.tar.gz -> aws-cli-1.27.82.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.83 b/metadata/md5-cache/app-admin/awscli-1.27.83
deleted file mode 100644
index a3dcbd05e0d9..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.27.83
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.83[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
-INHERIT=bash-completion-r1 distutils-r1 multiprocessing
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.83[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.27.83.tar.gz -> aws-cli-1.27.83.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/conky-1.15.0 b/metadata/md5-cache/app-admin/conky-1.15.0
deleted file mode 100644
index c3765c837f0e..000000000000
--- a/metadata/md5-cache/app-admin/conky-1.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( virtual/pandoc || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) extras? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pyyaml[python_targets_python3_11(-)] dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pyyaml[python_targets_python3_10(-)] dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pyyaml[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 )
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=8
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-IUSE=apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype webserver wifi X xinerama xmms2 +lua_single_target_lua5-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) apcupsd? ( sys-power/apcupsd ) cmus? ( media-sound/cmus ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) extras? ( app-editors/nano || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.15.0.tar.gz -> conky-1.15.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=709696909cb319baf029f9670a0ad90a
diff --git a/metadata/md5-cache/app-admin/conky-1.18.1 b/metadata/md5-cache/app-admin/conky-1.18.1
index 29f8c30ced24..41811e7a22fb 100644
--- a/metadata/md5-cache/app-admin/conky-1.18.1
+++ b/metadata/md5-cache/app-admin/conky-1.18.1
@@ -14,4 +14,4 @@ REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundle
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.18.1.tar.gz -> conky-1.18.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c8a1629af2bc933475ca8685e08f9418
+_md5_=33d184e6efff2e0ae67e158e468f7792
diff --git a/metadata/md5-cache/app-admin/logrotate-3.21.0 b/metadata/md5-cache/app-admin/logrotate-3.21.0
index e392e75d9809..5ffb5769a3ae 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.21.0
+++ b/metadata/md5-cache/app-admin/logrotate-3.21.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/logrotate/logrotate
 INHERIT=systemd tmpfiles verify-sig
 IUSE=acl +cron selinux verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.21.0/logrotate-3.21.0.tar.xz verify-sig? ( https://github.com/logrotate/logrotate/releases/download/3.21.0/logrotate-3.21.0.tar.xz.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=1db356f615eb2ad7c8ea9c15f3f9b94b
+_md5_=e4bbcd029a9a482c1f7a977b98f05779
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.7.0 b/metadata/md5-cache/app-admin/rasdaemon-0.7.0
index f4b99a408115..028c2c186857 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.7.0
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.7.0
@@ -5,10 +5,10 @@ DESCRIPTION=Reliability, Availability and Serviceability logging tool
 EAPI=8
 HOMEPAGE=https://github.com/mchehab/rasdaemon
 INHERIT=flag-o-matic linux-info systemd
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite elibc_musl? ( sys-libs/argp-standalone ) dev-perl/DBI dev-perl/DBD-SQLite sys-apps/dmidecode
 SLOT=0
 SRC_URI=https://github.com/mchehab/rasdaemon/releases/download/v0.7.0/rasdaemon-0.7.0.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8814e9dc0a9e370814af81274f157941
+_md5_=7ba6e76f76058bd1256115dbcd633354
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index 1ae125bb3b12..944ccf6c6fd0 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	9d4fc47e076850b06fede471ee147ec5	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=4c1a448f570c2174a1ec406311eb3025
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1-r1 b/metadata/md5-cache/app-admin/testdisk-7.1-r1
deleted file mode 100644
index 43d5094bb883..000000000000
--- a/metadata/md5-cache/app-admin/testdisk-7.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=qt5? ( dev-qt/linguist-tools:5 )
-DEFINED_PHASES=configure postinst postrm
-DEPEND=static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) )
-DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery tool
-EAPI=7
-HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
-INHERIT=flag-o-matic qmake-utils xdg-utils
-IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
-REQUIRED_USE=static? ( !qt5 )
-SLOT=0
-SRC_URI=https://www.cgsecurity.org/testdisk-7.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ac00a700b81e5feb0794a2591038d024
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1-r2 b/metadata/md5-cache/app-admin/testdisk-7.1-r2
index 74c3f1e395ef..3ebb24938443 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1-r2
+++ b/metadata/md5-cache/app-admin/testdisk-7.1-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
 INHERIT=flag-o-matic qmake-utils xdg-utils
 IUSE=ewf jpeg ntfs gui reiserfs static zlib
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( media-libs/libjpeg-turbo:=[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( media-libs/libjpeg-turbo:= ) ntfs? ( sys-fs/ntfs3g:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
 REQUIRED_USE=static? ( !gui )
 SLOT=0
 SRC_URI=https://www.cgsecurity.org/testdisk-7.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f8797e3360ab86564e95aed7a8e7d7a3
+_md5_=cf651138d2559e0d8fcf97f6af51ac36
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 52e4524dd256..b381e42bc774 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/ncompress-5.0-r1 b/metadata/md5-cache/app-arch/ncompress-5.0-r1
index 173c02660c00..0a7040b024bf 100644
--- a/metadata/md5-cache/app-arch/ncompress-5.0-r1
+++ b/metadata/md5-cache/app-arch/ncompress-5.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Classic compress & uncompress programs for .Z (LZW) files
 EAPI=7
 HOMEPAGE=https://vapier.github.io/ncompress/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/vapier/ncompress/archive/v5.0.tar.gz -> ncompress-5.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fb34b10bb22b326bb3b67cd52d3933e1
+_md5_=52406a3d3f576085ec653cf036eb0cc3
diff --git a/metadata/md5-cache/app-arch/unrar-6.2.3 b/metadata/md5-cache/app-arch/unrar-6.2.3
index c257200d4e7e..dc274b96765f 100644
--- a/metadata/md5-cache/app-arch/unrar-6.2.3
+++ b/metadata/md5-cache/app-arch/unrar-6.2.3
@@ -3,9 +3,9 @@ DESCRIPTION=Uncompress rar files
 EAPI=8
 HOMEPAGE=https://www.rarlab.com/rar_add.htm
 INHERIT=multilib toolchain-funcs
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 SLOT=0/6
 SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.2.3.tar.gz -> unrar-6.2.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bb4c31935b5ace0e54d8940c46a96644
+_md5_=6d687d3e654e496d3071206432700fb8
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 28d1a632172f..de4f3b2c6f70 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.2.2 b/metadata/md5-cache/app-backup/rdiff-backup-2.2.4
index 92cdb04a713f..24095d523007 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.2.2
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.2.4
@@ -4,7 +4,7 @@ DEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_pyt
 DESCRIPTION=Local/remote mirroring+incremental backup
 EAPI=8
 HOMEPAGE=https://github.com/rdiff-backup/rdiff-backup
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
@@ -12,6 +12,6 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_9(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://pypi/r/rdiff-backup/rdiff-backup-2.2.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=da03e0be42822234d5c9d1a282202c00
+SRC_URI=https://files.pythonhosted.org/packages/source/r/rdiff-backup/rdiff-backup-2.2.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8cbe23e2b470c4c2ee8a49ed57d94420
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 0092777539de..0c01539a0d3b 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 6afbbf8e5f72..5e4f29072c84 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cdrdao-1.2.4-r1 b/metadata/md5-cache/app-cdr/cdrdao-1.2.4-r1
deleted file mode 100644
index 07f222e23e84..000000000000
--- a/metadata/md5-cache/app-cdr/cdrdao-1.2.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=gnome-base/gconf virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare
-DEPEND=app-cdr/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libao media-libs/libmad ) vorbis? ( media-libs/libao media-libs/libvorbis )
-DESCRIPTION=Burn CDs in disk-at-once mode -- with optional GUI frontend
-EAPI=8
-HOMEPAGE=http://cdrdao.sourceforge.net/
-INHERIT=autotools flag-o-matic
-IUSE=encode mad vorbis
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-cdr/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libao media-libs/libmad ) vorbis? ( media-libs/libao media-libs/libvorbis ) !app-cdr/cue2toc
-SLOT=0
-SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=420792024429883d2ccb4722d4464b23
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index aec4bf69cdb8..7d48c1535af3 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/ccid-1.5.1 b/metadata/md5-cache/app-crypt/ccid-1.5.1
index 41fa7e2fbb8e..1f12ddc5223c 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.5.1
+++ b/metadata/md5-cache/app-crypt/ccid-1.5.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
 INHERIT=udev
 IUSE=twinserial +usb
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 twinserial? ( dev-lang/perl ) usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.5.1.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b407eb3d79c1db6cbb23cb713e89d237
+_md5_=25e85848be0dfbefd9a1b2d42d1bd20f
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index a8a22983c4e0..6cd9b3ccee9d 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/emacs-18.59-r15 b/metadata/md5-cache/app-editors/emacs-18.59-r15
index 9633c3b3d69c..37e2fabe0137 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r15
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r15
@@ -13,4 +13,4 @@ RDEPEND=sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=
 SLOT=18
 SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-15.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1e2b4991fd8bcbb913b36dcab01abaac
+_md5_=6b80b65e3a0aae4363db486dc2ea0c4e
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r16 b/metadata/md5-cache/app-editors/emacs-25.3-r16
index 9f23e78672dc..b863b1530603 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r16
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r16
@@ -13,4 +13,4 @@ RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockf
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4ecb0593957ea31b9d943ef298701e46
+_md5_=cd7e927607fd07ad1ac9f9cbc761661e
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r13 b/metadata/md5-cache/app-editors/emacs-26.3-r13
index 8aec7381c95b..14f3c75bfffc 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r13
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r13
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c8cbf272b4d1d93a1005c25892b130ee
+_md5_=12493a09ba0539874e9d6a6f71867063
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r11 b/metadata/md5-cache/app-editors/emacs-27.2-r11
index 586b30895030..10e1599945ad 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2-r11
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r11
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cfad29e96adbce33aa133abae7e228a0
+_md5_=dfcd689f9677b8f39fca3c54ca1103e3
diff --git a/metadata/md5-cache/app-editors/emacs-28.2-r6 b/metadata/md5-cache/app-editors/emacs-28.2-r6
index 82ca0c1dafd0..463f718d93b7 100644
--- a/metadata/md5-cache/app-editors/emacs-28.2-r6
+++ b/metadata/md5-cache/app-editors/emacs-28.2-r6
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77a0911abba5577c05ee53f1e5c93893
+_md5_=6d4f35fc1a672a1850085378af94d3f2
diff --git a/metadata/md5-cache/app-editors/emacs-28.3_rc1 b/metadata/md5-cache/app-editors/emacs-28.3_rc1
index 36972d1194b9..1d46000cee9e 100644
--- a/metadata/md5-cache/app-editors/emacs-28.3_rc1
+++ b/metadata/md5-cache/app-editors/emacs-28.3_rc1
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 SLOT=28
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.3-rc1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a0457debd69e4d4c1a5fdb507aa6e398
+_md5_=c1e2154b0dca56e7641b13b02956eb54
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.9999-r1 b/metadata/md5-cache/app-editors/emacs-29.0.9999-r1
index 8524a9406a70..d9a622708bcd 100644
--- a/metadata/md5-cache/app-editors/emacs-29.0.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-29.0.9999-r1
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29-vcs
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0974526fbbf2df079e8c3cd4ee545e39
+_md5_=a723d3ba73514c89c1edf0fe9da4a3b1
diff --git a/metadata/md5-cache/app-editors/emacs-30.0.9999 b/metadata/md5-cache/app-editors/emacs-30.0.9999
index c8ca9a9f4045..107dcd0cd0a7 100644
--- a/metadata/md5-cache/app-editors/emacs-30.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-30.0.9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=30-vcs
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9c682edbc70ff7a281199e7b43d36c66
+_md5_=e69a5bd22308775d250fcbb9a4b3e3db
diff --git a/metadata/md5-cache/app-editors/gnome-latex-3.44.0 b/metadata/md5-cache/app-editors/gnome-latex-3.44.0
index fb4670615a7c..04f47dad93a6 100644
--- a/metadata/md5-cache/app-editors/gnome-latex-3.44.0
+++ b/metadata/md5-cache/app-editors/gnome-latex-3.44.0
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/glib-2.70:2 >=x11-libs/gtk+-3.22:3 >=app-text/gspell-1.8:0= >
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-latex/3.44/gnome-latex-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4256d755a2627d8d09f6f52f6b6f81e1
+_md5_=33a4728c1519acf53bdbe7a80bcf2f46
diff --git a/metadata/md5-cache/app-editors/nano-7.2 b/metadata/md5-cache/app-editors/nano-7.2
index 7a5b0330e31a..c942ff22242d 100644
--- a/metadata/md5-cache/app-editors/nano-7.2
+++ b/metadata/md5-cache/app-editors/nano-7.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 INHERIT=flag-o-matic
 IUSE=debug justify magic minimal ncurses nls +spell static unicode
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
 REQUIRED_USE=magic? ( !minimal )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v7/nano-7.2.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=567e954077b7ca6788bde4a9af78b1f3
+_md5_=a74dedd101d3e1e0d99cb4a31f51d98c
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.9999 b/metadata/md5-cache/app-editors/xemacs-21.5.9999
index 2a6be58fc17a..f44edf2b906a 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.9999
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0= >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap:= ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( media-libs/libjpeg-turbo:= ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	9d4fc47e076850b06fede471ee147ec5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=06506b11cdd3576f410c543e2838d604
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 8dac6e079a7e..d49bee80d6c8 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/eglot-1.11 b/metadata/md5-cache/app-emacs/eglot-1.11
new file mode 100644
index 000000000000..742f79abba5b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/eglot-1.11
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/external-completion >=app-editors/emacs-26.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A minimal Emacs LSP client
+EAPI=8
+HOMEPAGE=https://github.com/joaotavora/eglot/ https://elpa.gnu.org/packages/eglot.html
+INHERIT=elisp
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-emacs/external-completion >=app-editors/emacs-26.3:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~xgqt/distfiles/repackaged/eglot-1.11.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=66d6a1db9745abe986013dab95ca845a
diff --git a/metadata/md5-cache/app-emacs/external-completion-0.1 b/metadata/md5-cache/app-emacs/external-completion-0.1
new file mode 100644
index 000000000000..a8c771be779f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/external-completion-0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Let external tools control completion style in GNU Emacs
+EAPI=8
+HOMEPAGE=https://elpa.gnu.org/packages/external-completion.html
+INHERIT=elisp
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~xgqt/distfiles/repackaged/external-completion-0.1.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=dd9902ae4ff3f0746b84eb33d314e64c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index c7bd36824cdf..2a6ab3d58e73 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/wine-mono-7.3.0 b/metadata/md5-cache/app-emulation/wine-mono-7.3.0
deleted file mode 100644
index 08c0d5ee46ae..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-7.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Replacement for the .NET runtime and class libraries in Wine
-EAPI=8
-HOMEPAGE=https://wiki.winehq.org/Mono
-IUSE=+shared
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=7.3.0
-SRC_URI=shared? ( https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.tar.xz ) !shared? ( https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.msi )
-_md5_=c23c6a3c8f125b32e166ecfd1894f1bc
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.5 b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
index ea71daeac382..d7bd5a3e697f 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.5
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.5
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-5.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4e1e9db1d76ae60f1d1e74894c904db1
+_md5_=eb0b51596fd918505657762f25a461b2
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.6 b/metadata/md5-cache/app-emulation/wine-proton-7.0.6
index 1bcbee512dff..3502f58522ee 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.6
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.6
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.6
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-6.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=689c960d0f182a85f87a31dd4a0bcf24
+_md5_=98d4154582d974b642d9dbf383dd4fc5
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.9999 b/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
index 64293e423b93..24a64982f595 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
 SLOT=7.0.9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=689c960d0f182a85f87a31dd4a0bcf24
+_md5_=98d4154582d974b642d9dbf383dd4fc5
diff --git a/metadata/md5-cache/app-emulation/wine-staging-7.19 b/metadata/md5-cache/app-emulation/wine-staging-7.19
deleted file mode 100644
index 94e93c68afbb..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-7.19
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=8
-HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=>=app-eselect/eselect-wine-2
-INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.3.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=7.19
-SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.19.tar.xz https://github.com/wine-staging/wine-staging/archive/v7.19.tar.gz -> wine-staging-7.19.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=efaf7f28b0f8ee6bf1e57399a63d41b4
diff --git a/metadata/md5-cache/app-emulation/wine-staging-7.22 b/metadata/md5-cache/app-emulation/wine-staging-7.22
deleted file mode 100644
index 31561ba30bdf..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-7.22
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=8
-HOMEPAGE=https://wiki.winehq.org/Wine-Staging
-IDEPEND=>=app-eselect/eselect-wine-2
-INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=7.22
-SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.22.tar.xz https://github.com/wine-staging/wine-staging/archive/v7.22.tar.gz -> wine-staging-7.22.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d681471f97581c6502d723252531904a
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.0 b/metadata/md5-cache/app-emulation/wine-staging-8.0
index 0f78d20a8d5a..c8b8a7938e17 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.0
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.0
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.0
 SRC_URI=https://dl.winehq.org/wine/source/8.0/wine-8.0.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.0.tar.gz -> wine-staging-8.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=24dea079ef1480cedbd5b797a8768826
+_md5_=d49d3dd3ecb192632bf50de05d423985
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.1 b/metadata/md5-cache/app-emulation/wine-staging-8.1
index 712267f580fb..9ae481160eb3 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.1
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.1
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.1
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.1.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.1.tar.gz -> wine-staging-8.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=03ad61942c58f1af80e0ba860737bb2f
+_md5_=d390b55b9d559dd8730cb9b6a52041d3
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.2 b/metadata/md5-cache/app-emulation/wine-staging-8.2
index 11c4306bcd9b..0de11a55610b 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.2
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.2
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.2
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.2.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.2.tar.gz -> wine-staging-8.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1f4631b713af6e610b3f27c66603f315
+_md5_=e8e0da92998960a36d113f94bd3cdd5e
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.3 b/metadata/md5-cache/app-emulation/wine-staging-8.3
new file mode 100644
index 000000000000..585170efa356
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.3
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Wine-Staging
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools edo flag-o-matic multilib multilib-build python-any-r1 toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=8.3
+SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.3.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.3.tar.gz -> wine-staging-8.3.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=c0420f3a66d739a2d2fb40a14de97ce0
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index e8aac77ac13b..1e9c07be8ca8 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_6
 RESTRICT=test
 SLOT=9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3d9af9809f2841cfb3478d4be577b138
+_md5_=c0420f3a66d739a2d2fb40a14de97ce0
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
index 9f186dcc2e6a..530daea19099 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.1
 SRC_URI=https://dl.winehq.org/wine/source/7.0/wine-7.0.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=df9d4389bd01e335aeb3d7b335fe76a6
+_md5_=14c1c7045021854c08f095517eaa03a7
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.19 b/metadata/md5-cache/app-emulation/wine-vanilla-7.19
deleted file mode 100644
index d6bc1b93a59e..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.19
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=8
-HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
-IDEPEND=>=app-eselect/eselect-wine-2
-INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.3.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
-RESTRICT=test
-SLOT=7.19
-SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.19.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3c388ab0c0e0ff1a6baa0efe3827ff65
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.0 b/metadata/md5-cache/app-emulation/wine-vanilla-8.0
index 639a00ea01ba..972a947c61bf 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-8.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.0
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.0
 SRC_URI=https://dl.winehq.org/wine/source/8.0/wine-8.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4af1baf7ae05642461997df4d78554bc
+_md5_=e3de91dbcee41cde1469eeeb51ae3b41
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.1 b/metadata/md5-cache/app-emulation/wine-vanilla-8.1
index 1abd384e2036..103697e35423 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-8.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.1
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.1
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5636760ce06c523b8269d2c5558325a6
+_md5_=3dd85b59db7e7bdfbf1267ee071e0999
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.2 b/metadata/md5-cache/app-emulation/wine-vanilla-8.2
index f4735cb3e599..d38e33ae3460 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-8.2
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.2
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.2
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5636760ce06c523b8269d2c5558325a6
+_md5_=3dd85b59db7e7bdfbf1267ee071e0999
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.22 b/metadata/md5-cache/app-emulation/wine-vanilla-8.3
index a7c9bd1d812e..c6f2e9875bd6 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.22
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.3
@@ -1,18 +1,18 @@
 BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=8
 HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
 IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=test
-SLOT=7.22
-SRC_URI=https://dl.winehq.org/wine/source/7.x/wine-7.22.tar.xz
+SLOT=8.3
+SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0861b1a735be984b92bd5f3d9040022e
+_md5_=50f6788ad4c25d27d56c441f5ecf29fd
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 58765de2773c..0ecfae1cfffd 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_6
 RESTRICT=test
 SLOT=9999
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d23562760798745bd05c873ca583c06f
+_md5_=50f6788ad4c25d27d56c441f5ecf29fd
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index c36de1cba5a9..dbc2139571ee 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-libpinyin-1.12.1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.12.1
deleted file mode 100644
index 02484142c855..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-db/sqlite:3 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
-DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=8
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-INHERIT=autotools gnome2-utils lua-single python-single-r1
-IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.12.1.tar.gz -> ibus-libpinyin-1.12.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1ce32b9086bebc9827a24d6c8ba3d915
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.0 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.0
deleted file mode 100644
index 5fdcbee0dd4b..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-db/sqlite:3 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
-DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=8
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-INHERIT=autotools gnome2-utils lua-single python-single-r1
-IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
-SLOT=0
-SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.13.0.tar.gz -> ibus-libpinyin-1.13.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=32b42c7e6da4234db6a3bd5d47f30f0f
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1
index 157cdd600e51..6dcb9aa05bfb 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-db/sqlite:3 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) 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(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
 DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
 EAPI=8
 HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
 INHERIT=autotools gnome2-utils lua-single python-single-r1
-IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_9 python_single_target_python3_10
+IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) 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(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.13.1.tar.gz -> ibus-libpinyin-1.13.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1ce32b9086bebc9827a24d6c8ba3d915
+_md5_=9ebb3ab942164d222ad6b2b25d3aa86f
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1-r1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1-r1
new file mode 100644
index 000000000000..4941dcf9a6ac
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.13.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-db/sqlite:3 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) 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(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
+DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
+EAPI=8
+HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
+INHERIT=autotools gnome2-utils lua-single python-single-r1
+IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) 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(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
+SLOT=0
+SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.13.1.tar.gz -> ibus-libpinyin-1.13.1.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5245b7a5def3c32721856519457560f6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 095849565048..1513854e2b2b 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/radeontop-1.4 b/metadata/md5-cache/app-misc/radeontop-1.4
index 6d502c5e02e1..e4d3b033e20f 100644
--- a/metadata/md5-cache/app-misc/radeontop-1.4
+++ b/metadata/md5-cache/app-misc/radeontop-1.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/clbr/radeontop
 INHERIT=toolchain-funcs
 IUSE=nls video_cards_amdgpu video_cards_radeon
-KEYWORDS=~amd64 ~loong ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeon?] x11-libs/libpciaccess x11-libs/libxcb nls? ( sys-libs/ncurses:=[unicode(+)] virtual/libintl )
 REQUIRED_USE=|| ( video_cards_amdgpu video_cards_radeon )
 SLOT=0
 SRC_URI=https://github.com/clbr/radeontop/archive/v1.4.tar.gz -> radeontop-1.4.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=296ed1c00c3d70272e0885d404970e4f
+_md5_=4275f851dbfbcd7ee3a450778777342e
diff --git a/metadata/md5-cache/app-misc/rmlint-2.10.1-r1 b/metadata/md5-cache/app-misc/rmlint-2.10.1-r2
index f30897191231..affaff40e5b9 100644
--- a/metadata/md5-cache/app-misc/rmlint-2.10.1-r1
+++ b/metadata/md5-cache/app-misc/rmlint-2.10.1-r2
@@ -8,10 +8,10 @@ INHERIT=gnome2-utils python-single-r1 scons-utils toolchain-funcs
 IUSE=doc gui nls test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0= gui? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) x11-libs/gtksourceview:3.0 python_single_target_python3_9? ( dev-python/colorlog[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorlog[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/colorlog[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0= gui? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) gnome-base/librsvg:2[introspection] sys-auth/polkit[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/pango[introspection] python_single_target_python3_9? ( dev-python/colorlog[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorlog[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/colorlog[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sahib/rmlint/archive/v2.10.1.tar.gz -> rmlint-2.10.1.tar.gz
 _eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2fd284807952123bf31ae03f28f0f251
+_md5_=073a80a406453f35b6f90e8c32f8022a
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index d5a56d3033d0..16e861cfd360 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/elogviewer-3.2 b/metadata/md5-cache/app-portage/elogviewer-3.2
index 8a1c3bb8811f..21f435547bca 100644
--- a/metadata/md5-cache/app-portage/elogviewer-3.2
+++ b/metadata/md5-cache/app-portage/elogviewer-3.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] >=sys-apps/portage-2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] >=sys-apps/portage-2.1[python_targets_python3_10(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] >=sys-apps/portage-2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] >=sys-apps/portage-2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[gui,widgets,python_targets_python3_11(-)] >=sys-apps/portage-2.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] )
 DESCRIPTION=Elog viewer for Gentoo
 EAPI=7
 HOMEPAGE=https://github.com/Synss/elogviewer
 INHERIT=desktop python-single-r1 readme.gentoo-r1
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm64 ~ppc ~riscv x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] >=sys-apps/portage-2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] >=sys-apps/portage-2.1[python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] >=sys-apps/portage-2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] >=sys-apps/portage-2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[gui,widgets,python_targets_python3_11(-)] >=sys-apps/portage-2.1[python_targets_python3_11(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v3.2.tar.gz -> elogviewer-3.2.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0ba8090b982a2d5b45e6c35846d339de
+_md5_=192e28bc437fc8b0674afcf417a9f2a1
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 557b6e1f33df..fa59715c8e93 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/zsh-5.9-r3 b/metadata/md5-cache/app-shells/zsh-5.9-r3
index 0bf50f3f7567..e72b5fc2a2b9 100644
--- a/metadata/md5-cache/app-shells/zsh-5.9-r3
+++ b/metadata/md5-cache/app-shells/zsh-5.9-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.zsh.org/
 INHERIT=autotools flag-o-matic prefix
 IUSE=caps debug doc examples gdbm maildir pcre static
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= static? ( sys-libs/gdbm:=[static-libs] ) )
 SLOT=0
 SRC_URI=https://www.zsh.org/pub/zsh-5.9.tar.xz https://www.zsh.org/pub/old/zsh-5.9.tar.xz mirror://sourceforge/zsh/zsh-5.9.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.9-doc.tar.xz mirror://sourceforge/zsh/zsh-5.9-doc.tar.xz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d179e6de4148ef5942964cfebcb4733
+_md5_=be94a5fbf91e9f911813940c1e05dc77
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 9a3dc444b009..b203905221bb 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.12 b/metadata/md5-cache/app-text/dblatex-0.3.12
index 953198af2f7a..2fb8277117b8 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.12
+++ b/metadata/md5-cache/app-text/dblatex-0.3.12
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://dblatex.sourceforge.net/
 INHERIT=distutils-r1
 IUSE=inkscape test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5a3047992b5ce95001f12144e00f5213
+_md5_=eabb5a5f11e54a6e4b150d3b7ae8da74
diff --git a/metadata/md5-cache/app-text/kjots-5.1.0-r2 b/metadata/md5-cache/app-text/kjots-5.1.0-r2
deleted file mode 100644
index ce9346bdfa3e..000000000000
--- a/metadata/md5-cache/app-text/kjots-5.1.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-20.12.2:5 >=kde-apps/akonadi-notes-20.12.2:5 >=kde-apps/kmime-20.12.2:5 >=kde-apps/kontactinterface-20.12.2:5 >=kde-apps/kpimtextedit-20.12.2:5[speech(+)=] >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-qt/qtcore:5
-DESCRIPTION=Note taking utility by KDE
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm kde.org
-IUSE=speech debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-20.12.2:5 >=kde-apps/akonadi-notes-20.12.2:5 >=kde-apps/kmime-20.12.2:5 >=kde-apps/kontactinterface-20.12.2:5 >=kde-apps/kpimtextedit-20.12.2:5[speech(+)=] >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kjots/5.1.0/src/kjots-5.1.0.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1049f73e9937c4dae1568cf865e03d00
diff --git a/metadata/md5-cache/app-text/kjots-5.1.0-r3 b/metadata/md5-cache/app-text/kjots-5.1.0-r3
new file mode 100644
index 000000000000..5505dad21bd6
--- /dev/null
+++ b/metadata/md5-cache/app-text/kjots-5.1.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-apps/akonadi-22.08.3:5 >=kde-apps/akonadi-notes-22.08.3:5 >=kde-apps/kmime-22.08.3:5 >=kde-apps/kontactinterface-22.08.3:5 >=kde-apps/kpimtextedit-22.08.3:5[speech(+)=] >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 dev-qt/qtcore:5
+DESCRIPTION=Note taking utility by KDE
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=speech debug
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-apps/akonadi-22.08.3:5 >=kde-apps/akonadi-notes-22.08.3:5 >=kde-apps/kmime-22.08.3:5 >=kde-apps/kontactinterface-22.08.3:5 >=kde-apps/kpimtextedit-22.08.3:5[speech(+)=] >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-apps/kdepim-runtime-22.08.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kjots/5.1.0/src/kjots-5.1.0.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2f030c32ae6fa74df00f18005b3f0b67
diff --git a/metadata/md5-cache/app-text/mdbook-0.4.28 b/metadata/md5-cache/app-text/mdbook-0.4.28
new file mode 100644
index 000000000000..3b2509a043ba
--- /dev/null
+++ b/metadata/md5-cache/app-text/mdbook-0.4.28
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Create a book from markdown files
+EAPI=8
+HOMEPAGE=https://rust-lang.github.io/mdBook/
+INHERIT=cargo toolchain-funcs
+IUSE=doc debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0 Artistic-2 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016
+SLOT=0
+SRC_URI=https://github.com/rust-lang/mdBook/archive/refs/tags/v0.4.28.tar.gz -> mdbook-0.4.28.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/ammonia/3.3.0/download -> ammonia-3.3.0.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/assert_cmd/2.0.8/download -> assert_cmd-2.0.8.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/bstr/1.0.1/download -> bstr-1.0.1.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.3.0/download -> bytes-1.3.0.crate https://crates.io/api/v1/crates/cc/1.0.77/download -> cc-1.0.77.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/clap/4.0.29/download -> clap-4.0.29.crate https://crates.io/api/v1/crates/clap_complete/4.0.6/download -> clap_complete-4.0.6.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/cxx/1.0.83/download -> cxx-1.0.83.crate https://crates.io/api/v1/crates/cxx-build/1.0.83/download -> cxx-build-1.0.83.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.83/download -> cxxbridge-flags-1.0.83.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.83/download -> cxxbridge-macro-1.0.83.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/elasticlunr-rs/3.0.1/download -> elasticlunr-rs-3.0.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/errno/0.2.8/download -> errno-0.2.8.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/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gitignore/1.0.7/download -> gitignore-1.0.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.15/download -> h2-0.3.15.crate https://crates.io/api/v1/crates/handlebars/4.3.6/download -> handlebars-4.3.6.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/headers/0.3.8/download -> headers-0.3.8.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/html5ever/0.26.0/download -> html5ever-0.26.0.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.8.0/download -> httparse-1.8.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/hyper/0.14.23/download -> hyper-0.14.23.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.3/download -> io-lifetimes-1.0.3.crate https://crates.io/api/v1/crates/is-terminal/0.4.1/download -> is-terminal-0.4.1.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/kqueue/1.0.7/download -> kqueue-1.0.7.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/libc/0.2.138/download -> libc-0.2.138.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.7/download -> link-cplusplus-1.0.7.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/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/markup5ever/0.11.0/download -> markup5ever-0.11.0.crate https://crates.io/api/v1/crates/markup5ever_rcdom/0.2.0/download -> markup5ever_rcdom-0.2.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/notify/5.1.0/download -> notify-5.1.0.crate https://crates.io/api/v1/crates/notify-debouncer-mini/0.2.1/download -> notify-debouncer-mini-0.2.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.14.0/download -> num_cpus-1.14.0.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/opener/0.5.2/download -> opener-0.5.2.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/output_vt100/0.1.3/download -> output_vt100-0.1.3.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.5/download -> parking_lot_core-0.9.5.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pest/2.5.1/download -> pest-2.5.1.crate https://crates.io/api/v1/crates/pest_derive/2.5.1/download -> pest_derive-2.5.1.crate https://crates.io/api/v1/crates/pest_generator/2.5.1/download -> pest_generator-2.5.1.crate https://crates.io/api/v1/crates/pest_meta/2.5.1/download -> pest_meta-2.5.1.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_codegen/0.10.0/download -> phf_codegen-0.10.0.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project/1.0.12/download -> pin-project-1.0.12.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.12/download -> pin-project-internal-1.0.12.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.5/download -> predicates-2.1.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.5/download -> predicates-core-1.0.5.crate https://crates.io/api/v1/crates/predicates-tree/1.0.7/download -> predicates-tree-1.0.7.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pulldown-cmark/0.9.2/download -> pulldown-cmark-0.9.2.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.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/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustix/0.36.5/download -> rustix-0.36.5.crate https://crates.io/api/v1/crates/rustls-pemfile/0.2.1/download -> rustls-pemfile-0.2.1.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.2/download -> scratch-1.0.2.crate https://crates.io/api/v1/crates/select/0.6.0/download -> select-0.6.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha-1/0.10.1/download -> sha-1-0.10.1.crate https://crates.io/api/v1/crates/sha1/0.10.5/download -> sha1-0.10.5.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.2/download -> string_cache_codegen-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.105/download -> syn-1.0.105.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/termtree/0.4.0/download -> termtree-0.4.0.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.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.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.25.0/download -> tokio-1.25.0.crate https://crates.io/api/v1/crates/tokio-macros/1.8.2/download -> tokio-macros-1.8.2.crate https://crates.io/api/v1/crates/tokio-stream/0.1.11/download -> tokio-stream-0.1.11.crate https://crates.io/api/v1/crates/tokio-tungstenite/0.17.2/download -> tokio-tungstenite-0.17.2.crate https://crates.io/api/v1/crates/tokio-util/0.7.4/download -> tokio-util-0.7.4.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/topological-sort/0.2.2/download -> topological-sort-0.2.2.crate https://crates.io/api/v1/crates/tower-service/0.3.2/download -> tower-service-0.3.2.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/tungstenite/0.17.3/download -> tungstenite-0.17.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.5/download -> ucd-trie-0.1.5.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.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/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/warp/0.3.3/download -> warp-0.3.3.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/xml5ever/0.17.0/download -> xml5ever-0.17.0.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate
+_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=63125b1264e39183adc1db77c03f42af
diff --git a/metadata/md5-cache/app-text/poppler-23.03.0 b/metadata/md5-cache/app-text/poppler-23.03.0
new file mode 100644
index 000000000000..867cc25eb038
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-23.03.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/glib-utils-2.64 virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-aacid ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) boost? ( >=dev-libs/boost-1.71 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=8
+HOMEPAGE=https://poppler.freedesktop.org/
+INHERIT=cmake toolchain-funcs xdg-utils verify-sig
+IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cairo? ( >=dev-libs/glib-2.64:2 >=x11-libs/cairo-1.16 introspection? ( >=dev-libs/gobject-introspection-1.64:= ) ) curl? ( net-misc/curl ) jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.49 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:= ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/126
+SRC_URI=https://poppler.freedesktop.org/poppler-23.03.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-23.03.0.tar.xz.sig )
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=898da044c14e9b064f3f3305248ba8f6
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 801e363c4727..45041d873abe 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -4,7 +4,7 @@ DEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib cai
 DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
-INHERIT=cmake toolchain-funcs xdg-utils git-r3
+INHERIT=cmake flag-o-matic toolchain-funcs xdg-utils git-r3
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
 LICENSE=GPL-2
 PROPERTIES=live
@@ -12,4 +12,4 @@ RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib ca
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=898da044c14e9b064f3f3305248ba8f6
+_md5_=45ba1d839482ee2ab013991ab67ac557
diff --git a/metadata/md5-cache/app-text/recode-3.7.13 b/metadata/md5-cache/app-text/recode-3.7.13
index 63c84dd4dbd6..dcb3cedd2de3 100644
--- a/metadata/md5-cache/app-text/recode-3.7.13
+++ b/metadata/md5-cache/app-text/recode-3.7.13
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/rrthomas/recode
 INHERIT=autotools flag-o-matic python-any-r1 toolchain-funcs
 IUSE=nls test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.13/recode-3.7.13.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=376fc8b74652da2b188178364d8d3ac0
+_md5_=89e986c260252189a4650d179e76082c
diff --git a/metadata/md5-cache/app-text/zathura-0.5.2-r4 b/metadata/md5-cache/app-text/zathura-0.5.2-r4
index c16e0ffdccfb..903e174d5360 100644
--- a/metadata/md5-cache/app-text/zathura-0.5.2-r4
+++ b/metadata/md5-cache/app-text/zathura-0.5.2-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
 INHERIT=meson virtualx xdg
 IUSE=seccomp sqlite synctex test test
-KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://github.com/pwmt/zathura/archive/0.5.2.tar.gz -> zathura-0.5.2.tar.gz https://dev.gentoo.org/~slashbeast/distfiles/zathura/zathura-0.5.2-manpages.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8f871679e7d8b1a62c5ad592aeaa92a2
+_md5_=b676bd9557f37b4b5f6c234841d36084
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1
index 571c759a5a87..4763e7417b5d 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
 INHERIT=meson xdg-utils
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=~amd64 arm ~riscv ~x86
 LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9:= dev-libs/girara dev-libs/glib:2
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura-pdf-poppler/archive/0.3.1.tar.gz -> zathura-pdf-poppler-0.3.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b32d242e25d949b23cf7872be8bdafbf
+_md5_=7fd466f15ba858520642d687f3b003fe
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index c2926ed1aa76..0744a8b606df 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/doctest-2.4.10 b/metadata/md5-cache/dev-cpp/doctest-2.4.10
index 1d4e3037c5b6..0f8bc08213df 100644
--- a/metadata/md5-cache/dev-cpp/doctest-2.4.10
+++ b/metadata/md5-cache/dev-cpp/doctest-2.4.10
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doctest/doctest/archive/v2.4.10.tar.gz -> doctest-2.4.10.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e13fcc9506ea30fe8feb48394ca2c824
+_md5_=a0cedf90ee3696d18d4faa9051472c42
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 019e3f6e7ce2..b0893df4dbd9 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/pgcli-3.3.1-r1 b/metadata/md5-cache/dev-db/pgcli-3.3.1-r1
deleted file mode 100644
index b32cc90a3008..000000000000
--- a/metadata/md5-cache/dev-db/pgcli-3.3.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CLI for Postgres with auto-completion and syntax highlighting
-EAPI=8
-HOMEPAGE=https://www.pgcli.com https://github.com/dbcli/pgcli
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dbcli/pgcli/archive/v3.3.1.tar.gz -> pgcli-3.3.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ea26611abb8ae7c22e66c2829c05d1c
diff --git a/metadata/md5-cache/dev-db/pgcli-3.3.1-r2 b/metadata/md5-cache/dev-db/pgcli-3.3.1-r2
new file mode 100644
index 000000000000..5e46d76d85c7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgcli-3.3.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CLI for Postgres with auto-completion and syntax highlighting
+EAPI=8
+HOMEPAGE=https://www.pgcli.com https://github.com/dbcli/pgcli
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dbcli/pgcli/archive/v3.3.1.tar.gz -> pgcli-3.3.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5be798d5646919609cf44a09145c0484
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index e0f6dd1ede46..c261ee70749f 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/gputils-1.5.2 b/metadata/md5-cache/dev-embedded/gputils-1.5.2
new file mode 100644
index 000000000000..d142be69e046
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/gputils-1.5.2
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Tools including assembler, linker and librarian for PIC microcontrollers
+EAPI=8
+HOMEPAGE=https://gputils.sourceforge.io
+INHERIT=autotools toolchain-funcs flag-o-matic
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/gputils/gputils-1.5.2.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e094abf7f93a94916d4c443c7dce534c
diff --git a/metadata/md5-cache/dev-embedded/rpi-eeprom-15.0_p1 b/metadata/md5-cache/dev-embedded/rpi-eeprom-15.0_p1
index e640ef7af29e..c009a85c69ca 100644
--- a/metadata/md5-cache/dev-embedded/rpi-eeprom-15.0_p1
+++ b/metadata/md5-cache/dev-embedded/rpi-eeprom-15.0_p1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/raspberrypi/rpi-eeprom/
 INHERIT=python-r1 systemd
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~arm ~arm64
+KEYWORDS=~arm arm64
 LICENSE=BSD rpi-eeprom
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-apps/flashrom sys-apps/pciutils || ( >=media-libs/raspberrypi-userland-0_pre20201022 >=media-libs/raspberrypi-userland-bin-1.20201022 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_15.0-1.debian.tar.xz https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_15.0.orig.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ed354712c1e90e27122b951a23ba4874
+_md5_=40dd932f7ecf675d7a79230722a07c10
diff --git a/metadata/md5-cache/dev-embedded/sdcc-4.2.0 b/metadata/md5-cache/dev-embedded/sdcc-4.2.0
new file mode 100644
index 000000000000..233331a936c0
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/sdcc-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/boost:= sys-libs/zlib:= pic14? ( >=dev-embedded/gputils-0.13.7 ) pic16? ( >=dev-embedded/gputils-0.13.7 ) boehm-gc? ( dev-libs/boehm-gc:= ) sdcdb? ( sys-libs/readline:0= ) ucsim? ( sys-libs/ncurses:= ) dev-util/gperf
+DESCRIPTION=Small device C compiler (for various microprocessors)
+EAPI=8
+HOMEPAGE=https://sdcc.sourceforge.net/
+INHERIT=autotools
+IUSE=mcs51 z80 z180 r2k r2ka r3ka sm83 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 mos6502 mos65c02 +boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
+RDEPEND=dev-libs/boost:= sys-libs/zlib:= pic14? ( >=dev-embedded/gputils-0.13.7 ) pic16? ( >=dev-embedded/gputils-0.13.7 ) boehm-gc? ( dev-libs/boehm-gc:= ) sdcdb? ( sys-libs/readline:0= ) ucsim? ( sys-libs/ncurses:= )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/sdcc/sdcc/4.2.0/sdcc-src-4.2.0.tar.bz2 doc? ( https://downloads.sourceforge.net/project/sdcc/sdcc-doc/4.2.0/sdcc-doc-4.2.0.tar.bz2 )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=23eff577953c6f18420f4f01f41c8c9b
diff --git a/metadata/md5-cache/dev-embedded/sdcc-9999 b/metadata/md5-cache/dev-embedded/sdcc-9999
index 76c33480bb16..2211629e8902 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-9999
+++ b/metadata/md5-cache/dev-embedded/sdcc-9999
@@ -1,16 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 dev-vcs/subversion[http(+)] net-misc/rsync
-DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= pic14? ( >=dev-embedded/gputils-0.13.7 ) pic16? ( >=dev-embedded/gputils-0.13.7 ) boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn dev-util/gperf
+DEFINED_PHASES=compile configure install preinst prepare unpack
+DEPEND=dev-libs/boost:= sys-libs/zlib:= pic14? ( >=dev-embedded/gputils-0.13.7 ) pic16? ( >=dev-embedded/gputils-0.13.7 ) boehm-gc? ( dev-libs/boehm-gc:= ) sdcdb? ( sys-libs/readline:0= ) ucsim? ( sys-libs/ncurses:= ) dev-util/gperf
 DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=7
-HOMEPAGE=http://sdcc.sourceforge.net/
-INHERIT=autotools toolchain-funcs subversion
-IUSE=avr mcs51 z80 z180 r2k r2ka r3ka gbz80 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
+EAPI=8
+HOMEPAGE=https://sdcc.sourceforge.net/
+INHERIT=autotools subversion
+IUSE=mcs51 z80 z180 r2k r2ka r3ka sm83 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 mos6502 mos65c02 +boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
 LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= pic14? ( >=dev-embedded/gputils-0.13.7 ) pic16? ( >=dev-embedded/gputils-0.13.7 ) boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn
-REQUIRED_USE=avr? ( sdbinutils ) mcs51? ( sdbinutils ) z80? ( sdbinutils ) z180? ( sdbinutils ) r2k? ( sdbinutils ) r2ka? ( sdbinutils ) r3ka? ( sdbinutils ) gbz80? ( sdbinutils ) tlcs90? ( sdbinutils ) ez80-z80? ( sdbinutils ) z80n? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) pic14? ( sdbinutils ) pic16? ( sdbinutils ) hc08? ( sdbinutils ) s08? ( sdbinutils ) stm8? ( sdbinutils ) pdk13? ( sdbinutils ) pdk14? ( sdbinutils ) pdk15? ( sdbinutils ) pdk16? ( sdbinutils ) || ( avr mcs51 z80 z180 r2k r2ka r3ka gbz80 tlcs90 ez80-z80 z80n ds390 ds400 pic14 pic16 hc08 s08 stm8 pdk13 pdk14 pdk15 pdk16 )
-RESTRICT=strip
+RDEPEND=dev-libs/boost:= sys-libs/zlib:= pic14? ( >=dev-embedded/gputils-0.13.7 ) pic16? ( >=dev-embedded/gputils-0.13.7 ) boehm-gc? ( dev-libs/boehm-gc:= ) sdcdb? ( sys-libs/readline:0= ) ucsim? ( sys-libs/ncurses:= )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=56dee78ab2bba5c0fbfe9bf975e5944b
+_md5_=23eff577953c6f18420f4f01f41c8c9b
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index ee88e6848333..d4bce69751f2 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/physfs-9999 b/metadata/md5-cache/dev-games/physfs-9999
index f2e3fe7ced8c..7aadc169a91f 100644
--- a/metadata/md5-cache/dev-games/physfs-9999
+++ b/metadata/md5-cache/dev-games/physfs-9999
@@ -8,5 +8,5 @@ IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip abi_x86_32 abi_x
 LICENSE=ZLIB
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	53b96197cb26db4afb5056f1bbfa4845	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	9d4fc47e076850b06fede471ee147ec5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b8465604d9734e697a9f7be4d70c3cc9
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index a3f387d5f2be..b2ceaaa8bd38 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/byte-buddy-1.14.0 b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
new file mode 100644
index 000000000000..3f70e3203d2b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* dev-java/asm:9 dev-java/findbugs-annotations:0 dev-java/jna:4 dev-java/jsr305:0 test? ( dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Offers convenience for attaching an agent to the local or a remote VM
+EAPI=8
+HOMEPAGE=https://bytebuddy.net
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/raphw/byte-buddy/archive/byte-buddy-1.14.0.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=61532940e181d4f2173923efd9aef273
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
index 5e9a37dbc5e8..2814a764ce96 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-1.2.2-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=dev-java/jakarta-activation-api:1 >=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Jakarta Activation
 EAPI=8
-HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 RDEPEND=dev-java/jakarta-activation-api:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
+SRC_URI=https://github.com/jakartaee/jaf-api/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
 _eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=b99f05dd12cac00e435ee47ecf965e4d
+_md5_=ff3b4c1d66bb1cce7b6ad17c777b90a1
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1 b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
index 5ee1245b4e47..01e4815047bb 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-2.0.1-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Jakarta Activation
 EAPI=8
-HOMEPAGE=https://github.com/eclipse-ee4j/jaf
+HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
+SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.0.1.tar.gz -> jakarta-activation-2.0.1.tar.gz
 _eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=93e0c276aeccbc963839590ab4f681d9
+_md5_=1c30bbe29760b48dd6d83974ebca7f9e
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
index 488195bb71c6..8eceabe51181 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Jakarta Activation API jar
 EAPI=8
-HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/1.2.2.tar.gz -> jakarta-activation-api-1.2.2.tar.gz
+SRC_URI=https://github.com/jakartaee/jaf-api/archive/1.2.2.tar.gz -> jakarta-activation-1.2.2.tar.gz
 _eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=c34af806732c7e489f11860f6501ea3a
+_md5_=c78fbd58436974440df89f0c99a202be
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
index 5cc82d54a44b..f485efe0ccba 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Jakarta Activation API jar
 EAPI=8
-HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
+HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
-SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
+SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
 _eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=1ab8555b3a957d389e447120417be772
+_md5_=759871fa1e56a262894378b5ff48cd6c
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
new file mode 100644
index 000000000000..f6c96c1512de
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Jakarta Activation API jar
+EAPI=8
+HOMEPAGE=https://jakartaee.github.io/jaf-api/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.1.1.tar.gz -> jakarta-activation-api-2.1.1.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=9c020c46271269da223df670bc4fb37a
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
new file mode 100644
index 000000000000..dbf61cb40c6c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/jakarta-activation-api:2 >=virtual/jdk-11:* test? ( >=dev-java/angus-activation-1.0.0-r1:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Jakarta Mail API 2.1 Specification API
+EAPI=8
+HOMEPAGE=https://jakartaee.github.io/mail-api/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jakartaee/mail-api/archive/2.1.1.tar.gz -> jakarta-mail-api-2.1.1.tar.gz
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=6c0c23d646c513e1f75c13b5a1b3b273
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 02ea92c8fa03..68caf3413bda 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/cfortran-20210827 b/metadata/md5-cache/dev-lang/cfortran-20210827
index e54cd13cd32e..5b78161a6d20 100644
--- a/metadata/md5-cache/dev-lang/cfortran-20210827
+++ b/metadata/md5-cache/dev-lang/cfortran-20210827
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/ https://github.com/bastien-roucaries/cfortran
 INHERIT=autotools fortran-2 flag-o-matic
 IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_20210827.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_20210827-1.debian.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4f83b1b0a67dc75708ccaee5c743b5b4
+_md5_=a971449110e485c81d9cae80ab342ddc
diff --git a/metadata/md5-cache/dev-lang/eisl-2.63 b/metadata/md5-cache/dev-lang/eisl-2.85
index 278589516123..44f2663f6c93 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.63
+++ b/metadata/md5-cache/dev-lang/eisl-2.85
@@ -4,11 +4,11 @@ DESCRIPTION=Interpreter and compiler compatible with the ISLisp standard
 EAPI=8
 HOMEPAGE=https://github.com/sasagawa888/eisl/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:=
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.63.tar.gz -> eisl-2.63.tar.gz
+SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.85.tar.gz -> eisl-2.85.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c503118a5183e36901b56b26e82e7a11
+_md5_=eedcfa9cee75510a30ea67e1e33e1730
diff --git a/metadata/md5-cache/dev-lang/go-1.20.1 b/metadata/md5-cache/dev-lang/go-1.20.1
index 0688f77a74a9..842fd333caa8 100644
--- a/metadata/md5-cache/dev-lang/go-1.20.1
+++ b/metadata/md5-cache/dev-lang/go-1.20.1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* ~amd64 arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=arm? ( sys-devel/binutils[gold] ) arm64? ( sys-devel/binutils[gold] )
 RESTRICT=strip
 SLOT=0/1.20.1
 SRC_URI=https://storage.googleapis.com/golang/go1.20.1.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ac1ae512377d889b794c9fb60a80a8f
+_md5_=30c261cc770edfbea00bc2148c5c13a7
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.33 b/metadata/md5-cache/dev-lang/orc-0.4.33
index 69f517496256..8a49233184ea 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.33
+++ b/metadata/md5-cache/dev-lang/orc-0.4.33
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=meson-multilib
 IUSE=gtk-doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.33.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=883bb564820f32d387aefc44e6b7d244
+_md5_=e038f254ed87f8082c49430ed619736a
diff --git a/metadata/md5-cache/dev-lang/python-3.10.10_p2 b/metadata/md5-cache/dev-lang/python-3.10.10_p2
index 399743b7b4b5..4a2a58678e32 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.10_p2
+++ b/metadata/md5-cache/dev-lang/python-3.10.10_p2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e86276cde28ec199d09d7cdc485dbe21
+_md5_=73dd0941dc8c3eb26f13ec6f059b1075
diff --git a/metadata/md5-cache/dev-lang/python-3.8.16_p3 b/metadata/md5-cache/dev-lang/python-3.8.16_p3
index e19e98649ffe..5ea626a8988b 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.16_p3
+++ b/metadata/md5-cache/dev-lang/python-3.8.16_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.16_p3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f1d46128720ae6b476c248f5b8cd2a9c
+_md5_=a2ff3c2b8d6a1b8afc925f525a0918fe
diff --git a/metadata/md5-cache/dev-lang/python-3.9.16_p2 b/metadata/md5-cache/dev-lang/python-3.9.16_p2
index 44ef42c672d5..181448696c37 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.16_p2
+++ b/metadata/md5-cache/dev-lang/python-3.9.16_p2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils prefix python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= dev-python/gentoo-common sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.16_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1b12378b001d4491704a84d21f80ec43
+_md5_=fdc3a35847f468bb9629a1edb4e6b9ae
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 33a52dceec4c..aa8267b54cac 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/castxml-0.4.5 b/metadata/md5-cache/dev-libs/castxml-0.4.5
deleted file mode 100644
index 0060bd0f77ec..000000000000
--- a/metadata/md5-cache/dev-libs/castxml-0.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:= sys-devel/clang:= man? ( dev-python/sphinx ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/llvm:= sys-devel/clang:=
-DESCRIPTION=C-family abstract syntax tree XML output tool
-EAPI=8
-HOMEPAGE=https://github.com/CastXML/CastXML
-INHERIT=cmake
-IUSE=+man test
-KEYWORDS=~amd64 ~arm ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:= sys-devel/clang:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/CastXML/CastXML/archive/v0.4.5.tar.gz -> castxml-0.4.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3269aaf4e909d1406c37b664f80e2da9
diff --git a/metadata/md5-cache/dev-libs/castxml-0.5.1 b/metadata/md5-cache/dev-libs/castxml-0.5.1
deleted file mode 100644
index 17a775a50951..000000000000
--- a/metadata/md5-cache/dev-libs/castxml-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:= sys-devel/clang:= man? ( dev-python/sphinx ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/llvm:= sys-devel/clang:=
-DESCRIPTION=C-family abstract syntax tree XML output tool
-EAPI=8
-HOMEPAGE=https://github.com/CastXML/CastXML
-INHERIT=cmake
-IUSE=+man test
-KEYWORDS=~amd64 ~arm ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/llvm:= sys-devel/clang:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/CastXML/CastXML/archive/v0.5.1.tar.gz -> castxml-0.5.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3269aaf4e909d1406c37b664f80e2da9
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.5 b/metadata/md5-cache/dev-libs/girara-0.3.5
deleted file mode 100644
index 5702157a245a..000000000000
--- a/metadata/md5-cache/dev-libs/girara-0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
-DESCRIPTION=UI library that focuses on simplicity and minimalism
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/girara/
-INHERIT=meson virtualx
-IUSE=doc libnotify test test
-KEYWORDS=amd64 arm ~riscv x86
-LICENSE=ZLIB
-RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c097e68a6786a1bccf5fca3ce4163661
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.6 b/metadata/md5-cache/dev-libs/girara-0.3.6
deleted file mode 100644
index 66c750005487..000000000000
--- a/metadata/md5-cache/dev-libs/girara-0.3.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
-DESCRIPTION=UI library that focuses on simplicity and minimalism
-EAPI=7
-HOMEPAGE=https://pwmt.org/projects/girara/
-INHERIT=meson virtualx
-IUSE=doc libnotify test test
-KEYWORDS=amd64 arm ~riscv x86
-LICENSE=ZLIB
-RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c097e68a6786a1bccf5fca3ce4163661
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.9 b/metadata/md5-cache/dev-libs/girara-0.3.9
index 4d3c83b125f2..c5e229e6659c 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.9
+++ b/metadata/md5-cache/dev-libs/girara-0.3.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
 INHERIT=meson virtualx
 IUSE=doc libnotify test test
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=~amd64 arm ~riscv ~x86
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.9.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=500c5d7da7c817126c257123820256e8
+_md5_=350296ffcb523841158b00aa5b9e8c48
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.10.1 b/metadata/md5-cache/dev-libs/libcbor-0.10.1
index a86f52e9183f..206717c7f36f 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.10.1
+++ b/metadata/md5-cache/dev-libs/libcbor-0.10.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/pjk/libcbor
 INHERIT=python-any-r1 cmake
 IUSE=+custom-alloc doc test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.10
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.10.1.tar.gz -> libcbor-0.10.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=060b1b3e992df02f8cfd5aeb11c76d7f
+_md5_=11fe78884bf0460299d24b21add62fd9
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index e0d7d4b83098..bc183e6be6de 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1146abd4294efeffbee6b66090a04a69
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index 4aede5e4eb0e..cf890e290c6a 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
index fcdc6207bae5..ae87fa90bd36 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3 b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
index 98101e3fb192..93d81374c373 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
index c90e99a4dfb7..e37ea1808e31 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225
index abd47bc9dada..d362d598ac78 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304
new file mode 100644
index 000000000000..448f72e57975
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304
@@ -0,0 +1,13 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.12.0 b/metadata/md5-cache/dev-libs/libfido2-1.12.0
index c6c0bc74909d..9f8f02083eb7 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.12.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.12.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
 INHERIT=cmake udev linux-info
 IUSE=nfc static-libs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.12.0.tar.gz -> libfido2-1.12.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6131825272b0b6a4c88453ee3e9006b0
+_md5_=72fd3910601a7cd4965d5c1e5eda750f
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
index de180e4f0cb5..376c890be5af 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnupg.org/
 INHERIT=autotools flag-o-matic linux-info multilib-minimal toolchain-funcs verify-sig
 IUSE=+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] getentropy? ( kernel_linux? ( elibc_glibc? ( >=sys-libs/glibc-2.25 ) elibc_musl? ( >=sys-libs/musl-1.1.20 ) ) )
 REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a941ea5daf1dc5f8205ce583a78c5c66
+_md5_=577a3021b52c91b590b1988b8e4c37c2
diff --git a/metadata/md5-cache/dev-libs/libinput-1.22.1 b/metadata/md5-cache/dev-libs/libinput-1.22.1
index 8624ce7395e3..df6ba680059f 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.22.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.22.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 INHERIT=meson optfeature python-any-r1 udev
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.22.1/libinput-1.22.1.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=460be0ef23bf5c0b2d96eac97804854b
+_md5_=a3f7e5c72cafbeb810061e1d99b50764
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.8 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.8
index 5181ec79e3bb..d290e032aadf 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.8
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libusb.info
 INHERIT=autotools usr-ldscript multilib-minimal
 IUSE=debug examples split-usr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0
 SLOT=0
 SRC_URI=https://github.com/libusb/libusb-compat-0.1/releases/download/v0.1.8/libusb-compat-0.1.8.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=dd2c3f198622ec13d928e58140e0ab0e
+_md5_=5355f09718f3a854f926bae1ea2283ad
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.6.0 b/metadata/md5-cache/dev-libs/libwacom-2.6.0
index cf522be0c747..2908d5cd6641 100644
--- a/metadata/md5-cache/dev-libs/libwacom-2.6.0
+++ b/metadata/md5-cache/dev-libs/libwacom-2.6.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linuxwacom/libwacom
 INHERIT=meson python-any-r1 udev
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.6.0/libwacom-2.6.0.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b0b6439318f5c52dd737e821b0cb952c
+_md5_=826145142438a8b0a67795a6ff3860a4
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.1.0 b/metadata/md5-cache/dev-libs/nss-pem-1.1.0
index 294c610e6b76..91da2094eca5 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.1.0
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/kdudka/nss-pem
 INHERIT=cmake-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris
 LICENSE=MPL-1.1
 RDEPEND=dev-libs/nss dev-libs/nspr
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.1.0/nss-pem-1.1.0.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ac8ee910676ea3f096082642384e39e
+_md5_=3a985c5bf5dc7f0f9cbbe3d75d43de6c
diff --git a/metadata/md5-cache/dev-util/rocm-clang-ocl-5.0.2-r1 b/metadata/md5-cache/dev-libs/pegtl-3.2.7
index defc7b0647e0..c1ae52a582c8 100644
--- a/metadata/md5-cache/dev-util/rocm-clang-ocl-5.0.2-r1
+++ b/metadata/md5-cache/dev-libs/pegtl-3.2.7
@@ -1,14 +1,12 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/rocm-cmake:0/5.0 dev-libs/rocm-opencl-runtime:0/5.0
-DESCRIPTION=OpenCL compilation with clang compiler
+DESCRIPTION=Header-only library for creating parsers according to Parsing Expression Grammar
 EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/clang-ocl.git
+HOMEPAGE=https://github.com/taocpp/PEGTL
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/rocm-opencl-runtime:0/5.0
-SLOT=0/5.0
-SRC_URI=https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-5.0.2.tar.gz -> rocm-clang-ocl-5.0.2.tar.gz
+SLOT=0
+SRC_URI=https://github.com/taocpp/PEGTL/archive/3.2.7.tar.gz -> pegtl-3.2.7.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=654bf66985a4db987ba6cca81845fd83
+_md5_=072aa854f127313a389803f54c24b89b
diff --git a/metadata/md5-cache/dev-libs/popt-1.19 b/metadata/md5-cache/dev-libs/popt-1.19
index 3b236a2a09ba..3025284e7a6f 100644
--- a/metadata/md5-cache/dev-libs/popt-1.19
+++ b/metadata/md5-cache/dev-libs/popt-1.19
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/rpm-software-management/popt
 INHERIT=flag-o-matic multilib-minimal libtool toolchain-funcs
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.19.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=31da6782d768125a03ce70f3276032b7
+_md5_=79f597869ec38fd1d829ccf5b670ed75
diff --git a/metadata/md5-cache/dev-libs/teakra-20220224 b/metadata/md5-cache/dev-libs/teakra-20220224
index 9defb7ebc6ad..f86114922482 100644
--- a/metadata/md5-cache/dev-libs/teakra-20220224
+++ b/metadata/md5-cache/dev-libs/teakra-20220224
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/wwylele/teakra/archive/01db7cdd00aabcce559a8dddce8798dabb71949b.tar.gz -> teakra-20220224.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ad8bfd4e4a55dc5e7442fef15cef7382
+_md5_=93bbb41c5c88417d0bc19cbbe1283748
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3 b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3
index 2ae6b77e50e6..18384b7940a0 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre
 INHERIT=autotools distutils-r1
 IUSE=+agrep +alloca +approx debug nls profile python python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=agrep? ( !app-text/agrep !dev-ruby/amatch !app-misc/glimpse ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=agrep? ( approx ) python? ( || ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/laurikari/tre/archive/6092368aabdd0dbb0fbceb2766a37b98e0ff6911.tar.gz -> tre-0.8.0_p20210321.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	3929d88685167435c587b740fdb5ec46	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=55fdb0b713ef061cf9b95b191292d226
+_md5_=0d92839afdf45c052438858bc22a196c
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index d38bd2ea55a6..28efc25b3cd5 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index 014140fe83d0..b2e6193b928f 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=81a9f3aae36c4d277e7deb51da8e2119
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index 095e57ce96a0..715e2c80b948 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=47ac9fc5ccf47d31fdeabf577e9b531c
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
index 257b5c40eb7a..33dbf2c34e84 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
index 1570cd3aa354..ac177c428caa 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_rc3
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
index 75ae9064edf3..7bcfb381c506 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225
index e2974c1e67d7..a3f4ef3bf553 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304
new file mode 100644
index 000000000000..e8f6092a909b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230304:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230304:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Xtensa] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test )
+SLOT=0/17.0.0_pre20230304
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/odoc-2.2.0-r1 b/metadata/md5-cache/dev-ml/odoc-2.2.0-r2
index d69dd69c320d..b54026e8e389 100644
--- a/metadata/md5-cache/dev-ml/odoc-2.2.0-r1
+++ b/metadata/md5-cache/dev-ml/odoc-2.2.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/astring:= dev-ml/cmdliner:= dev-ml/cppo:= dev-ml/fmt:= dev-ml/fpath:= dev-ml/odoc-parser:= dev-ml/result:= dev-ml/tyxml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/dune-3 dev-ml/astring:= dev-ml/cmdliner:= dev-ml/cppo:= dev-ml/fmt:= dev-ml/fpath:= dev-ml/odoc-parser:= dev-ml/result:= dev-ml/tyxml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=OCaml documentation generator
 EAPI=8
 HOMEPAGE=http://github.com/ocaml/odoc/
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=dev-ml/astring:= dev-ml/cmdliner:= dev-ml/cppo:= dev-ml/fmt:= dev-ml/fpath:= dev-ml/odoc-parser:= dev-ml/result:= dev-ml/tyxml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/dune-3 dev-ml/astring:= dev-ml/cmdliner:= dev-ml/cppo:= dev-ml/fmt:= dev-ml/fpath:= dev-ml/odoc-parser:= dev-ml/result:= dev-ml/tyxml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ocaml/odoc/releases/download/2.2.0/odoc-2.2.0.tbz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=83714930ce340a5c1a502ee6aa7b8d53
+_md5_=9801248a58801836018febe878e0185a
diff --git a/metadata/md5-cache/dev-ml/zed-3.2.1-r1 b/metadata/md5-cache/dev-ml/zed-3.2.1-r2
index 0d84439c836e..39f32c6c1c0b 100644
--- a/metadata/md5-cache/dev-ml/zed-3.2.1-r1
+++ b/metadata/md5-cache/dev-ml/zed-3.2.1-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/react:= dev-ml/result:= dev-ml/uchar:= dev-ml/uucp:= dev-ml/uuseg:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/dune-3 dev-ml/react:= dev-ml/result:= dev-ml/uchar:= dev-ml/uucp:= dev-ml/uuseg:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Abstract engine for text edition in OCaml
 EAPI=8
 HOMEPAGE=https://github.com/ocaml-community/zed
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-ml/react:= dev-ml/result:= dev-ml/uchar:= dev-ml/uucp:= dev-ml/uuseg:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/dune-3 dev-ml/react:= dev-ml/result:= dev-ml/uchar:= dev-ml/uucp:= dev-ml/uuseg:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.2.1
 SRC_URI=https://github.com/ocaml-community/zed/archive/3.2.1.tar.gz -> zed-3.2.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2ac7c2c5bc73793ddedcf577ae17a3ca
+_md5_=4508bf1b6e9d7a40525571105f58eaf9
diff --git a/metadata/md5-cache/dev-perl/Apache-Test-1.430.0 b/metadata/md5-cache/dev-perl/Apache-Test-1.430.0
index e770b3d79e6f..4a9f2eff99fa 100644
--- a/metadata/md5-cache/dev-perl/Apache-Test-1.430.0
+++ b/metadata/md5-cache/dev-perl/Apache-Test-1.430.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Apache-Test
 INHERIT=depend.apache optfeature perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~arm ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.43.tar.gz
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=f8c0c34c7b87176a51e67893fdab9a9d
+_md5_=71981f0e1e3701e79a0499ee8f289306
diff --git a/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1 b/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
index db2af3d95db4..b371589ee207 100644
--- a/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
+++ b/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/B-COW
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=476ff942f1a73bea9610b54a226036c5
+_md5_=ab01bfcbade546011c3a13495b254a8a
diff --git a/metadata/md5-cache/dev-perl/Clone-0.460.0 b/metadata/md5-cache/dev-perl/Clone-0.460.0
index d2ac9ae64cff..740646ecd8a5 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.460.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.460.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Clone
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.46.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=85127b13b140acc03bfeec5c2f75193f
+_md5_=a871c628bb38ba5c0e530e39b0aa1b93
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0-r1 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0-r1
index f598ba31e43c..e545f962c86d 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=OpenSSL pseudo-random number generator access
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Random
 INHERIT=perl-module
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/openssl:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=14e4ab369e93f858f1f4272aa9267961
+_md5_=d74e3394c03a2815e7cd5fa9153e6fa3
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0
index a1839c996a68..a163097f6ba6 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-AuthorsFromGit
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/Dist-Zilla dev-perl/Git-Wrapper >=dev-perl/List-MoreUtils-0.400.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Moose dev-perl/Pod-Weaver dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Dist-Zilla-Plugin-AuthorsFromGit-0.007.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=0bce173cd561eca80d77ce421d07a952
+_md5_=58f7645184bb19eb6812a8593df9ab65
diff --git a/metadata/md5-cache/dev-perl/File-RsyncP-0.760.0-r1 b/metadata/md5-cache/dev-perl/File-RsyncP-0.760.0-r1
index bf405eb54b1f..7b473e5a7443 100644
--- a/metadata/md5-cache/dev-perl/File-RsyncP-0.760.0-r1
+++ b/metadata/md5-cache/dev-perl/File-RsyncP-0.760.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=An rsync perl module
 EAPI=7
 HOMEPAGE=http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-RsyncP
 INHERIT=perl-module toolchain-funcs
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-3+ GPL-2+ RSA
 RDEPEND=>=virtual/perl-Getopt-Long-2.240.0 net-misc/rsync dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CB/CBARRATT/File-RsyncP-0.76.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c9719b6bc8aba0208308f0d3d3a08827
+_md5_=31d0aebf9058c0267f86be31f80614af
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.440.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.440.0
index 22775c1b30b2..9f80a58c9f68 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.440.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.440.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Message
 INHERIT=perl-module
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/Clone-0.460.0 virtual/perl-Compress-Raw-Bzip2 >=virtual/perl-Compress-Raw-Zlib-2.62.0 >=virtual/perl-Encode-3.10.0 >=dev-perl/Encode-Locale-1.0.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=dev-perl/HTTP-Date-6.0.0 >=virtual/perl-IO-Compress-2.21.0 dev-perl/IO-HTML >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=dev-perl/URI-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.44.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=6ec7150d629836833d1e87268edbb4ab
+_md5_=176ce3b98b409a847a38b873fac93523
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.81.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.81.0
index 890e4f66ff8b..12f49461af5c 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.81.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.81.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Socket-SSL
 INHERIT=perl-module
 IUSE=idn test examples
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Mozilla-CA >=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.081.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=db3f5b36eaa95d497518683a9f30a036
+_md5_=63bcaf4d96a309d67f735e0c68e33532
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index ea3e9a1d0f1f..7b420728e998 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Math-GMP-2.250.0 b/metadata/md5-cache/dev-perl/Math-GMP-2.250.0
index 9bfa77593aca..2001d6074c41 100644
--- a/metadata/md5-cache/dev-perl/Math-GMP-2.250.0
+++ b/metadata/md5-cache/dev-perl/Math-GMP-2.250.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Math-GMP
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ppc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/perl-AutoLoader virtual/perl-Carp virtual/perl-Exporter dev-libs/gmp:= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.25.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=a97be0849c5fc4b34e346a83878df107
+_md5_=0504395e81df34b91644137694812684
diff --git a/metadata/md5-cache/dev-perl/Net-Pcap-0.210.0 b/metadata/md5-cache/dev-perl/Net-Pcap-0.210.0
index 454f9394542c..33362f0d3a5b 100644
--- a/metadata/md5-cache/dev-perl/Net-Pcap-0.210.0
+++ b/metadata/md5-cache/dev-perl/Net-Pcap-0.210.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Pcap
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~ppc x86
+KEYWORDS=~alpha amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/Net-Pcap-0.21.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=47c540868018d01000c300c97e9d77bd
+_md5_=51bf9f881bf7a8b6a197153326ba09f1
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0 b/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0
index 546ad40235b7..34869dd78e9b 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sys-Virt
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-8.9.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v8.9.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=e98312826ca5a707a88d6fce894a11a3
+_md5_=36bb59d81cc29c4de80bf4ac20cad453
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.330.0 b/metadata/md5-cache/dev-perl/libintl-perl-1.330.0
index a1b7cb3e32b7..5dde2775eca3 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.330.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.330.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://guido-flohr.net/projects/libintl-perl https://metacpan.org/release/libintl-perl
 INHERIT=perl-module
 IUSE=minimal test examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=virtual/libintl !minimal? ( dev-perl/File-ShareDir ) virtual/perl-File-Spec >=virtual/perl-version-0.770.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.33.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=cc20a404a3d1b4d4152420495728a5ca
+_md5_=2984bf6e3d220f0ef24272e21724932c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 78c8924b99d0..cda23ba5306f 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/argcomplete-2.0.5 b/metadata/md5-cache/dev-python/argcomplete-2.0.5
new file mode 100644
index 000000000000..a17e672a7160
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argcomplete-2.0.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-shells/fish app-shells/tcsh dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-19 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bash tab completion for argparse
+EAPI=8
+HOMEPAGE=https://github.com/kislyuk/argcomplete/ https://pypi.org/project/argcomplete/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-2.0.5.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2f7e70dd1c7112d77fbb544531c076c9
diff --git a/metadata/md5-cache/dev-python/astunparse-1.6.3 b/metadata/md5-cache/dev-python/astunparse-1.6.3
deleted file mode 100644
index 6a359285b0cf..000000000000
--- a/metadata/md5-cache/dev-python/astunparse-1.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Astun parser for python
-EAPI=7
-HOMEPAGE=https://github.com/simonpercivall/astunparse
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/astunparse/astunparse-1.6.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c0d58f342744fdc2c4dcb5d5a9ae3133
diff --git a/metadata/md5-cache/dev-python/astunparse-1.6.3-r1 b/metadata/md5-cache/dev-python/astunparse-1.6.3-r1
index 93c458f65f3d..a092465c0699 100644
--- a/metadata/md5-cache/dev-python/astunparse-1.6.3-r1
+++ b/metadata/md5-cache/dev-python/astunparse-1.6.3-r1
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Astun parser for python
 EAPI=8
 HOMEPAGE=https://github.com/simonpercivall/astunparse/ https://pypi.org/project/astunparse/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/a/astunparse/astunparse-1.6.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e113281cf0e478c9a5d6f9bdaad7a758
+SRC_URI=https://files.pythonhosted.org/packages/source/a/astunparse/astunparse-1.6.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=59ce2e54d95bb7bb76b308c7f1bde793
diff --git a/metadata/md5-cache/dev-python/black-22.12.0 b/metadata/md5-cache/dev-python/black-22.12.0
deleted file mode 100644
index 3c3ef53cda1b..000000000000
--- a/metadata/md5-cache/dev-python/black-22.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-vcs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/aiohttp-3.7.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp-cors[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-8.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The uncompromising Python code formatter
-EAPI=8
-HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/psf/black/archive/22.12.0.tar.gz -> black-22.12.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=33053eff45c5e253899387713b091fdc
diff --git a/metadata/md5-cache/dev-python/black-23.1.0 b/metadata/md5-cache/dev-python/black-23.1.0
index 92a2655dbbf5..c4bad738f6f6 100644
--- a/metadata/md5-cache/dev-python/black-23.1.0
+++ b/metadata/md5-cache/dev-python/black-23.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/23.1.0.tar.gz -> black-23.1.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7b36c29effd7c3ec382ca1ac8814aa00
+_md5_=00c957429bf9fdb919580013de3aa336
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.80 b/metadata/md5-cache/dev-python/boto3-1.26.80
deleted file mode 100644
index cb04379fe76e..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.80
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.80[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.80.tar.gz -> boto3-1.26.80.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.81 b/metadata/md5-cache/dev-python/boto3-1.26.81
deleted file mode 100644
index 44936f97c05a..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.81
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.81[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.81.tar.gz -> boto3-1.26.81.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.82 b/metadata/md5-cache/dev-python/boto3-1.26.82
deleted file mode 100644
index f69824fb8937..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.82
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.82[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.82[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.82.tar.gz -> boto3-1.26.82.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.83 b/metadata/md5-cache/dev-python/boto3-1.26.83
deleted file mode 100644
index 89fdb9e601c3..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.26.83
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.83[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.29.83[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.26.83.tar.gz -> boto3-1.26.83.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.80 b/metadata/md5-cache/dev-python/botocore-1.29.80
deleted file mode 100644
index 707f3b5bcbe3..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.80
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.80.tar.gz -> botocore-1.29.80.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.81 b/metadata/md5-cache/dev-python/botocore-1.29.81
deleted file mode 100644
index ea23f4120624..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.81
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.81.tar.gz -> botocore-1.29.81.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.82 b/metadata/md5-cache/dev-python/botocore-1.29.82
deleted file mode 100644
index 65117ec64ce1..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.82
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.82.tar.gz -> botocore-1.29.82.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.83 b/metadata/md5-cache/dev-python/botocore-1.29.83
deleted file mode 100644
index 6e0d72173110..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.29.83
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
-INHERIT=distutils-r1 multiprocessing
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/botocore/archive/1.29.83.tar.gz -> botocore-1.29.83.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.25 b/metadata/md5-cache/dev-python/bottle-0.12.25
new file mode 100644
index 000000000000..6c91829658e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bottle-0.12.25
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A fast and simple micro-framework for small web-applications
+EAPI=8
+HOMEPAGE=https://bottlepy.org/ https://github.com/bottlepy/bottle/ https://pypi.org/project/bottle/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/bottle/bottle-0.12.25.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b759f2a62bea9e611816496a4a19095b
diff --git a/metadata/md5-cache/dev-python/cachetools-5.3.0 b/metadata/md5-cache/dev-python/cachetools-5.3.0
index 1ded6d2ec1c5..1dd3f29c59f6 100644
--- a/metadata/md5-cache/dev-python/cachetools-5.3.0
+++ b/metadata/md5-cache/dev-python/cachetools-5.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-5.3.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4a62481d43691bcc61dbd027628c3f29
+_md5_=7e06eeb3de7cf7fcf848e5d8563bac39
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
index d579b4615a39..6713a806a043 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=df1bc02b22483edeca144370d496a934
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.7 b/metadata/md5-cache/dev-python/clang-python-15.0.7
index 3944c56fd2e9..09b604d29371 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.7
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=af6077f776aa5a8c36aee6ad4acd5183
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
index 132106e79a4f..c30cca4d5148 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-16.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3 b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
index a53320d621de..628012d69179 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
index 4169144f04b1..ce9aced5b604 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-17.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225
index dc566f50d18d..8410e2a42a4b 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304
new file mode 100644
index 000000000000..64267b1d406e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:17 )
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-17.0.0_pre20230304:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org python-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-17.0.0_pre20230304:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.1.1-r1 b/metadata/md5-cache/dev-python/click-plugins-1.1.1-r1
index 157044bb20bd..02e1b89cd36e 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/click-plugins-1.1.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/click-contrib/click-plugins
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 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/c/click-plugins/click-plugins-1.1.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d9b5e5cb10f3e01f19a18a2de9f13af7
+_md5_=d834b5cf44d6be411285b1ecc1911dbb
diff --git a/metadata/md5-cache/dev-python/colored-traceback-0.3.0 b/metadata/md5-cache/dev-python/colored-traceback-0.3.0
index a238c17e1a5c..3fa2d7582a4d 100644
--- a/metadata/md5-cache/dev-python/colored-traceback-0.3.0
+++ b/metadata/md5-cache/dev-python/colored-traceback-0.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/staticshock/colored-traceback.py
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=ISC
 RDEPEND=dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colored-traceback/colored-traceback-0.3.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=599b198c7634b6e5146df840c5bfdd43
+_md5_=b1e04befef0111592859c37d791c2359
diff --git a/metadata/md5-cache/dev-python/coverage-7.0.5 b/metadata/md5-cache/dev-python/coverage-7.0.5
deleted file mode 100644
index 5ac5ec3b792f..000000000000
--- a/metadata/md5-cache/dev-python/coverage-7.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code coverage measurement for Python
-EAPI=8
-HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/coverage/coverage-7.0.5.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=acf33c556f004617f7f9bccd0ae13028
diff --git a/metadata/md5-cache/dev-python/coverage-7.1.0 b/metadata/md5-cache/dev-python/coverage-7.1.0
index a513a267a246..e1429293beb3 100644
--- a/metadata/md5-cache/dev-python/coverage-7.1.0
+++ b/metadata/md5-cache/dev-python/coverage-7.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-7.1.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5a047316a49fbf3b1f17f3ae17c5b0ec
+_md5_=acf33c556f004617f7f9bccd0ae13028
diff --git a/metadata/md5-cache/dev-python/coverage-7.2.0 b/metadata/md5-cache/dev-python/coverage-7.2.0
deleted file mode 100644
index b643f0f09f14..000000000000
--- a/metadata/md5-cache/dev-python/coverage-7.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code coverage measurement for Python
-EAPI=8
-HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/coverage/coverage-7.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1d6ace912253858246fed04b242259a2
diff --git a/metadata/md5-cache/dev-python/cython-0.29.33 b/metadata/md5-cache/dev-python/cython-0.29.33
index 1ab4e9c9ef70..ede22d6b1825 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.33
+++ b/metadata/md5-cache/dev-python/cython-0.29.33
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://cython.org/ https://github.com/cython/cython/ https://pypi.org/project/Cython/
 INHERIT=distutils-r1 toolchain-funcs elisp-common
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.33.tar.gz -> cython-0.29.33.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ffd6e0bf9d451aaa4df8e7f42e00dd07
+_md5_=0ec48a4202e13108fe68a5ea3e312909
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.50 b/metadata/md5-cache/dev-python/dulwich-0.20.50
deleted file mode 100644
index 2bffcd4d50a6..000000000000
--- a/metadata/md5-cache/dev-python/dulwich-0.20.50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-crypt/gpgme[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fastimport[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
-EAPI=8
-HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
-INHERIT=distutils-r1
-IUSE=doc examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ Apache-2.0
-RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.50.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fd5a2f69537bd3f96858dcd6f5436757
diff --git a/metadata/md5-cache/dev-python/dulwich-0.21.0 b/metadata/md5-cache/dev-python/dulwich-0.21.0
deleted file mode 100644
index 33db89f77296..000000000000
--- a/metadata/md5-cache/dev-python/dulwich-0.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-crypt/gpgme[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fastimport[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
-EAPI=8
-HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
-INHERIT=distutils-r1
-IUSE=doc examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ Apache-2.0
-RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dulwich/dulwich-0.21.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3b9db2a2aaa19ffeddf407deeecd4a4d
diff --git a/metadata/md5-cache/dev-python/dulwich-0.21.1 b/metadata/md5-cache/dev-python/dulwich-0.21.1
deleted file mode 100644
index 6c5c7a3819db..000000000000
--- a/metadata/md5-cache/dev-python/dulwich-0.21.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-crypt/gpgme[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fastimport[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
-EAPI=8
-HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
-INHERIT=distutils-r1
-IUSE=doc examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ Apache-2.0
-RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dulwich/dulwich-0.21.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3b9db2a2aaa19ffeddf407deeecd4a4d
diff --git a/metadata/md5-cache/dev-python/dulwich-0.21.2 b/metadata/md5-cache/dev-python/dulwich-0.21.2
index 000aa6461f82..b50807559e59 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.21.2
+++ b/metadata/md5-cache/dev-python/dulwich-0.21.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
 INHERIT=distutils-r1
 IUSE=doc examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.21.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=538db5d607d26db28072b3a6c1be2fc1
+_md5_=fd5a2f69537bd3f96858dcd6f5436757
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.10.0 b/metadata/md5-cache/dev-python/fakeredis-2.10.0
new file mode 100644
index 000000000000..7e9e9ecbf227
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-2.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/redis-5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+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
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/redis-5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cunla/fakeredis-py/archive/v2.10.0.tar.gz -> fakeredis-py-2.10.0.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=38b3504364ba7179dc39e9c2ee36462b
diff --git a/metadata/md5-cache/dev-python/fsspec-2023.3.0 b/metadata/md5-cache/dev-python/fsspec-2023.3.0
new file mode 100644
index 000000000000..555a075b0cd9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-2023.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A specification that python filesystems should adhere to
+EAPI=8
+HOMEPAGE=https://github.com/fsspec/filesystem_spec/ https://pypi.org/project/fsspec/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fsspec/filesystem_spec/archive/2023.3.0.tar.gz -> filesystem_spec-2023.3.0.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a582d611622e3c00bf32105e64896b62
diff --git a/metadata/md5-cache/dev-python/hiredis-2.2.2 b/metadata/md5-cache/dev-python/hiredis-2.2.2
deleted file mode 100644
index 7988e87965ff..000000000000
--- a/metadata/md5-cache/dev-python/hiredis-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=system-libs? ( >=dev-libs/hiredis-1.0.0:= )
-DESCRIPTION=Python extension that wraps hiredis
-EAPI=8
-HOMEPAGE=https://github.com/redis/hiredis-py/
-INHERIT=distutils-r1
-IUSE=system-libs python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=system-libs? ( >=dev-libs/hiredis-1.0.0:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hiredis/hiredis-2.2.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d305c482a9c9e102729e5035a7fa6668
diff --git a/metadata/md5-cache/dev-python/hiredis-2.2.2-r1 b/metadata/md5-cache/dev-python/hiredis-2.2.2-r1
new file mode 100644
index 000000000000..eca3c8944161
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hiredis-2.2.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-libs/hiredis-1.0.0:= >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/hiredis-1.0.0:=
+DESCRIPTION=Python extension that wraps hiredis
+EAPI=8
+HOMEPAGE=https://github.com/redis/hiredis-py/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/hiredis-1.0.0:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/redis/hiredis-py/archive/refs/tags/v2.2.2.tar.gz -> hiredis-2.2.2.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8328409db4434855fee651b7de61b046
diff --git a/metadata/md5-cache/dev-python/js2py-0.71_p20210918 b/metadata/md5-cache/dev-python/js2py-0.71_p20210918
deleted file mode 100644
index 6a0dbd9da0b9..000000000000
--- a/metadata/md5-cache/dev-python/js2py-0.71_p20210918
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JavaScript to Python Translator & JavaScript interpreter in Python
-EAPI=8
-HOMEPAGE=http://piter.io/projects/js2py/ https://github.com/PiotrDabkowski/Js2Py/ https://pypi.org/project/Js2Py/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyjsparser-2.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tzlocal-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/b16d7ce90ac9c03358010c1599c3e87698c9993f.tar.gz -> Js2Py-0.71_p20210918.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7ca56b0b1cd0cdd60476cfa83e161f11
diff --git a/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4 b/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
index 97bfe1a83a3f..4f70ffefb50e 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
+++ b/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_terminals/ https://pypi.org/project/jupyter-server-terminals/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~hppa ~s390 ~sparc
 LICENSE=BSD
 RDEPEND=dev-python/terminado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 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/j/jupyter-server-terminals/jupyter_server_terminals-0.4.4.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3006ca6a8657b18f72dd2acd508be2a4
+_md5_=e814f333d963f9d17b8ce4a3e470b7c9
diff --git a/metadata/md5-cache/dev-python/jupyter_events-0.6.3 b/metadata/md5-cache/dev-python/jupyter_events-0.6.3
index 06504e5498d9..3c6a3a0351d4 100644
--- a/metadata/md5-cache/dev-python/jupyter_events-0.6.3
+++ b/metadata/md5-cache/dev-python/jupyter_events-0.6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_events/ https://pypi.org/project/jupyter-events/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-json-logger-2.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_events/jupyter_events-0.6.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=df7397bbb336df172a917ec541a324e9
+_md5_=285889489c2e7abafdfbbdc1b9d05ed5
diff --git a/metadata/md5-cache/dev-python/jupyter_server-2.3.0 b/metadata/md5-cache/dev-python/jupyter_server-2.3.0
index ebc38c2c20e6..cf5ebb8ad8ab 100644
--- a/metadata/md5-cache/dev-python/jupyter_server-2.3.0
+++ b/metadata/md5-cache/dev-python/jupyter_server-2.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server/ https://pypi.org/project/jupyter-server/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~hppa ~s390 ~sparc
 LICENSE=BSD
 RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 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/j/jupyter_server/jupyter_server-2.3.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=191804649341024e28cb88079f5ee38e
+_md5_=2d7b439645d6d3e5bd2903898fc8686d
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index 4fe74d479b15..d43a7dd53f45 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=67d902868be793a5cb25a3d9aae6cdef
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index 0c7a6a563f50..4b2f517c84f8 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=45d97da77128f8228ae4f1e1e46544ca
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0.9999 b/metadata/md5-cache/dev-python/lit-16.0.0.9999
index 235b746aba5a..0ee4e77ed75f 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-16.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_rc3 b/metadata/md5-cache/dev-python/lit-16.0.0_rc3
index 1f9f0954fc51..fa4dd3e44469 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0_rc3
+++ b/metadata/md5-cache/dev-python/lit-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=76aafe2b1c14b670a7497cda70885ee2
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0.9999 b/metadata/md5-cache/dev-python/lit-17.0.0.9999
index 235b746aba5a..0ee4e77ed75f 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-17.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225
index fef22285948d..fe826078d36a 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304
new file mode 100644
index 000000000000..b253c5c6b25d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=distutils-r1 llvm.org
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.7.1 b/metadata/md5-cache/dev-python/matplotlib-3.7.1
new file mode 100644
index 000000000000..bc461e45979a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-3.7.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/setuptools-scm-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=8
+HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
+INHERIT=distutils-r1 flag-o-matic multiprocessing prefix pypi toolchain-funcs virtualx
+IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-3.7.1.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=9cbb1b29a6df733efae8828d200b4fb5
diff --git a/metadata/md5-cache/dev-python/meshio-5.3.4 b/metadata/md5-cache/dev-python/meshio-5.3.4
index 9d87eb87e8c8..4b9213ca9285 100644
--- a/metadata/md5-cache/dev-python/meshio-5.3.4
+++ b/metadata/md5-cache/dev-python/meshio-5.3.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] hdf5? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) netcdf? ( dev-python/netcdf4-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] hdf5? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) netcdf? ( dev-python/netcdf4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Input/output for many mesh formats
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=hdf5 netcdf test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] hdf5? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) netcdf? ( dev-python/netcdf4-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rich[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] hdf5? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) netcdf? ( dev-python/netcdf4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/meshio/meshio-5.3.4.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=09a065d7e919a3b98ef1b0c43d37b3cc
+_md5_=50a54339d5fe106bac77598b4c950950
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.5.8 b/metadata/md5-cache/dev-python/netcdf4-1.5.8
index 7388ba7e4b07..7388ba7e4b07 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.5.8
+++ b/metadata/md5-cache/dev-python/netcdf4-1.5.8
diff --git a/metadata/md5-cache/dev-python/netcdf4-1.6.3 b/metadata/md5-cache/dev-python/netcdf4-1.6.3
new file mode 100644
index 000000000000..aa43d310e54e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/netcdf4-1.6.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/hdf5:= sci-libs/netcdf:=[hdf5] dev-python/cftime[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/netcdf[tools] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/hdf5:= sci-libs/netcdf:=[hdf5]
+DESCRIPTION=Python/numpy interface to the netCDF C library
+EAPI=8
+HOMEPAGE=https://unidata.github.io/netcdf4-python/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/hdf5:= sci-libs/netcdf:=[hdf5] dev-python/cftime[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/netCDF4/netCDF4-1.6.3.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6a5ecba2fefaaab9b118b7d4c3ead99f
diff --git a/metadata/md5-cache/dev-python/pikepdf-7.1.1 b/metadata/md5-cache/dev-python/pikepdf-7.1.1
index 9115d286ca00..aa08631f7f2d 100644
--- a/metadata/md5-cache/dev-python/pikepdf-7.1.1
+++ b/metadata/md5-cache/dev-python/pikepdf-7.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pikepdf/pikepdf-7.1.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=67ac650c1d9b608412a51eb6c57fcf50
+_md5_=91f9144a9aa3d8c14bdf74448312e420
diff --git a/metadata/md5-cache/dev-python/pygame-2.1.3 b/metadata/md5-cache/dev-python/pygame-2.1.3
index f8758edaa134..6a859a629c34 100644
--- a/metadata/md5-cache/dev-python/pygame-2.1.3
+++ b/metadata/md5-cache/dev-python/pygame-2.1.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.pygame.org/ https://github.com/pygame/pygame/ https://pypi.org/project/pygame/
 INHERIT=distutils-r1
 IUSE=examples opengl test X python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads,video,X] ) !X? ( media-libs/libsdl2[threads] ) media-libs/fontconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygame/pygame/archive/2.1.3.tar.gz -> pygame-2.1.3.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3e0b824dff22f69cedc0f0f732f6ec61
+_md5_=dcd214dfec165c0ab846a5b2b4730783
diff --git a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421-r2 b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421-r2
index 7acd36bd94d7..c8df506d7e1d 100644
--- a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421-r2
+++ b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/pyjsparser/archive/5465d037b30e334cb0997f2315ec1e451b8ad4c1.tar.gz -> pyjsparser-2.7.1_p20190421.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b44f96f614163dd91d642e9acb37f313
+_md5_=1692f9f22b9847ffe17da2bf958d5f20
diff --git a/metadata/md5-cache/dev-python/pypdf-3.4.1 b/metadata/md5-cache/dev-python/pypdf-3.4.1
index 03b9ca8343b0..8d61b00f3365 100644
--- a/metadata/md5-cache/dev-python/pypdf-3.4.1
+++ b/metadata/md5-cache/dev-python/pypdf-3.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD-2
 PROPERTIES=test_network
 RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/py-pdf/pypdf/archive/3.4.1.tar.gz -> pypdf-3.4.1.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0fe84b30ed33ff3daa9293e44349b8618f135699.tar.gz -> pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz )
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ae2f20813d5dc53248bf201c6dbd5cfc
+_md5_=81fb0e38e1630f580b885b91425bea60
diff --git a/metadata/md5-cache/dev-python/pyproject-api-1.5.0 b/metadata/md5-cache/dev-python/pyproject-api-1.5.0
index 62c722d544c0..b82d283aa8fc 100644
--- a/metadata/md5-cache/dev-python/pyproject-api-1.5.0
+++ b/metadata/md5-cache/dev-python/pyproject-api-1.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-api/ https://pypi.org/project/pyproject-api/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/pyproject-api/archive/1.5.0.tar.gz -> pyproject-api-1.5.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0429ef63d07358dd781e61b784dc7404
+_md5_=78419625c3224b6f7bb00eddda084851
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.5.0 b/metadata/md5-cache/dev-python/pyproject-metadata-0.5.0
deleted file mode 100644
index 63eed0c75f2b..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-metadata-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PEP 621 metadata parsing
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pyproject-metadata/ https://github.com/FFY00/python-pyproject-metadata/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FFY00/python-pyproject-metadata/archive/0.5.0.tar.gz -> pyproject-metadata-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b42d976a6a4f248931e9c05221e66e6c
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1 b/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
deleted file mode 100644
index e40c6ce3d7e1..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-metadata-0.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PEP 621 metadata parsing
-EAPI=8
-HOMEPAGE=https://github.com/FFY00/python-pyproject-metadata/ https://pypi.org/project/pyproject-metadata/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FFY00/python-pyproject-metadata/archive/0.6.1.tar.gz -> pyproject-metadata-0.6.1.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a4cb19a7918c2acc4ced3e9997ed8b72
diff --git a/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1 b/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1
index 8d84b6ecb0f1..721b43c667c6 100644
--- a/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1
+++ b/metadata/md5-cache/dev-python/pyproject-metadata-0.7.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/FFY00/python-pyproject-metadata/ https://pypi.org/project/pyproject-metadata/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FFY00/python-pyproject-metadata/archive/0.7.1.tar.gz -> pyproject-metadata-0.7.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ae388620e18e697e10ad15718b233783
+_md5_=da23a3f0d056c1f4fbd21f160515b6a0
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.13.2 b/metadata/md5-cache/dev-python/pyqtgraph-0.13.2
new file mode 100644
index 000000000000..6e096b8af447
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.13.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/h5py[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[testlib,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xvfb[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
+EAPI=8
+HOMEPAGE=https://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph/ https://pypi.org/project/pyqtgraph/
+INHERIT=distutils-r1 multiprocessing
+IUSE=opengl svg test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=test? ( opengl svg ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.13.2.tar.gz -> pyqtgraph-0.13.2.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1c8fa48cebb3244f9ff0703473e5800a
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.7-r1 b/metadata/md5-cache/dev-python/pyside2-5.15.7-r1
deleted file mode 100644
index 0ab5b82e027d..000000000000
--- a/metadata/md5-cache/dev-python/pyside2-5.15.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/shiboken2-5.15.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtcore-5.15*:5 =dev-qt/qtopengl-5.15*:5[gles2-only=] =dev-qt/qtserialport-5.15*:5 3d? ( =dev-qt/qt3d-5.15*:5[qml?,gles2-only=] ) charts? ( =dev-qt/qtcharts-5.15*:5[qml?] ) concurrent? ( =dev-qt/qtconcurrent-5.15*:5 ) datavis? ( =dev-qt/qtdatavis3d-5.15*:5[qml?,gles2-only=] ) designer? ( =dev-qt/designer-5.15*:5 ) gui? ( =dev-qt/qtgui-5.15*:5[jpeg,gles2-only=] ) help? ( =dev-qt/qthelp-5.15*:5 ) location? ( =dev-qt/qtlocation-5.15*:5 ) multimedia? ( =dev-qt/qtmultimedia-5.15*:5[qml?,gles2-only=,widgets?] ) network? ( =dev-qt/qtnetwork-5.15*:5 ) positioning? ( =dev-qt/qtpositioning-5.15*:5[qml?] ) printsupport? ( =dev-qt/qtprintsupport-5.15*:5[gles2-only=] ) qml? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] ) quick? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] =dev-qt/qtquickcontrols2-5.15*:5[widgets?] ) script? ( =dev-qt/qtscript-5.15*:5[scripttools?] ) scxml? ( =dev-qt/qtscxml-5.15*:5 ) sensors? ( =dev-qt/qtsensors-5.15*:5[qml?] ) speech? ( =dev-qt/qtspeech-5.15*:5 ) sql? ( =dev-qt/qtsql-5.15*:5 ) svg? ( =dev-qt/qtsvg-5.15*:5 ) testlib? ( =dev-qt/qttest-5.15*:5 ) webchannel? ( =dev-qt/qtwebchannel-5.15*:5[qml] ) webengine? ( =dev-qt/qtwebengine-5.15*:5[alsa,widgets?] ) websockets? ( =dev-qt/qtwebsockets-5.15*:5[qml?] ) widgets? ( =dev-qt/qtwidgets-5.15*:5[gles2-only=] ) x11extras? ( =dev-qt/qtx11extras-5.15*:5 ) xml? ( =dev-qt/qtxml-5.15*:5 ) xmlpatterns? ( =dev-qt/qtxmlpatterns-5.15*:5[qml?] ) test? ( x11-misc/xvfb-run )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide2
-INHERIT=cmake python-r1 virtualx
-IUSE=3d charts +concurrent datavis designer gles2-only +gui help location multimedia +network positioning +printsupport qml quick script scripttools scxml sensors speech +sql svg test +testlib webchannel webengine websockets +widgets +x11extras xml xmlpatterns python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/shiboken2-5.15.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtcore-5.15*:5 =dev-qt/qtopengl-5.15*:5[gles2-only=] =dev-qt/qtserialport-5.15*:5 3d? ( =dev-qt/qt3d-5.15*:5[qml?,gles2-only=] ) charts? ( =dev-qt/qtcharts-5.15*:5[qml?] ) concurrent? ( =dev-qt/qtconcurrent-5.15*:5 ) datavis? ( =dev-qt/qtdatavis3d-5.15*:5[qml?,gles2-only=] ) designer? ( =dev-qt/designer-5.15*:5 ) gui? ( =dev-qt/qtgui-5.15*:5[jpeg,gles2-only=] ) help? ( =dev-qt/qthelp-5.15*:5 ) location? ( =dev-qt/qtlocation-5.15*:5 ) multimedia? ( =dev-qt/qtmultimedia-5.15*:5[qml?,gles2-only=,widgets?] ) network? ( =dev-qt/qtnetwork-5.15*:5 ) positioning? ( =dev-qt/qtpositioning-5.15*:5[qml?] ) printsupport? ( =dev-qt/qtprintsupport-5.15*:5[gles2-only=] ) qml? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] ) quick? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] =dev-qt/qtquickcontrols2-5.15*:5[widgets?] ) script? ( =dev-qt/qtscript-5.15*:5[scripttools?] ) scxml? ( =dev-qt/qtscxml-5.15*:5 ) sensors? ( =dev-qt/qtsensors-5.15*:5[qml?] ) speech? ( =dev-qt/qtspeech-5.15*:5 ) sql? ( =dev-qt/qtsql-5.15*:5 ) svg? ( =dev-qt/qtsvg-5.15*:5 ) testlib? ( =dev-qt/qttest-5.15*:5 ) webchannel? ( =dev-qt/qtwebchannel-5.15*:5[qml] ) webengine? ( =dev-qt/qtwebengine-5.15*:5[alsa,widgets?] ) websockets? ( =dev-qt/qtwebsockets-5.15*:5[qml?] ) widgets? ( =dev-qt/qtwidgets-5.15*:5[gles2-only=] ) x11extras? ( =dev-qt/qtx11extras-5.15*:5 ) xml? ( =dev-qt/qtxml-5.15*:5 ) xmlpatterns? ( =dev-qt/qtxmlpatterns-5.15*:5[qml?] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) 3d? ( gui network ) charts? ( gui widgets ) datavis? ( gui ) designer? ( gui widgets xml ) gles2-only? ( gui ) help? ( gui sql widgets ) location? ( gui network positioning quick ) multimedia? ( gui network widgets ) printsupport? ( gui widgets ) qml? ( gui network ) quick? ( gui network qml widgets network ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( gui network positioning quick qml widgets? ( printsupport network webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.7-src/pyside-setup-opensource-src-5.15.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=66a7842d1ab4cac1fb56e8a5885ad417
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.8-r1 b/metadata/md5-cache/dev-python/pyside2-5.15.8-r1
index 1d23134aef72..eabe54a26113 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.15.8-r1
+++ b/metadata/md5-cache/dev-python/pyside2-5.15.8-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1 virtualx
 IUSE=3d charts +concurrent datavis designer gles2-only +gui help location multimedia +network positioning +printsupport qml quick script scripttools scxml sensors speech +sql svg test +testlib webchannel webengine websockets +widgets +x11extras xml xmlpatterns python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/shiboken2-5.15.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtcore-5.15*:5 =dev-qt/qtopengl-5.15*:5[gles2-only=] =dev-qt/qtserialport-5.15*:5 3d? ( =dev-qt/qt3d-5.15*:5[qml?,gles2-only=] ) charts? ( =dev-qt/qtcharts-5.15*:5[qml?] ) concurrent? ( =dev-qt/qtconcurrent-5.15*:5 ) datavis? ( =dev-qt/qtdatavis3d-5.15*:5[qml?,gles2-only=] ) designer? ( =dev-qt/designer-5.15*:5 ) gui? ( =dev-qt/qtgui-5.15*:5[jpeg,gles2-only=] ) help? ( =dev-qt/qthelp-5.15*:5 ) location? ( =dev-qt/qtlocation-5.15*:5 ) multimedia? ( =dev-qt/qtmultimedia-5.15*:5[qml?,gles2-only=,widgets?] ) network? ( =dev-qt/qtnetwork-5.15*:5 ) positioning? ( =dev-qt/qtpositioning-5.15*:5[qml?] ) printsupport? ( =dev-qt/qtprintsupport-5.15*:5[gles2-only=] ) qml? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] ) quick? ( =dev-qt/qtdeclarative-5.15*:5[widgets?] =dev-qt/qtquickcontrols2-5.15*:5[widgets?] ) script? ( =dev-qt/qtscript-5.15*:5[scripttools?] ) scxml? ( =dev-qt/qtscxml-5.15*:5 ) sensors? ( =dev-qt/qtsensors-5.15*:5[qml?] ) speech? ( =dev-qt/qtspeech-5.15*:5 ) sql? ( =dev-qt/qtsql-5.15*:5 ) svg? ( =dev-qt/qtsvg-5.15*:5 ) testlib? ( =dev-qt/qttest-5.15*:5 ) webchannel? ( =dev-qt/qtwebchannel-5.15*:5[qml] ) webengine? ( =dev-qt/qtwebengine-5.15*:5[alsa,widgets?] ) websockets? ( =dev-qt/qtwebsockets-5.15*:5[qml?] ) widgets? ( =dev-qt/qtwidgets-5.15*:5[gles2-only=] ) x11extras? ( =dev-qt/qtx11extras-5.15*:5 ) xml? ( =dev-qt/qtxml-5.15*:5 ) xmlpatterns? ( =dev-qt/qtxmlpatterns-5.15*:5[qml?] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) 3d? ( gui network ) charts? ( gui widgets ) datavis? ( gui ) designer? ( gui widgets xml ) gles2-only? ( gui ) help? ( gui sql widgets ) location? ( gui network positioning quick ) multimedia? ( gui network widgets ) printsupport? ( gui widgets ) qml? ( gui network ) quick? ( gui network qml widgets network ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( gui network positioning quick qml widgets? ( printsupport network webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ce2e51c80f32d3913b97009c3aed340
+_md5_=66a7842d1ab4cac1fb56e8a5885ad417
diff --git a/metadata/md5-cache/dev-python/pyside2-tools-5.15.7 b/metadata/md5-cache/dev-python/pyside2-tools-5.15.7
deleted file mode 100644
index c6112d3db888..000000000000
--- a/metadata/md5-cache/dev-python/pyside2-tools-5.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/pyside2-5.15.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=PySide development tools (pyside2-lupdate with support for Python)
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide2
-INHERIT=cmake python-r1
-IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/pyside2-5.15.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.7-src/pyside-setup-opensource-src-5.15.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aabc17f537f0554ff37690a89031a97f
diff --git a/metadata/md5-cache/dev-python/pyside2-tools-5.15.8 b/metadata/md5-cache/dev-python/pyside2-tools-5.15.8
index 4459a242dbf1..13670a9e4ae8 100644
--- a/metadata/md5-cache/dev-python/pyside2-tools-5.15.8
+++ b/metadata/md5-cache/dev-python/pyside2-tools-5.15.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/pyside2-5.15.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b887945be98a3f49c8e5b7dbe19a63da
+_md5_=aabc17f537f0554ff37690a89031a97f
diff --git a/metadata/md5-cache/dev-python/pytest_jupyter-0.6.2 b/metadata/md5-cache/dev-python/pytest_jupyter-0.6.2
index 78082f97a5ff..854e8d5bdacc 100644
--- a/metadata/md5-cache/dev-python/pytest_jupyter-0.6.2
+++ b/metadata/md5-cache/dev-python/pytest_jupyter-0.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter_client-7.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest_jupyter/pytest_jupyter-0.6.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b047613ed1c3308825412bf7797f9fb7
+_md5_=e01b2e772b5f97fdbe1b228bc4d9b347
diff --git a/metadata/md5-cache/dev-python/python-json-logger-2.0.7 b/metadata/md5-cache/dev-python/python-json-logger-2.0.7
index a504c676a1c5..e776c576c16b 100644
--- a/metadata/md5-cache/dev-python/python-json-logger-2.0.7
+++ b/metadata/md5-cache/dev-python/python-json-logger-2.0.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/madzak/python-json-logger/ https://pypi.org/project/python-json-logger/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 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/p/python-json-logger/python-json-logger-2.0.7.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ab4b5e1032a22ae5ae58d7e44db8030c
+_md5_=91fce7e5fcb6edd4fdeb875d1e99f068
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
index 900e0d0ef71e..67bee79a968f 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9839d68ca1e7e758523cd868bdda6d7f
+_md5_=3686f9da64905071b37fcd8f6755ce9b
diff --git a/metadata/md5-cache/dev-python/rich-13.3.2 b/metadata/md5-cache/dev-python/rich-13.3.2
new file mode 100644
index 000000000000..4eae6681670a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rich-13.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.13.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
+EAPI=8
+HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-it-py-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-it-py-2.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.13.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Textualize/rich/archive/v13.3.2.tar.gz -> rich-13.3.2.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9842fb220b0c5f3fe5fd17589136c19a
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.7 b/metadata/md5-cache/dev-python/shiboken2-5.15.7
deleted file mode 100644
index dc2e0f4cbc05..000000000000
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) =dev-qt/qtcore-5.15*:5 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 =dev-qt/qtxml-5.15*:5 =dev-qt/qtxmlpatterns-5.15*:5 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qttest-5.15*:5 ) !!sys-devel/llvm:0
-DESCRIPTION=Python binding generator for C++ libraries
-EAPI=8
-HOMEPAGE=https://wiki.qt.io/PySide2
-INHERIT=cmake llvm python-r1 toolchain-funcs
-IUSE=+docstrings numpy test vulkan python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) =dev-qt/qtcore-5.15*:5 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 =dev-qt/qtxml-5.15*:5 =dev-qt/qtxmlpatterns-5.15*:5 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.7-src/pyside-setup-opensource-src-5.15.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=49b5184b886ee7105ad03d6ac2195810
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.8 b/metadata/md5-cache/dev-python/shiboken2-5.15.8
index 8918c34020e0..7eb51a2ecdd4 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.8
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake llvm python-r1 toolchain-funcs
 IUSE=+docstrings numpy test vulkan python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) =dev-qt/qtcore-5.15*:5 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 =dev-qt/qtxml-5.15*:5 =dev-qt/qtxmlpatterns-5.15*:5 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.8-src/pyside-setup-opensource-src-5.15.8.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=006d42231e0ddff8de4b3ec07e783e3e
+_md5_=3b63bc8da16da19f7a0801aceba45b5c
diff --git a/metadata/md5-cache/dev-python/time-machine-2.9.0 b/metadata/md5-cache/dev-python/time-machine-2.9.0
index 1d70bf5e6e5b..618f8243f8a7 100644
--- a/metadata/md5-cache/dev-python/time-machine-2.9.0
+++ b/metadata/md5-cache/dev-python/time-machine-2.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/adamchainz/time-machine/ https://pypi.org/project/time-machine/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/adamchainz/time-machine/archive/2.9.0.tar.gz -> time-machine-2.9.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=02cac6df9e9b6c7e6eac24a223947a6d
+_md5_=ed13ad1ec8dfb26d777fcd6ee1f2506f
diff --git a/metadata/md5-cache/dev-python/tox-4.4.4 b/metadata/md5-cache/dev-python/tox-4.4.4
deleted file mode 100644
index 6dab8af6eec4..000000000000
--- a/metadata/md5-cache/dev-python/tox-4.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/time-machine-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/time-machine-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/cachetools-5.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=8
-HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/cachetools-5.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/4.4.4.tar.gz -> tox-4.4.4.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8c376b64d76685499f89dcfe8688a4f0
diff --git a/metadata/md5-cache/dev-python/tox-4.4.5 b/metadata/md5-cache/dev-python/tox-4.4.5
deleted file mode 100644
index 1ff12717a63b..000000000000
--- a/metadata/md5-cache/dev-python/tox-4.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/hatch-vcs-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/build-0.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/time-machine-2.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/time-machine-2.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/cachetools-5.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=8
-HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/cachetools-5.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/4.4.5.tar.gz -> tox-4.4.5.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d43741f3802b274d3986bbdc3a9017bd
diff --git a/metadata/md5-cache/dev-python/tox-4.4.6 b/metadata/md5-cache/dev-python/tox-4.4.6
index 1b5cfcea7f72..50d974c2f574 100644
--- a/metadata/md5-cache/dev-python/tox-4.4.6
+++ b/metadata/md5-cache/dev-python/tox-4.4.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cachetools-5.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/4.4.6.tar.gz -> tox-4.4.6.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8f25038d0d4e1281ae61c19d703a3486
+_md5_=d7f5bb6cc0ebf5d7b7916bbdaa774b88
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index feaa3ea8ad1c..9674a765303d 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.8 b/metadata/md5-cache/dev-qt/qtlocation-5.15.8
index 61e25be0f171..9a132991873b 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.8
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.8
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtlocation-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.8-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=22382cd65ca18270b35f7a9b1966c612
+_md5_=f48e12b6930beae06930431ce8fb0ecb
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.8-r1
new file mode 100644
index 000000000000..89103cc580b2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.8*:5= =dev-qt/qtdeclarative-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.8*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.8* )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=vulkan X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.8*:5= =dev-qt/qtdeclarative-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.8*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
+RESTRICT=test
+SLOT=5/5.15.8
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtwayland-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.8-gentoo-kde-2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=2c3ee8ad80459d9a31ad83907d620e1c
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 4e7164ad0e8d..0c8c696e49c3 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/date-3.3.3 b/metadata/md5-cache/dev-ruby/date-3.3.3
index 6cbd613dadbc..7d8f0074fc49 100644
--- a/metadata/md5-cache/dev-ruby/date-3.3.3
+++ b/metadata/md5-cache/dev-ruby/date-3.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/date
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/date/archive/v3.3.3.tar.gz -> date-3.3.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3c096b402ea0483b9bcf317debdf0e4d
+_md5_=a4be9ff0bf69430997a2353a1b72f867
diff --git a/metadata/md5-cache/dev-ruby/debug-1.7.1 b/metadata/md5-cache/dev-ruby/debug-1.7.1
index 65e1eb5c85c0..fc510bfacef8 100644
--- a/metadata/md5-cache/dev-ruby/debug-1.7.1
+++ b/metadata/md5-cache/dev-ruby/debug-1.7.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/debug
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby/debug/archive/v1.7.1.tar.gz -> debug-1.7.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5faed7cb023acc63718013b2f2d2e72c
+_md5_=242bfa7cfbf0c27bbf06b36e3d50c62f
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.1 b/metadata/md5-cache/dev-ruby/digest-3.1.1
index 722dc7877406..082c14d50fab 100644
--- a/metadata/md5-cache/dev-ruby/digest-3.1.1
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/digest
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/digest/archive/v3.1.1.tar.gz -> digest-3.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=077de28ed2718058149b3747a5d044e6
+_md5_=1e225dd32ef16a5035eadf22e3b00907
diff --git a/metadata/md5-cache/dev-ruby/forwardable-1.3.3 b/metadata/md5-cache/dev-ruby/forwardable-1.3.3
index c5dc6ad17daa..e4c7aed78555 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-1.3.3
+++ b/metadata/md5-cache/dev-ruby/forwardable-1.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/forwardable
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/forwardable/archive/v1.3.3.tar.gz -> forwardable-1.3.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1cbb691a6f448fe5ee5a880960ceeb38
+_md5_=779ee0e67e725bcc42bdc9e2743e438c
diff --git a/metadata/md5-cache/dev-ruby/matrix-0.4.2 b/metadata/md5-cache/dev-ruby/matrix-0.4.2
index 136e3059b7c4..b338031e2cc9 100644
--- a/metadata/md5-cache/dev-ruby/matrix-0.4.2
+++ b/metadata/md5-cache/dev-ruby/matrix-0.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/matrix
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/matrix/archive/v0.4.2.tar.gz -> matrix-0.4.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c1eceaa45985a1b964b269a761fbdc37
+_md5_=515081f02310129d52f51fe553d4d7dc
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1
index 41e67b6ae5ce..65a8ec5ef777 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitar[ruby_targets_ruby27(-)] dev-ruby/minitest-hooks[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitar[ruby_targets_ruby30(-)] dev-ruby/minitest-hooks[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/minitest-hooks[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitar[ruby_targets_ruby27(-)] dev-ruby/minitest-hooks[ruby_targets_ruby27(-)] dev-ruby/net-ftp[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitar[ruby_targets_ruby30(-)] dev-ruby/minitest-hooks[ruby_targets_ruby30(-)] dev-ruby/net-ftp[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/minitest-hooks[ruby_targets_ruby31(-)] dev-ruby/net-ftp[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitar[ruby_targets_ruby32(-)] dev-ruby/minitest-hooks[ruby_targets_ruby32(-)] dev-ruby/net-ftp[ruby_targets_ruby32(-)] dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Simplistic port-like solution for developers
 EAPI=8
 HOMEPAGE=https://github.com/flavorjones/mini_portile
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.8
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=69648394a1a601c3fe6d333c4144e0f2
+_md5_=fcaeb57a98c18d060c6b7cfab9d1f2ee
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9-r1 b/metadata/md5-cache/dev-ruby/minitar-0.9-r1
index 9000fcec0b79..6849196969a4 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9-r1
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Provides POSIX tarchive management from Ruby programs
 EAPI=8
 HOMEPAGE=https://github.com/halostatue/minitar
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 Ruby-BSD )
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2fe6c55a493cc9fe1217bbd120713eb2
+_md5_=5d4f5c0526ee93bb5c05919f01f9a481
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.18.0 b/metadata/md5-cache/dev-ruby/minitest-5.18.0
new file mode 100644
index 000000000000..52551dc04a91
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-5.18.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
+EAPI=8
+HOMEPAGE=https://github.com/minitest/minitest
+INHERIT=ruby-fakegem
+IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/minitest-5.18.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1a5c9fb595faf7db8389236fce07eff6
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index e710a37eabd4..20b5b5f330f8 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Adds around and before_all/after_all/around_all hooks for Minitest
 EAPI=8
 HOMEPAGE=https://github.com/jeremyevans/minitest-hooks
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-hooks-1.5.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d77c793efe0453c556c02db8498c3c0e
+_md5_=16c54bfb620cb819dea2015f656bf5f1
diff --git a/metadata/md5-cache/dev-ruby/net-ftp-0.2.0 b/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
index 4f0f2b1e9d09..52d8b31d0b72 100644
--- a/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ftp-0.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-ftp
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/net-protocol[ruby_targets_ruby27(-)] dev-ruby/time[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/net-protocol[ruby_targets_ruby30(-)] dev-ruby/time[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] dev-ruby/time[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] dev-ruby/time[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-ftp/archive/v0.2.0.tar.gz -> net-ftp-0.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=117fd4783c81d1c79498cc24523493f3
+_md5_=00971c60243837102e25a9feeaadc585
diff --git a/metadata/md5-cache/dev-ruby/net-imap-0.3.4 b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
index 9828d28884b2..c6c34378fae8 100644
--- a/metadata/md5-cache/dev-ruby/net-imap-0.3.4
+++ b/metadata/md5-cache/dev-ruby/net-imap-0.3.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-imap
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/date[ruby_targets_ruby27(-)] dev-ruby/net-protocol[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/date[ruby_targets_ruby30(-)] dev-ruby/net-protocol[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-imap/archive/v0.3.4.tar.gz -> net-imap-0.3.4.tar.gz test? ( https://www.rfc-editor.org/rfc/rfc3454.txt )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7d228f180d8ac541ac53df30fd863350
+_md5_=f4aef4a385e35bafa300d68fe72311f4
diff --git a/metadata/md5-cache/dev-ruby/net-pop-0.1.2 b/metadata/md5-cache/dev-ruby/net-pop-0.1.2
index 625f8499f4e0..87a758737225 100644
--- a/metadata/md5-cache/dev-ruby/net-pop-0.1.2
+++ b/metadata/md5-cache/dev-ruby/net-pop-0.1.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-pop
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/net-protocol[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/net-protocol[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-pop/archive/v0.1.2.tar.gz -> net-pop-0.1.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b02b900511dbd17816a41dfdc2cf90de
+_md5_=9cff2395507e64f3ce8d181ac63ac012
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.2.1 b/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
index 55c1c78a1d4b..a05f1115adc6 100644
--- a/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-protocol
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/timeout[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/timeout[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/timeout[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/timeout[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-protocol/archive/v0.2.1.tar.gz -> net-protocol-0.2.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8a9be756fc6c3e547ba9a1e284159d63
+_md5_=106c98f083e7a99534d953b03254d926
diff --git a/metadata/md5-cache/dev-ruby/net-smtp-0.3.3 b/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
index fe5591aad3ed..bc3f29508587 100644
--- a/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
+++ b/metadata/md5-cache/dev-ruby/net-smtp-0.3.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-smtp
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/net-protocol[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/net-protocol[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/net-protocol[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/net-protocol[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/net-smtp/archive/v0.3.3.tar.gz -> net-smtp-0.3.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c49b06d5650f71a1dfee2a79202bad95
+_md5_=bf98344e5c4ff5e475be991e80fcf343
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.14.2-r1 b/metadata/md5-cache/dev-ruby/nokogiri-1.14.2-r1
new file mode 100644
index 000000000000..a8b816e4bf9a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.14.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby27(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/rubyzip[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby30(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/rubyzip[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby31(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] dev-ruby/rubyzip[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby32(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby32(-)] dev-ruby/rdoc[ruby_targets_ruby32(-)] test? ( dev-ruby/minitest[ruby_targets_ruby32(-)] dev-ruby/rubyzip[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libxml2-2.10.3 >=dev-libs/libxslt-1.1.37 >=sys-libs/zlib-1.2.13 virtual/libiconv ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
+EAPI=8
+HOMEPAGE=https://nokogiri.org/
+INHERIT=ruby-fakegem multilib
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.10.3:= >=dev-libs/libxslt-1.1.37 sys-libs/zlib virtual/libiconv ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.14.2.tar.gz -> nokogiri-1.14.2-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5a151d75d03a489149f021cc8b9f029d
diff --git a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1 b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
index 2a7985034d5e..e30271006e10 100644
--- a/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/prime-0.1.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/prime
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/forwardable[ruby_targets_ruby27(-)] dev-ruby/singleton[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/forwardable[ruby_targets_ruby30(-)] dev-ruby/singleton[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/forwardable[ruby_targets_ruby31(-)] dev-ruby/singleton[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/forwardable[ruby_targets_ruby32(-)] dev-ruby/singleton[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/prime/archive/v0.1.2.tar.gz -> prime-0.1.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=15567a936e26ccedb1d4d10c9640365b
+_md5_=a6a84c2c85e9ed5fd4a3e99e1dfed50f
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1 b/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
index 1ab90840ed12..216d138f431c 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=8
 HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
-RDEPEND=!!app-admin/rex ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=!!app-admin/rex ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9a5242b436a51595322064f3cb0e0005
+_md5_=42fba2861a678d4d84ea34ecf6a69e89
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
index 2598a4a01d3f..9eb6e7ebe378 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-arch/zip ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=test? ( app-arch/zip ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=8
 HOMEPAGE=https://github.com/rubyzip/rubyzip
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Ruby-BSD
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.2.tar.gz -> rubyzip-2.3.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=acf84cd02495a023e216ed12468c08be
+_md5_=dbc568dccc461c44d01a13e7d01bfd1f
diff --git a/metadata/md5-cache/dev-ruby/singleton-0.1.1 b/metadata/md5-cache/dev-ruby/singleton-0.1.1
index 5dbf0fbfb532..8baac7806a8d 100644
--- a/metadata/md5-cache/dev-ruby/singleton-0.1.1
+++ b/metadata/md5-cache/dev-ruby/singleton-0.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/singleton
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/singleton/archive/v0.1.1.tar.gz -> singleton-0.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6e420f1bd84f31096d5a3e2f53cecee0
+_md5_=7e03e63f5bb6ea32c1096e753a431ec3
diff --git a/metadata/md5-cache/dev-ruby/strscan-3.0.6 b/metadata/md5-cache/dev-ruby/strscan-3.0.6
index 0c097e9d3a1f..80f2443bc209 100644
--- a/metadata/md5-cache/dev-ruby/strscan-3.0.6
+++ b/metadata/md5-cache/dev-ruby/strscan-3.0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/strscan
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/strscan/archive/v3.0.6.tar.gz -> strscan-3.0.6.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f99444314a88d1433cb6ae5766aa860f
+_md5_=1324d325919bbf481e846b375d86c197
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index bc3902f834e3..35dd4ba6efef 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Syntax highlighting for sourcecode and HTML
 EAPI=8
 HOMEPAGE=https://github.com/dblock/syntax
 INHERIT=ruby-fakegem
-IUSE=test doc ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test doc ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6cda2e34ea8422a2456d067420942cd7
+_md5_=bb8596749b1aed2e846a769418467ffb
diff --git a/metadata/md5-cache/dev-ruby/time-0.2.1 b/metadata/md5-cache/dev-ruby/time-0.2.1
index d7498fdd5162..b1a1ca92aa53 100644
--- a/metadata/md5-cache/dev-ruby/time-0.2.1
+++ b/metadata/md5-cache/dev-ruby/time-0.2.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/time
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-ruby/date[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/date[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/time/archive/v0.2.1.tar.gz -> time-0.2.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d9d14805c17dc9c1a1b4c1cc773aab3f
+_md5_=2ba0ba0375f82f53f09cfdf91f2ea25a
diff --git a/metadata/md5-cache/dev-ruby/timeout-0.3.1 b/metadata/md5-cache/dev-ruby/timeout-0.3.1
index 2ef43429a698..3a4c5e338b0c 100644
--- a/metadata/md5-cache/dev-ruby/timeout-0.3.1
+++ b/metadata/md5-cache/dev-ruby/timeout-0.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/timeout
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/timeout/archive/v0.3.1.tar.gz -> timeout-0.3.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6263f52661a8269aa7668a0b5b420e46
+_md5_=5dfdaad91b7906e737a51da0d7305b0a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 3a49f7e3ff18..b71c29ea9a98 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-libyaml-20211124 b/metadata/md5-cache/dev-scheme/guile-libyaml-20211124
index adbff69ac097..b107f145e714 100644
--- a/metadata/md5-cache/dev-scheme/guile-libyaml-20211124
+++ b/metadata/md5-cache/dev-scheme/guile-libyaml-20211124
@@ -10,4 +10,4 @@ RDEPEND=>=dev-scheme/guile-2.0.0:= dev-libs/libyaml
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/mwette/guile-libyaml/archive/2bdacb72a65ab63264b2edc9dac9692df7ec9b3e.tar.gz -> guile-libyaml-20211124.tar.gz
-_md5_=9123b9321694044f39cec6df9277cf36
+_md5_=35bf1206aede781c64b3049a95ccceec
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e34b9bd36b07..7c9ed5af18c1 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/bpftool-6.1.7 b/metadata/md5-cache/dev-util/bpftool-6.1.7
index e26a3f6a3437..86ff60109a23 100644
--- a/metadata/md5-cache/dev-util/bpftool-6.1.7
+++ b/metadata/md5-cache/dev-util/bpftool-6.1.7
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/patchutils || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/tar dev-python/docutils
+BDEPEND=dev-util/patchutils || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/tar dev-python/docutils
 DEFINED_PHASES=compile install postinst prepare setup unpack
 DEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= ) >=sys-kernel/linux-headers-5.8
 DESCRIPTION=Tool for inspection and simple manipulation of eBPF programs and maps
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-li
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.7.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=357986f2c2361c4b6f1262b0e4e6d5d9
+_md5_=403bc7310661f1b89c9c4286215697a0
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20221229 b/metadata/md5-cache/dev-util/dialog-1.3.20221229
index 604841382984..34d04de0e21b 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20221229
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20221229
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/dialog/
 INHERIT=verify-sig
 IUSE=examples minimal nls unicode verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
 SLOT=0/15
 SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20221229.tgz verify-sig? ( https://invisible-island.net/archives/dialog/dialog-1.3-20221229.tgz.asc )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=9d5eb1b68d9395219475c8a3f538dcd5
+_md5_=6acf1e2dfce67d3211b2341684607d0a
diff --git a/metadata/md5-cache/dev-util/diffoscope-238 b/metadata/md5-cache/dev-util/diffoscope-238
index 976a3ff8cbc8..9f83cbd96626 100644
--- a/metadata/md5-cache/dev-util/diffoscope-238
+++ b/metadata/md5-cache/dev-util/diffoscope-238
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1 pypi
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/libarchive-c[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tlsh[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/d/diffoscope/diffoscope-238.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6fea2251995f08774d58153ac2b3cdcc
+_md5_=e7a8eef95d071f2d2fb9979a7dea6440
diff --git a/metadata/md5-cache/dev-util/fuzz-0.6-r2 b/metadata/md5-cache/dev-util/fuzz-0.6-r2
deleted file mode 100644
index 4d3deca76087..000000000000
--- a/metadata/md5-cache/dev-util/fuzz-0.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=Stress-tests programs by giving them random input
-EAPI=7
-HOMEPAGE=http://fuzz.sourceforge.net/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9f08d068d2f3a7519bbbe187ea3e0015
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.5 b/metadata/md5-cache/dev-util/fuzz-0.6-r3
index 3eedadf19326..9ddd5afc28ee 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.5
+++ b/metadata/md5-cache/dev-util/fuzz-0.6-r3
@@ -1,13 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare
-DESCRIPTION=A deliberately simple workload generator for POSIX systems
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/readline:=
+DESCRIPTION=Stress-tests programs by giving them random input
 EAPI=8
-HOMEPAGE=https://salsa.debian.org/debian/stress
-INHERIT=autotools
-IUSE=static
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2+
+HOMEPAGE=http://fuzz.sourceforge.net/
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:=
 SLOT=0
-SRC_URI=mirror://debian/pool/main/s/stress/stress_1.0.5.orig.tar.gz
+SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=09e501836fbab271fd6cc90537b42f7f
+_md5_=2896ee82a59d5d8312f353f533eaf91d
diff --git a/metadata/md5-cache/dev-util/glslang-1.3.236 b/metadata/md5-cache/dev-util/glslang-1.3.236
deleted file mode 100644
index 6edc5d1a0916..000000000000
--- a/metadata/md5-cache/dev-util/glslang-1.3.236
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
-EAPI=7
-HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
-INHERIT=cmake-multilib python-any-r1
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=BSD
-RESTRICT=test
-SLOT=0/1
-SRC_URI=https://github.com/KhronosGroup/glslang/archive/sdk-1.3.236.0.tar.gz -> glslang-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=043c73617248029f71c169f0a9a74db3
diff --git a/metadata/md5-cache/dev-util/glslang-1.3.239 b/metadata/md5-cache/dev-util/glslang-1.3.239
index cbac15edb605..6c6fed4bb871 100644
--- a/metadata/md5-cache/dev-util/glslang-1.3.239
+++ b/metadata/md5-cache/dev-util/glslang-1.3.239
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
 INHERIT=cmake-multilib python-any-r1
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0/12
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/sdk-1.3.239.0.tar.gz -> glslang-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5ed41b5121835b7e97fdfc48a54a77a4
+_md5_=b594d8988af21231f67c40cbfd71470a
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index ba73d771f23c..65386e54140b 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c440bf0d29c528bd4a549fe2bac1c1fa
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index 90e59b4c6461..ce7a6e3b7eb1 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0.9999 b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
index eb564980bef2..1f4736194e2b 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
index f8711a87e01d..75b199ea1770 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2a25e20ef8aaa790f1ec2991e9b25c7f
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index 4a7acaaee1f9..fc7737420bb3 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
index f5ef4590a802..2208fa63968d 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304
new file mode 100644
index 000000000000..9b6ca9bc89b0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-17.0.0_pre20230304[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-17.0.0_pre20230304[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_pre20230304[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230304 ~sys-devel/llvm-17.0.0_pre20230304 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-single-r1
+IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230304 ~sys-devel/llvm-17.0.0_pre20230304 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0/17.0.0_pre20230304
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/meson-1.0.0 b/metadata/md5-cache/dev-util/meson-1.0.0
index cbcef57dea4c..4ee32d92b437 100644
--- a/metadata/md5-cache/dev-util/meson-1.0.0
+++ b/metadata/md5-cache/dev-util/meson-1.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://mesonbuild.com/
 INHERIT=bash-completion-r1 distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/pkgconfig python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-1.0.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d4f2e48aaa1b63e25fcc13a94213efc
+_md5_=23221132464a36f02b1d6bc7734a2702
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.21 b/metadata/md5-cache/dev-util/pkgcheck-0.10.21-r1
index cf10f8e432b8..353818cb6aa8 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.21
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.21-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.21.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=480a2bae7a994f1b508e772cf2fde17d
+_md5_=121ab486b3a45533b6b6c25176535f82
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.22 b/metadata/md5-cache/dev-util/pkgcheck-0.10.22-r1
index b777d5a749b9..0d12387f1506 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.22
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.22-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.22.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=06148029dadd688e3d2bf77970e20a0f
+_md5_=ff2116ba0875bfb7a6204ea913ad1819
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.4 b/metadata/md5-cache/dev-util/pkgdev-0.2.4
index 2770619e03f2..de08a6298dd3 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.2.4
+++ b/metadata/md5-cache/dev-util/pkgdev-0.2.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Collection of tools for Gentoo development
 EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgdev
-INHERIT=distutils-r1 optfeature
+INHERIT=distutils-r1 optfeature pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD MIT
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/snakeoil-0.10.3[python_targets_python3_9(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=68323afc8488163fc823583403e25a6f
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pkgdev/pkgdev-0.2.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3ca3af0ea2d0ae08d7039958364c0b96
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index 48b12972f35f..5fa3c3edb4d0 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=80850477177db6730c2c85b3bbfc2be3
+_md5_=8c7e1a28bc17ed38560e510ca9e33bb8
diff --git a/metadata/md5-cache/dev-util/pwndbg-20221219-r2 b/metadata/md5-cache/dev-util/pwndbg-20221219-r2
index d34297bf5f53..a9abdceea9ff 100644
--- a/metadata/md5-cache/dev-util/pwndbg-20221219-r2
+++ b/metadata/md5-cache/dev-util/pwndbg-20221219-r2
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pwndbg/pwndbg
 INHERIT=python-single-r1 wrapper
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-devel/gdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_9? ( >=dev-libs/capstone-4.0.2[python,python_targets_python3_9(-)] >=dev-python/psutil-5.9.2[python_targets_python3_9(-)] >=dev-python/pycparser-2.21[python_targets_python3_9(-)] >=dev-python/pyelftools-0.29[python_targets_python3_9(-)] >=dev-python/pygments-2.13.0[python_targets_python3_9(-)] >=dev-util/pwntools-4.8.0[python_targets_python3_9(-)] >=dev-util/ROPgadget-7.1[python_targets_python3_9(-)] >=dev-util/unicorn-2.0.1[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/capstone-4.0.2[python,python_targets_python3_10(-)] >=dev-python/psutil-5.9.2[python_targets_python3_10(-)] >=dev-python/pycparser-2.21[python_targets_python3_10(-)] >=dev-python/pyelftools-0.29[python_targets_python3_10(-)] >=dev-python/pygments-2.13.0[python_targets_python3_10(-)] >=dev-util/pwntools-4.8.0[python_targets_python3_10(-)] >=dev-util/ROPgadget-7.1[python_targets_python3_10(-)] >=dev-util/unicorn-2.0.1[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-libs/capstone-4.0.2[python,python_targets_python3_11(-)] >=dev-python/psutil-5.9.2[python_targets_python3_11(-)] >=dev-python/pycparser-2.21[python_targets_python3_11(-)] >=dev-python/pyelftools-0.29[python_targets_python3_11(-)] >=dev-python/pygments-2.13.0[python_targets_python3_11(-)] >=dev-util/pwntools-4.8.0[python_targets_python3_11(-)] >=dev-util/ROPgadget-7.1[python_targets_python3_11(-)] >=dev-util/unicorn-2.0.1[python,python_targets_python3_11(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/pwndbg/pwndbg/archive/2022.12.19.tar.gz -> pwndbg-20221219.tar.gz https://github.com/martinradev/gdb-pt-dump/archive/ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz -> gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c826c80599248083308cac86b20827cd
+_md5_=da93dbeb024c6eb1a59f335fd29fcc48
diff --git a/metadata/md5-cache/dev-util/pwntools-4.9.0-r2 b/metadata/md5-cache/dev-util/pwntools-4.9.0-r2
index 361f0a176401..dcdb9bbd501d 100644
--- a/metadata/md5-cache/dev-util/pwntools-4.9.0-r2
+++ b/metadata/md5-cache/dev-util/pwntools-4.9.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Gallopsled/pwntools
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT GPL-2+ BSD-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/capstone-3.0.5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/ROPgadget-5.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/unicorn-1.0.2[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colored-traceback[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/intervaltree-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mako-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-1.15.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyelftools-0.2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyserial-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rpyc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Gallopsled/pwntools/archive/4.9.0.tar.gz -> pwntools-4.9.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ddfa3080f7d5fbec8f2a5b885877aba8
+_md5_=c744575e2d828d9f06f45807be3c146a
diff --git a/metadata/md5-cache/dev-util/seer-1.13 b/metadata/md5-cache/dev-util/seer-1.15
index fe4c389886f7..38de91c9f144 100644
--- a/metadata/md5-cache/dev-util/seer-1.13
+++ b/metadata/md5-cache/dev-util/seer-1.15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/epasveer/seer
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop xdg
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-3+ CC-BY-3.0 CC-BY-4.0
 RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
 SLOT=0
-SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.13.tar.gz -> seer-1.13.tar.gz
+SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.15.tar.gz -> seer-1.15.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=86adb8d3c9d398bbac22232ff95c8a65
+_md5_=67c3fd40cab6687fbe51c34d0fb40098
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.236 b/metadata/md5-cache/dev-util/spirv-headers-1.3.236
deleted file mode 100644
index b658ad792ce2..000000000000
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.236
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Machine-readable files for the SPIR-V Registry
-EAPI=7
-HOMEPAGE=https://www.khronos.org/registry/spir-v/
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.236.tar.gz -> spirv-headers-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce50a6b5726bd2ca8012da3ea74a4d10
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.239 b/metadata/md5-cache/dev-util/spirv-headers-1.3.239
index 5b564d819832..2991138eff78 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.239
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3.239
@@ -4,9 +4,9 @@ DESCRIPTION=Machine-readable files for the SPIR-V Registry
 EAPI=8
 HOMEPAGE=https://www.khronos.org/registry/spir-v/
 INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.239.tar.gz -> spirv-headers-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bade500488c1b1f047dbadeac27f715e
+_md5_=1b5bc11ef2805a0b31657d47f7ab7706
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.3.236 b/metadata/md5-cache/dev-util/spirv-tools-1.3.236
deleted file mode 100644
index a14418568278..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-1.3.236
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) ~dev-util/spirv-headers-1.3.236 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-headers-1.3.236
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-1.3.236.0.tar.gz -> spirv-tools-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eec32d4971140e9ec34c075bfb8e2c12
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.3.239 b/metadata/md5-cache/dev-util/spirv-tools-1.3.239
index 9e83b0abc567..7fb6dfb0c276 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-1.3.239
+++ b/metadata/md5-cache/dev-util/spirv-tools-1.3.239
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 INHERIT=cmake-multilib python-any-r1
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-1.3.239.0.tar.gz -> spirv-tools-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e2c05da9bb09d6df5cca8593af565e2b
+_md5_=44adc29792fd8be825662e790027dde8
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.3.236 b/metadata/md5-cache/dev-util/vulkan-headers-1.3.236
deleted file mode 100644
index dfcc93d864e6..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.3.236
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.3.236.0.tar.gz -> vulkan-headers-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=58b8672b742df8f216a24162d3c51681
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.3.239 b/metadata/md5-cache/dev-util/vulkan-headers-1.3.239
index 0951cc4e7617..c7542e389fcf 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.3.239
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.3.239
@@ -4,9 +4,9 @@ DESCRIPTION=Vulkan Header files and API registry
 EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
 INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.3.239.0.tar.gz -> vulkan-headers-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0904f6d77b692c47b552edd38cc931d2
+_md5_=39b41852bd47235d2176a4fc2c6e6ffc
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.3.236 b/metadata/md5-cache/dev-util/vulkan-tools-1.3.236
deleted file mode 100644
index 9ecc9b0753ce..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.3.236
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/cmake-3.10.2 cube? ( ~dev-util/glslang-1.3.236:=[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-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~media-libs/vulkan-loader-1.3.236:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ~dev-util/vulkan-headers-1.3.236
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=~media-libs/vulkan-loader-1.3.236:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=cube? ( ^^ ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.3.236.0.tar.gz -> vulkan-tools-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4e8572dac25350bba1cf8bd3f8fc4702
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.3.239 b/metadata/md5-cache/dev-util/vulkan-tools-1.3.239
index 73c71b930af0..06926fe67169 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.3.239
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.3.239
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
 INHERIT=cmake-multilib python-any-r1
 IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=~media-libs/vulkan-loader-1.3.239:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=cube? ( ^^ ( X wayland ) )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.3.239.0.tar.gz -> vulkan-tools-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3f2a7e636faa51295a14dabc7ec3c410
+_md5_=8ff20d7f5368d61c0a95ae3320951c3d
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.19.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.19.0
new file mode 100644
index 000000000000..7033eab3eaa5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.19.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-libs/libxslt virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=>=dev-libs/glib-2.66.0
+DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-dev-tools/start https://gitlab.xfce.org/xfce/xfce4-dev-tools/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.19/xfce4-dev-tools-4.19.0.tar.bz2
+_md5_=5855add9996855cf2fa4da4842924ea3
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index fdb303398384..b3f34ab2cbf8 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-lfs-3.2.0 b/metadata/md5-cache/dev-vcs/git-lfs-3.2.0
index 438301a578c5..2c2441cea1ff 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-3.2.0
+++ b/metadata/md5-cache/dev-vcs/git-lfs-3.2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://git-lfs.github.com/
 INHERIT=go-module
 IUSE=doc test
-KEYWORDS=amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD BSD-2 BSD-4 ISC MIT
 RDEPEND=dev-vcs/git
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/git-lfs/git-lfs/archive/v3.2.0.tar.gz -> git-lfs-3.2.0.tar.gz
 _eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=16917ef485eb503e9437e9f276607624
+_md5_=d4f0e5f5662b2ed8a8f7a07778d7ec74
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 083420fd3f4f..f8de0434ec54 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -12,5 +12,5 @@ RDEPEND=app-misc/ca-certificates gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) py
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	3929d88685167435c587b740fdb5ec46	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	53b96197cb26db4afb5056f1bbfa4845	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	3929d88685167435c587b740fdb5ec46	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	9d4fc47e076850b06fede471ee147ec5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=32bd32701064866b177f8d09d94b06ee
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0 b/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0
new file mode 100644
index 000000000000..a0794d5e8e30
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-3.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-console-scripts-1.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/requests-2.28.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.10.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python command line interface to gitlab API
+EAPI=8
+HOMEPAGE=https://github.com/python-gitlab/python-gitlab/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/requests-2.28.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.10.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-3.13.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=abf273132040e14ad06d4571aeaa0bdf
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index 09fa7387ff1a..51b351e77cb4 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-5.9[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	3929d88685167435c587b740fdb5ec46	mercurial	53b96197cb26db4afb5056f1bbfa4845	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	3929d88685167435c587b740fdb5ec46	mercurial	9d4fc47e076850b06fede471ee147ec5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0a0b08aabac2b9cfc59ac4453a48fc5f
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 4045868c5d5d..18eaf91133b5 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/spout-1.3-r2 b/metadata/md5-cache/games-arcade/spout-1.3-r2
deleted file mode 100644
index 058ada7fd2da..000000000000
--- a/metadata/md5-cache/games-arcade/spout-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=>=media-libs/libsdl-1.2.6
-DESCRIPTION=Abstract Japanese caveflier / shooter
-EAPI=7
-HOMEPAGE=http://freshmeat.net/projects/spout/
-INHERIT=desktop readme.gentoo-r1
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=media-libs/libsdl-1.2.6
-SLOT=0
-SRC_URI=http://rohanpm.net/files/old/spout-unix-1.3.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=059da5dfd78f9197dff89f1c667dcf03
diff --git a/metadata/md5-cache/games-arcade/spout-1.3-r3 b/metadata/md5-cache/games-arcade/spout-1.3-r3
new file mode 100644
index 000000000000..16b3e02ae2c3
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/spout-1.3-r3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install postinst prepare
+DEPEND=>=media-libs/libsdl-1.2.6
+DESCRIPTION=Abstract Japanese caveflier / shooter
+EAPI=8
+HOMEPAGE=http://freshmeat.net/projects/spout/
+INHERIT=autotools desktop readme.gentoo-r1
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=media-libs/libsdl-1.2.6
+SLOT=0
+SRC_URI=http://rohanpm.net/files/old/spout-unix-1.3.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=09f98918fdb622d443a590f5381dfc9e
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 33c93eb84f49..6a092631c4c1 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.14.1-r2 b/metadata/md5-cache/games-emulation/ppsspp-1.14.1-r3
index 06b8247e57ac..d65ab1a4b5d8 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.14.1-r2
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.14.1-r3
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= dev-util/glslang:0/1 media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 DESCRIPTION=A PSP emulator written in C++
 EAPI=8
 HOMEPAGE=https://www.ppsspp.org/ https://github.com/hrydgard/ppsspp/
@@ -9,9 +9,9 @@ INHERIT=python-any-r1 xdg cmake
 IUSE=discord qt5
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 JSON MIT
-RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= dev-util/glslang:0/1 media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/releases/download/v1.14.1/ppsspp-1.14.1.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=63cbb966c3b8816691806729649b5f24
+_md5_=ec28abe3bc1a0a8bd7a7dbbd1cf8f6cb
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.14.2-r1 b/metadata/md5-cache/games-emulation/ppsspp-1.14.2-r2
index 5970e0763386..026361b47cc2 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.14.2-r1
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.14.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= dev-util/glslang:0/1 media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 DESCRIPTION=A PSP emulator written in C++
 EAPI=8
 HOMEPAGE=https://www.ppsspp.org/ https://github.com/hrydgard/ppsspp/
@@ -9,9 +9,9 @@ INHERIT=python-any-r1 xdg cmake
 IUSE=discord qt5
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 JSON MIT
-RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= dev-util/glslang:0/1 media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/releases/download/v1.14.2/ppsspp-1.14.2.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=63cbb966c3b8816691806729649b5f24
+_md5_=ec28abe3bc1a0a8bd7a7dbbd1cf8f6cb
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r1 b/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
index 531c36ffa797..eeb276e58298 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r1
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= dev-util/glslang:0/1 media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 DESCRIPTION=A PSP emulator written in C++
 EAPI=8
 HOMEPAGE=https://www.ppsspp.org/ https://github.com/hrydgard/ppsspp/
@@ -9,9 +9,9 @@ INHERIT=python-any-r1 xdg cmake
 IUSE=discord qt5
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 JSON MIT
-RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= dev-util/glslang:0/1 media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/releases/download/v1.14.4/ppsspp-1.14.4.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=63cbb966c3b8816691806729649b5f24
+_md5_=ec28abe3bc1a0a8bd7a7dbbd1cf8f6cb
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 97cb6ddad72e..4ccc867e0221 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/freesweep-1.0.2 b/metadata/md5-cache/games-puzzle/freesweep-1.0.2
deleted file mode 100644
index c4a377b878fd..000000000000
--- a/metadata/md5-cache/games-puzzle/freesweep-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:=
-DESCRIPTION=Console Minesweeper
-EAPI=8
-HOMEPAGE=https://github.com/rwestlund/freesweep
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86 ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:=
-SLOT=0
-SRC_URI=https://github.com/rwestlund/freesweep/archive/v1.0.2.tar.gz -> freesweep-1.0.2.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7fc0d024c6f0430e2f43c4965961104a
diff --git a/metadata/md5-cache/games-puzzle/freesweep-1.0.2-r1 b/metadata/md5-cache/games-puzzle/freesweep-1.0.2-r1
new file mode 100644
index 000000000000..0f40e732c238
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/freesweep-1.0.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=Console Minesweeper
+EAPI=8
+HOMEPAGE=https://github.com/rwestlund/freesweep
+INHERIT=autotools toolchain-funcs
+KEYWORDS=~amd64 ~x86 ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=https://github.com/rwestlund/freesweep/archive/v1.0.2.tar.gz -> freesweep-1.0.2.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8f606b51964f5e0f1f079f1cd448a033
diff --git a/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2 b/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r3
index 77fad823fe9b..b44cc707cb90 100644
--- a/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2
+++ b/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r3
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/
 DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=X Window block dropping game in 3 Dimension
-EAPI=7
+EAPI=8
 HOMEPAGE=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
 INHERIT=autotools desktop flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~x86
@@ -10,5 +10,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-1.1.6.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=06fe25d7072223ef89b759834d305da1
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3a762c6658b1214c4124347a516283f3
diff --git a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1 b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
deleted file mode 100644
index d887678d55e3..000000000000
--- a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
-DESCRIPTION=2.5D tetris like game
-EAPI=7
-HOMEPAGE=http://xnc.jinr.ru/xwelltris/
-INHERIT=toolchain-funcs prefix
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] acct-group/gamestat
-SLOT=0
-SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7f77d074e2cb7f657e2119ff73185101
diff --git a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r2 b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r2
new file mode 100644
index 000000000000..0cfcffc00322
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
+DESCRIPTION=2.5D tetris like game
+EAPI=8
+HOMEPAGE=http://xnc.jinr.ru/xwelltris/
+INHERIT=autotools toolchain-funcs prefix
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] acct-group/gamestat
+SLOT=0
+SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=01aebde5e2eabf4270216a88a55d75ed
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index fb43079e22e9..c0ec9b481acf 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.30.0_pre20230129 b/metadata/md5-cache/games-roguelike/stone-soup-0.30.0_pre20230129
index e6e0a30a553c..c79260b0db00 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.30.0_pre20230129
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.30.0_pre20230129
@@ -6,7 +6,7 @@ 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
+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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0.30
 SRC_URI=https://github.com/crawl/crawl/archive/c68057be0a1ad1b17d0337fd8baed0213a428039.tar.gz -> stone-soup-0.30.0_pre20230129.tar.gz https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.30.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.30.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ecfc8f575dd7ff3cbeeac05a26e38370
+_md5_=5b749f13a0299bca8a14c28c303d787a
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index fdbc1c0eddf5..11d4f329af07 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/lincity-1.13.1-r3 b/metadata/md5-cache/games-simulation/lincity-1.13.1-r3
deleted file mode 100644
index f2065c9b6874..000000000000
--- a/metadata/md5-cache/games-simulation/lincity-1.13.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=compile configure install
-DEPEND=media-libs/libpng:= virtual/libintl x11-libs/libXext x11-base/xorg-proto
-DESCRIPTION=City simulation game for X
-EAPI=8
-HOMEPAGE=http://lincity.sourceforge.net/
-INHERIT=desktop
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:= virtual/libintl x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://sourceforge/lincity/lincity-1.13.1.tar.gz https://dev.gentoo.org/~ionen/distfiles/lincity.png
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=f3bf3dbea507537d5d57f7751b527d9f
diff --git a/metadata/md5-cache/games-simulation/lincity-1.13.1-r4 b/metadata/md5-cache/games-simulation/lincity-1.13.1-r4
new file mode 100644
index 000000000000..2d940da390a1
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/lincity-1.13.1-r4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libpng:= virtual/libintl x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=City simulation game for X
+EAPI=8
+HOMEPAGE=http://lincity.sourceforge.net/
+INHERIT=autotools desktop
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:= virtual/libintl x11-libs/libXext
+SLOT=0
+SRC_URI=mirror://sourceforge/lincity/lincity-1.13.1.tar.gz https://dev.gentoo.org/~ionen/distfiles/lincity.png
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c05d4ba0480e7f27c09b548931060179
diff --git a/metadata/md5-cache/games-simulation/senken-0.3.0-r1 b/metadata/md5-cache/games-simulation/senken-0.3.0-r1
deleted file mode 100644
index b792402f5342..000000000000
--- a/metadata/md5-cache/games-simulation/senken-0.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=city simulation game
-EAPI=6
-HOMEPAGE=https://savannah.nongnu.org/projects/senken/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gentoo/senken-0.3.0.tar.gz
-_md5_=bc58d92a2b5c0868551a17f3270d2299
diff --git a/metadata/md5-cache/games-simulation/senken-0.3.0-r2 b/metadata/md5-cache/games-simulation/senken-0.3.0-r2
new file mode 100644
index 000000000000..21ade4c3b96f
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/senken-0.3.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=City simulation game
+EAPI=8
+HOMEPAGE=https://savannah.nongnu.org/projects/senken/
+INHERIT=autotools
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gentoo/senken-0.3.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fea156b0bb81c40af20b73bd6aa9e15e
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 3a0293c77f85..b7bcc71e6a84 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/etswitch-0.1.14-r1 b/metadata/md5-cache/games-util/etswitch-0.1.14-r1
deleted file mode 100644
index cbef795665af..000000000000
--- a/metadata/md5-cache/games-util/etswitch-0.1.14-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=*nix minimizer for a few games
-EAPI=7
-HOMEPAGE=http://hem.bredband.net/b400150/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm
-SLOT=0
-SRC_URI=http://hem.bredband.net/b400150/etswitch/etswitch-0.1.14.tar.gz
-_md5_=cca01eb164251cd7bf9743b947d95961
diff --git a/metadata/md5-cache/games-util/etswitch-0.1.14-r2 b/metadata/md5-cache/games-util/etswitch-0.1.14-r2
new file mode 100644
index 000000000000..39cd27c26fc7
--- /dev/null
+++ b/metadata/md5-cache/games-util/etswitch-0.1.14-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=*nix minimizer for a few games
+EAPI=8
+HOMEPAGE=http://hem.bredband.net/b400150/
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm
+SLOT=0
+SRC_URI=http://hem.bredband.net/b400150/etswitch/etswitch-0.1.14.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=573b23ee56bd0e838eb5cb8986208cd0
diff --git a/metadata/md5-cache/games-util/gamepick-0.35-r1 b/metadata/md5-cache/games-util/gamepick-0.35-r1
deleted file mode 100644
index d06c4945b1df..000000000000
--- a/metadata/md5-cache/games-util/gamepick-0.35-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2
-DESCRIPTION=Launch opengl games with custom graphic settings
-EAPI=7
-HOMEPAGE=http://www.rillion.net/gamepick/index.html
-INHERIT=desktop
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.rillion.net/gamepick/gamepick-0.35.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=fbb4f921d512baa5d38d72aacbba2c16
diff --git a/metadata/md5-cache/games-util/gamepick-0.35-r2 b/metadata/md5-cache/games-util/gamepick-0.35-r2
new file mode 100644
index 000000000000..14a45e4b8b0e
--- /dev/null
+++ b/metadata/md5-cache/games-util/gamepick-0.35-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/gtk+:2
+DESCRIPTION=Launch opengl games with custom graphic settings
+EAPI=8
+HOMEPAGE=http://www.rillion.net/gamepick/index.html
+INHERIT=autotools desktop
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.rillion.net/gamepick/gamepick-0.35.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2185f2112d1e2319bb27b73cb51956a4
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index c5ce46c20c35..07379683feaa 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-43.0.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-43.0.1
index ea4f5c35047e..8898e611870d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-43.0.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-43.0.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/43/gnome-calculator-43.0.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ac6355b3ad5e1d4ff3f3f71d1d8d071f
+_md5_=0688b7ba46ed675ea34b1fff252b1556
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 2e38ed0a2778..2e2edfe93d28 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/wofi-9999 b/metadata/md5-cache/gui-apps/wofi-9999
index 3c35a9bcc1fa..01e6f63c7037 100644
--- a/metadata/md5-cache/gui-apps/wofi-9999
+++ b/metadata/md5-cache/gui-apps/wofi-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/wayland x11-libs/gtk+:3[wayland(-)]
 SLOT=0
-_eclasses_=mercurial	53b96197cb26db4afb5056f1bbfa4845	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=mercurial	9d4fc47e076850b06fede471ee147ec5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=fac3f4868d2b5dbb2061d6ad4a62e9b1
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index edfa8fe4426d..d99b04aeb477 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-4.10.0 b/metadata/md5-cache/gui-libs/gtk-4.10.0
new file mode 100644
index 000000000000..f0b77eefe65d
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-4.10.0
@@ -0,0 +1,19 @@
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 media-fonts/cantarell wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.72.0:2 >=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?] >=x11-libs/pango-1.50.0[introspection?] >=dev-libs/fribidi-1.0.6 >=media-libs/harfbuzz-2.6.0:= >=x11-libs/gdk-pixbuf-2.30:2[introspection?] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= >=media-libs/libepoxy-1.4[egl,X(+)?] >=media-libs/graphene-1.10.0[introspection?] app-text/iso-codes x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders ) colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.72:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
+EAPI=8
+HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+IUSE=aqua broadway cloudproviders colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
+RDEPEND=>=dev-libs/glib-2.72.0:2 >=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?] >=x11-libs/pango-1.50.0[introspection?] >=dev-libs/fribidi-1.0.6 >=media-libs/harfbuzz-2.6.0:= >=x11-libs/gdk-pixbuf-2.30:2[introspection?] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= >=media-libs/libepoxy-1.4[egl,X(+)?] >=media-libs/graphene-1.10.0[introspection?] app-text/iso-codes x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders ) colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.72:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
+REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/gtk/4.10/gtk-4.10.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=28c015474f63aa2c1931f81e0018729e
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.2.3 b/metadata/md5-cache/gui-libs/libadwaita-1.2.3
new file mode 100644
index 000000000000..8a837cb555d5
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.2.3
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.59.0 dev-util/glib-utils sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= ) test? ( dev-libs/appstream-glib )
+DESCRIPTION=Building blocks for modern adaptive GNOME applications
+EAPI=8
+HOMEPAGE=https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita
+INHERIT=gnome.org meson python-any-r1 vala virtualx
+IUSE=+introspection test +vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=mirror://gnome/sources/libadwaita/1.2/libadwaita-1.2.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=2cf4bcc48da94bda89158b707b472aed
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.8.2 b/metadata/md5-cache/gui-libs/libhandy-1.8.2
new file mode 100644
index 000000000000..5ed92db5e245
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libhandy-1.8.2
@@ -0,0 +1,18 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto
+DESCRIPTION=Building blocks for modern adaptive GNOME apps
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson xdg vala virtualx
+IUSE=examples glade gtk-doc +introspection test +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=mirror://gnome/sources/libhandy/1.8/libhandy-1.8.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e276ada22caebca757e363ffbd236bef
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.14.1 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.14.1
new file mode 100644
index 000000000000..4e11ed647671
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
+DESCRIPTION=WPE backend designed for Linux desktop systems
+EAPI=8
+HOMEPAGE=https://wpewebkit.org/
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
+SLOT=1.0
+SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.14.1.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5285215f3cb6b6d085098c9436ea2808
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index cf1bbe710ba1..71e4d9bddef4 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/plasma-pass-1.2.1 b/metadata/md5-cache/kde-misc/plasma-pass-1.2.1
new file mode 100644
index 000000000000..fea83e4c5ddc
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/plasma-pass-1.2.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-crypt/gpgme:=[cxx,qt5] >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 sys-auth/oath-toolkit dev-qt/qtcore:5
+DESCRIPTION=Plasma applet to access password from pass
+EAPI=8
+HOMEPAGE=https://www.dvratil.cz/2018/05/plasma-pass/ https://invent.kde.org/plasma/plasma-pass
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=LGPL-2.1+
+RDEPEND=app-crypt/gpgme:=[cxx,qt5] >=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 sys-auth/oath-toolkit >=dev-qt/qtquickcontrols2-5.15.5:5 >=kde-frameworks/kirigami-5.102.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma-pass/plasma-pass-1.2.1.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=daaef13fd61fe0290ad8fa278584ebc6
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index ff4fc9919d67..caa7f013bba7 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/sil-abyssinica-2.100 b/metadata/md5-cache/media-fonts/sil-abyssinica-2.100
index 643a1bf3e833..8f9033d5537b 100644
--- a/metadata/md5-cache/media-fonts/sil-abyssinica-2.100
+++ b/metadata/md5-cache/media-fonts/sil-abyssinica-2.100
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://software.sil.org/abyssinica/
 INHERIT=font
 IUSE=doc X
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~loong ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 ~sparc x86 ~ppc-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-2.100.zip
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=7172bd9f094384dc76b206636cac408d
+_md5_=350b999c2d5e8a28865c5f088b4f7393
diff --git a/metadata/md5-cache/media-fonts/sil-doulos-6.101 b/metadata/md5-cache/media-fonts/sil-doulos-6.101
index 3d359960403d..f2e5a6aaa9d1 100644
--- a/metadata/md5-cache/media-fonts/sil-doulos-6.101
+++ b/metadata/md5-cache/media-fonts/sil-doulos-6.101
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://software.sil.org/doulos/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~s390 sparc x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/doulos/DoulosSIL-6.101.zip -> sil-doulos-6.101.zip
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=4513d9213102453dde5fbbd23a51f528
+_md5_=620b7d22b83d27d75272999799c1a42a
diff --git a/metadata/md5-cache/media-fonts/sil-gentium-6.101 b/metadata/md5-cache/media-fonts/sil-gentium-6.101
index b9b6cb3291c5..cc2a6c79ab00 100644
--- a/metadata/md5-cache/media-fonts/sil-gentium-6.101
+++ b/metadata/md5-cache/media-fonts/sil-gentium-6.101
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://software.sil.org/gentium/
 INHERIT=font
 IUSE=doc X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/gentium/GentiumPlus-6.101.zip -> sil-gentium-6.101.zip
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=2f77aff05dc83ab5f44f3e46e743e5fc
+_md5_=4e18ad6e304091f024b8c9cb872d1847
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-5.001 b/metadata/md5-cache/media-fonts/sil-padauk-5.001
index b6f2fad5a30e..5bab849f473d 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-5.001
+++ b/metadata/md5-cache/media-fonts/sil-padauk-5.001
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://software.sil.org/padauk/
 INHERIT=font
 IUSE=X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/padauk/Padauk-5.001.zip
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=75f9967d7d4d8d05cd189c5f04fbb398
+_md5_=745b0abe63bbb4a6b5b445ec092690f9
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index cf0d99cd7b7b..d158e2346f81 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/alembic-1.8.4 b/metadata/md5-cache/media-gfx/alembic-1.8.4
index 34f09b41221c..47274e744038 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.8.4
+++ b/metadata/md5-cache/media-gfx/alembic-1.8.4
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/imath:= python? ( dev-libs/imath:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 ) python? ( python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-libs/imath:= python? ( dev-libs/imath:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 ) python? ( python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost[python,python_targets_python3_11(-)] ) )
 DESCRIPTION=Open framework for storing and sharing scene data
 EAPI=8
 HOMEPAGE=https://www.alembic.io/
 INHERIT=cmake python-single-r1
-IUSE=examples hdf5 python test python_single_target_python3_9 python_single_target_python3_10
+IUSE=examples hdf5 python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/imath:= python? ( dev-libs/imath:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 ) python? ( python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-libs/imath:= python? ( dev-libs/imath:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 ) python? ( python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost[python,python_targets_python3_11(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.8.4.tar.gz -> alembic-1.8.4.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4f1d15ec6185dd006df6a0214a86eaa2
+_md5_=8587261ca83d7f13f33b476eecc7706a
diff --git a/metadata/md5-cache/media-gfx/fontforge-20230101 b/metadata/md5-cache/media-gfx/fontforge-20230101
index 3bc98162ad87..0d2a96dc5fe7 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20230101
+++ b/metadata/md5-cache/media-gfx/fontforge-20230101
@@ -7,7 +7,7 @@ HOMEPAGE=https://fontforge.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=python-single-r1 xdg cmake
 IUSE=doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD GPL-3+
 RDEPEND=>=dev-libs/glib-2.67:2 dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= gif? ( media-libs/giflib:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) !gtk? ( X? ( >=x11-libs/cairo-1.6:0= >=x11-libs/pango-1.10:0=[X] x11-libs/libX11:= x11-libs/libXi:= ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:0= ) woff2? ( media-libs/woff2:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20230101/fontforge-20230101.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6294de5713948c619c96014ccb2419ac
+_md5_=d7f12e8392e16ebffec96ad7c69717ad
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-9999 b/metadata/md5-cache/media-gfx/graphicsmagick-9999
index f5b55b8e8b53..0846f26edb4a 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-9999
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-9999
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 SLOT=0/9999
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	9d4fc47e076850b06fede471ee147ec5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=dbe3c4975d08d7c14172facec52a95f2
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index fca3b762333c..1b210cd71d6c 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=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.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	mercurial	9d4fc47e076850b06fede471ee147ec5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=cce6580919b2a15b64dcbb22f24bff52
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.17-r1 b/metadata/md5-cache/media-gfx/shotwell-0.30.17-r1
index 94948b11436a..e0f160ee4335 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.17-r1
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.17-r1
@@ -13,4 +13,4 @@ RDEPEND=>=x11-libs/gtk+-3.22.0:3[wayland?] >=dev-libs/glib-2.40.0:2 >=dev-libs/l
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.17.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2329beed5d360c771afaebba81746fe9
+_md5_=406dbe71e38eeb60fa7e19851e1e04f4
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.31.7 b/metadata/md5-cache/media-gfx/shotwell-0.31.7
new file mode 100644
index 000000000000..f9628a9c2bad
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.31.7
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( dev-lang/vala:0.56 ) dev-libs/appstream-glib dev-libs/glib dev-util/gdbus-codegen dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig net-libs/libsoup:3.0[vala] media-libs/gexiv2[vala] app-crypt/gcr:0[vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8= >=net-libs/webkit-gtk-2.26:4.1 net-libs/libsoup:3.0 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.12.3 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16 app-crypt/libsecret >=dev-libs/libportal-0.5:=[gtk] media-libs/libwebp:= >=app-crypt/gcr-3:0=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-4.0.0:= )
+DESCRIPTION=Open source photo manager for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
+IUSE=opencv udev
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8= >=net-libs/webkit-gtk-2.26:4.1 net-libs/libsoup:3.0 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.12.3 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16 app-crypt/libsecret >=dev-libs/libportal-0.5:=[gtk] media-libs/libwebp:= >=app-crypt/gcr-3:0=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-4.0.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.31/shotwell-0.31.7.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d3ff27538477d613214e84ee06940cd2
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1 b/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
index 0b523eb9ce56..7f9443db2783 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Set of tools for creating TeX documents with graphics
 EAPI=7
 HOMEPAGE=https://www.xfig.org/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=media-libs/libpng virtual/jpeg x11-apps/rgb x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5e.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/transfig-3.2.5e-gentoo-patchset-r1.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=266ccf775e573d33f1f4301eacbf7567
+_md5_=311282ec52e9104611eada62da37ca44
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fc12e5faf914..e316a62a4577 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/allegro-4.4.3.1 b/metadata/md5-cache/media-libs/allegro-4.4.3.1
deleted file mode 100644
index 2e0dfb32f6a7..000000000000
--- a/metadata/md5-cache/media-libs/allegro-4.4.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svga? ( media-libs/svgalib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=cross-platform multimedia library
-EAPI=7
-HOMEPAGE=https://liballeg.org/
-INHERIT=cmake-multilib desktop
-IUSE=alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 ~loong ~mips ppc ppc64 ~riscv x86
-LICENSE=Allegro MIT GPL-2+ ZLIB
-RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svga? ( media-libs/svgalib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=0
-SRC_URI=https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro-4.4.3.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1453d9741f117d1dc43c5c0c3ed66eff
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.3.1-r1 b/metadata/md5-cache/media-libs/allegro-4.4.3.1-r1
new file mode 100644
index 000000000000..c3c40d7f6539
--- /dev/null
+++ b/metadata/md5-cache/media-libs/allegro-4.4.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) X? ( x11-base/xorg-proto )
+DESCRIPTION=cross-platform multimedia library
+EAPI=7
+HOMEPAGE=https://liballeg.org/
+INHERIT=cmake-multilib desktop
+IUSE=alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm64 ~loong ~mips ppc ppc64 ~riscv x86
+LICENSE=Allegro MIT GPL-2+ ZLIB
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+SLOT=0
+SRC_URI=https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro-4.4.3.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4a3d46cc935139f9b83d9d7cc169f7f2
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.8-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.8-r1
index c6dea6c650ac..01a11cb03326 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.8-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 INHERIT=autotools multilib-minimal flag-o-matic python-single-r1
 IUSE=alisp debug doc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.8.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2eeb298c165778c39e14aa7975563d4d
+_md5_=ec1b02ca31255d1df3a22ad83bd6643b
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.8 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.8
index 1f98d17cb755..322ae0052021 100644
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.8
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.8
@@ -3,9 +3,9 @@ DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA ucm configuration files
 EAPI=8
 HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=BSD
 RDEPEND=!<media-libs/alsa-lib-1.2.1
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.8.tar.bz2
-_md5_=8bddc1bafac241843e2c4c1445248f6e
+_md5_=db71ed5458869198997456a869b736aa
diff --git a/metadata/md5-cache/media-libs/exempi-2.6.3 b/metadata/md5-cache/media-libs/exempi-2.6.3
index 64e34897a5c7..5708cde21b8a 100644
--- a/metadata/md5-cache/media-libs/exempi-2.6.3
+++ b/metadata/md5-cache/media-libs/exempi-2.6.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
 INHERIT=autotools
 IUSE=examples test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=2/8
 SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fcb4de9b06a387078dfcc474d8943d2a
+_md5_=e3f207e70ecce510be5b7bdb7a801379
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.14.2 b/metadata/md5-cache/media-libs/fontconfig-2.14.2
index 90a9355e9533..720408e0455b 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.14.2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.14.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://fontconfig.org/
 IDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig )
 INHERIT=multilib meson-multilib python-any-r1 readme.gentoo-r1
 IUSE=doc nls test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 PDEPEND=virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elibc_Darwin? ( sys-libs/native-uuid ) elibc_SunOS? ( sys-libs/libuuid )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://fontconfig.org/release/fontconfig-2.14.2.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f83458958cfb53f7d247043e71d8dc52
+_md5_=c0a6b710671fa22652f3c1666afdb770
diff --git a/metadata/md5-cache/media-libs/freetype-2.12.1-r2 b/metadata/md5-cache/media-libs/freetype-2.12.1-r2
index 93daf68bd148..ededeb478233 100644
--- a/metadata/md5-cache/media-libs/freetype-2.12.1-r2
+++ b/metadata/md5-cache/media-libs/freetype-2.12.1-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.freetype.org/
 INHERIT=autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.12.1.tar.xz mirror://nongnu/freetype/freetype-2.12.1.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.12.1.tar.xz mirror://nongnu/freetype/ft2demos-2.12.1.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.12.1.tar.xz mirror://nongnu/freetype/freetype-doc-2.12.1.tar.xz )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=545e9d6d4eb4fb8a3940faa500c4dc01
+_md5_=47d56ff2ce213759dd059a7f1e4870d5
diff --git a/metadata/md5-cache/media-libs/libaom-3.5.0 b/metadata/md5-cache/media-libs/libaom-3.5.0
index cd0da721135f..83fd1613cff1 100644
--- a/metadata/md5-cache/media-libs/libaom-3.5.0
+++ b/metadata/md5-cache/media-libs/libaom-3.5.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://aomedia.org https://aomedia.googlesource.com/aom/
 INHERIT=cmake-multilib python-any-r1
 IUSE=doc +examples test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 RESTRICT=!test? ( test ) test
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/aom-releases/libaom-3.5.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d05774eaa0f96c2838590db6ccb10b74
+_md5_=37f19d01d0376d3a59c25dc43c096151
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.9.1 b/metadata/md5-cache/media-libs/libmodplug-0.8.9.1
new file mode 100644
index 000000000000..48b40355e4f6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.9.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for playing MOD-like music files
+EAPI=8
+HOMEPAGE=http://modplug-xmms.sourceforge.net/
+INHERIT=autotools multilib-minimal
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/ShiftMediaProject/modplug/archive/refs/tags/0.8.9.1.r461.tar.gz -> libmodplug-0.8.9.1.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ff40983c8bfbafe9728dba14d90c22fe
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r101 b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r101
index 0b6d878cfe48..99c3fc7060fa 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r101
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r101
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=http://quvi.sourceforge.net/
 INHERIT=lua-single
 IUSE=offensive lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=AGPL-3
 RDEPEND=lua_single_target_luajit? ( >=dev-lua/LuaBitOp-1.0.1-r1[lua_targets_luajit(-)] >=dev-lua/luaexpat-1.3.0-r1[lua_targets_luajit(-)] >=dev-lua/luajson-1.1.1[lua_targets_luajit(-)] >=dev-lua/luasocket-3.0_rc1-r2[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/LuaBitOp-1.0.1-r1[lua_targets_lua5-1(-)] >=dev-lua/luaexpat-1.3.0-r1[lua_targets_lua5-1(-)] >=dev-lua/luajson-1.1.1[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r2[lua_targets_lua5-1(-)] ) lua_single_target_lua5-4? ( >=dev-lua/LuaBitOp-1.0.1-r1[lua_targets_lua5-4(-)] >=dev-lua/luaexpat-1.3.0-r1[lua_targets_lua5-4(-)] >=dev-lua/luajson-1.1.1[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r2[lua_targets_lua5-4(-)] )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/libquvi-scripts-0.9.20131130.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0d422a129b00bbdbd3e623c5cb631fd8
+_md5_=5f02ba60e14049f2dc4f230626a56958
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.60 b/metadata/md5-cache/media-libs/libsdl-1.2.60
index 4560969f363c..0d72aa4eaea4 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.60
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.60
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libsdl-org/sdl12-compat
 INHERIT=cmake-multilib
 IUSE=alsa +joystick opengl +sound test +video X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=ZLIB
 RDEPEND=media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,alsa=,joystick=,opengl=,sound=,video=,X=]
 REQUIRED_USE=test? ( joystick opengl sound video )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.60.tar.gz -> libsdl-1.2.60.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4666f8809bf3a3179864c59ddda2f97c
+_md5_=e59f6f58b59e487a63e2661ac365c9c7
diff --git a/metadata/md5-cache/media-libs/libshumate-1.0.3 b/metadata/md5-cache/media-libs/libshumate-1.0.3-r1
index 55732c87d0e9..34f72fc35045 100644
--- a/metadata/md5-cache/media-libs/libshumate-1.0.3
+++ b/metadata/md5-cache/media-libs/libshumate-1.0.3-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0/1
 SRC_URI=mirror://gnome/sources/libshumate/1.0/libshumate-1.0.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=deb28d7e3bd16cd3677a8e551fe958f5
+_md5_=f2959a95025b318065fe4060cc9efa22
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-2.4.1 b/metadata/md5-cache/media-libs/libsidplayfp-2.4.1
deleted file mode 100644
index 4cc06244c2e0..000000000000
--- a/metadata/md5-cache/media-libs/libsidplayfp-2.4.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Library for the sidplay2 fork with resid-fp
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
-IUSE=static-libs
-KEYWORDS=amd64 ~hppa ~riscv x86
-LICENSE=GPL-2
-SLOT=0/6
-SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/2.4/libsidplayfp-2.4.1.tar.gz
-_md5_=f1d815d5f382dd20a2ec0caf3f4db422
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20221022 b/metadata/md5-cache/media-libs/libuninameslist-20221022
index 62f33f2afa84..22e86cf1405a 100644
--- a/metadata/md5-cache/media-libs/libuninameslist-20221022
+++ b/metadata/md5-cache/media-libs/libuninameslist-20221022
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Library of unicode annotation data
 EAPI=8
 HOMEPAGE=https://github.com/fontforge/libuninameslist
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/fontforge/libuninameslist/releases/download/20221022/libuninameslist-dist-20221022.tar.gz
-_md5_=9a9f0c0f7edd1f855178493e19da4a10
+_md5_=c08d788f99fcbcc510dc4b40886be7ec
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.6 b/metadata/md5-cache/media-libs/mesa-22.3.6
index 732a2400c240..6155e8ab0ecf 100644
--- a/metadata/md5-cache/media-libs/mesa-22.3.6
+++ b/metadata/md5-cache/media-libs/mesa-22.3.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[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/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang: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-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.3.6.tar.xz
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=372158a8bdc20dcfcc64f0ed81b08dd8
+_md5_=37c00d1ce035f490df3034959b940363
diff --git a/metadata/md5-cache/media-libs/shaderc-2023.2 b/metadata/md5-cache/media-libs/shaderc-2023.2
index cfaa611d3195..2a1d2f36ba67 100644
--- a/metadata/md5-cache/media-libs/shaderc-2023.2
+++ b/metadata/md5-cache/media-libs/shaderc-2023.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/shaderc
 INHERIT=cmake-multilib python-any-r1
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-util/glslang-1.3.239:=[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-util/spirv-tools-1.3.239[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/v2023.2.tar.gz -> shaderc-2023.2.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=96e010bf5441a09fdbe118f7b2e55d8b
+_md5_=a17c4664b35a2e61af22076f8216cefb
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.3.236-r1 b/metadata/md5-cache/media-libs/vulkan-layers-1.3.236-r1
deleted file mode 100644
index 1b90f86da8d0..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.3.236-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-tools-1.3.236:=[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-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-cpp/robin-hood-hashing-3.11.5 ~dev-util/glslang-1.3.236:=[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-util/vulkan-headers-1.3.236 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Vulkan Validation Layers
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-INHERIT=cmake-multilib python-any-r1
-IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-util/spirv-tools-1.3.236:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.3.236.0.tar.gz -> vulkan-layers-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d2553283dd92b96ca80973ecdb67e6b7
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.3.239 b/metadata/md5-cache/media-libs/vulkan-layers-1.3.239
index 90b605dab662..29701fda1b94 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.3.239
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.3.239
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 INHERIT=cmake-multilib python-any-r1
 IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-util/spirv-tools-1.3.239:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.3.239.0.tar.gz -> vulkan-layers-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=65ea44ee82bbfc7476581538ce4526c5
+_md5_=a221ca56bd546d3870ed8801a4ffd885
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.3.236 b/metadata/md5-cache/media-libs/vulkan-loader-1.3.236
deleted file mode 100644
index 32eb87c8e12e..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.3.236
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=~dev-util/vulkan-headers-1.3.236 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-INHERIT=flag-o-matic cmake-multilib toolchain-funcs
-IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.3.236.tar.gz -> vulkan-loader-1.3.236.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5e6230a78dd115c10ecc95ba7907d65a
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.3.239 b/metadata/md5-cache/media-libs/vulkan-loader-1.3.239
index 592d4d0c6b30..017969014177 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.3.239
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.3.239
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 INHERIT=flag-o-matic cmake-multilib toolchain-funcs
 IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.3.239.tar.gz -> vulkan-loader-1.3.239.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a5b072264bc62fd88d3d63b7653307b9
+_md5_=bc13dc024d4fece6b140f62af4f55a70
diff --git a/metadata/md5-cache/media-libs/waffle-1.7.2 b/metadata/md5-cache/media-libs/waffle-1.7.2
new file mode 100644
index 000000000000..bba395fbb6ee
--- /dev/null
+++ b/metadata/md5-cache/media-libs/waffle-1.7.2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/libxslt dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-base/xcb-proto-1.8-r3 )
+DESCRIPTION=Library that allows selection of GL API and of window system at runtime
+EAPI=8
+HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
+INHERIT=meson-multilib multilib
+IUSE=doc +egl +gbm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/mesa/waffle/-/archive/v1.7.2/waffle-v1.7.2.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ba41cdca50696a069ff55ca72253b5ed
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 9d54491009c3..e329c461d0c5 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
 SLOT=1
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	9d4fc47e076850b06fede471ee147ec5	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=75cf8204d6949c7ce38cc9f612bc4ebb
diff --git a/metadata/md5-cache/media-libs/xvid-1.3.7-r1 b/metadata/md5-cache/media-libs/xvid-1.3.7-r1
index de42796b88e2..b920f6106406 100644
--- a/metadata/md5-cache/media-libs/xvid-1.3.7-r1
+++ b/metadata/md5-cache/media-libs/xvid-1.3.7-r1
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://www.xvid.org/
 INHERIT=flag-o-matic multilib-minimal
 IUSE=examples pic abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f99881702afb02bd5c64fea0f50fe04c
+_md5_=fb41175f0d2231f434acc9329dae4063
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 853c05c2ed41..109361fd8987 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/alsa-utils-1.2.8-r2 b/metadata/md5-cache/media-sound/alsa-utils-1.2.8-r2
index 43c4e994e2a0..9cbd62dc84e0 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.8-r2
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.8-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 INHERIT=systemd udev
 IUSE=bat doc +libsamplerate ieee1394 +ncurses nls selinux
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.2.8 libsamplerate? ( media-libs/libsamplerate ) ieee1394? ( media-libs/libffado ) ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.8.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=418090624846f8b6a176e09a5e6e662a
+_md5_=f7eed7a6ff3fa597a02f35e9c7565747
diff --git a/metadata/md5-cache/media-sound/mpg123-1.31.1 b/metadata/md5-cache/media-sound/mpg123-1.31.1
deleted file mode 100644
index 0e79404a692a..000000000000
--- a/metadata/md5-cache/media-sound/mpg123-1.31.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
-DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
-EAPI=8
-HOMEPAGE=https://www.mpg123.org/
-IDEPEND=app-eselect/eselect-mpg123
-INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/mpg123/mpg123-1.31.1.tar.bz2
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ba0df42e6cce2cd081a6e266e36f1218
diff --git a/metadata/md5-cache/media-sound/mpg123-1.31.2 b/metadata/md5-cache/media-sound/mpg123-1.31.2
index 60f8bb0898b0..b8aeeecec542 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.31.2
+++ b/metadata/md5-cache/media-sound/mpg123-1.31.2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpg123/mpg123-1.31.2.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=65ff7a48b314ae74bb6e1dc4866a507a
+_md5_=7a6204014ec69597f42df643f0708679
diff --git a/metadata/md5-cache/media-sound/strawberry-1.0.15 b/metadata/md5-cache/media-sound/strawberry-1.0.15
new file mode 100644
index 000000000000..ef5b0c508f5f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-1.0.15
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) icu? ( dev-libs/icu:= ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) dev-cpp/gtest dev-libs/boost dev-qt/qttest:5
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=8
+HOMEPAGE=https://www.strawberrymusicplayer.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic plocale xdg
+IUSE=cdda debug +gstreamer icu ipod moodbar mtp pulseaudio +udisks vlc
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) icu? ( dev-libs/icu:= ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=cdda? ( gstreamer ) || ( gstreamer vlc )
+SLOT=0
+SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.0.15/strawberry-1.0.15.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7373f49452340d8e86678d590d278aa9
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ec67ad3b0191..efbbe7ce4f37 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/argus-clients-3.0.8.4 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.4
index 2f950a56c3b6..8f2d7349d224 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.4
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://openargus.org/
 INHERIT=autotools toolchain-funcs
 IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=https://github.com/openargus/clients/archive/refs/tags/v3.0.8.4.tar.gz -> argus-clients-3.0.8.4.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=76a68fa736587c9cdf194ebb9f1340a5
+_md5_=fb08802933e26634dabd699705593b1d
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2
index 1862e018cae2..9355de933d60 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.net-snmp.org/
 INHERIT=autotools distutils-r1 perl-module systemd
 IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=HPND BSD GPL-2
 RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) rpm? ( bzip2 zlib )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/40
 SRC_URI=mirror://sourceforge/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	3929d88685167435c587b740fdb5ec46	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cac5ffcc7286473b3a61453af7b27ecf
+_md5_=0e2cc4bbe62842997107221434885f77
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.5.0 b/metadata/md5-cache/net-analyzer/scapy-2.5.0
index b65f0e184360..6bcb7e6d5c5a 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.5.0
+++ b/metadata/md5-cache/net-analyzer/scapy-2.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://scapy.net/ https://github.com/secdev/scapy
 INHERIT=distutils-r1 readme.gentoo-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.5.0.tar.gz -> scapy-2.5.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4c7bb01175274e8d0e47e851ae27c81d
+_md5_=ff2fe8f7898d8891c94ce1bf5a0a9b31
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.1.1 b/metadata/md5-cache/net-analyzer/traceroute-2.1.1
index 84b67fc05169..a34dd4235c70 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-2.1.1
+++ b/metadata/md5-cache/net-analyzer/traceroute-2.1.1
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=http://traceroute.sourceforge.net/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=static
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!net-misc/iputils[traceroute6(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/traceroute/traceroute-2.1.1.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=20a95117369e13992eac2bce00c61606
+_md5_=d9a3b632787755c01af27278f0ac0a74
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index f2d81cba91cd..19cb520e6f48 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/bind-9.16.36 b/metadata/md5-cache/net-dns/bind-9.16.36
index 69582f590170..79eef838645a 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.36
+++ b/metadata/md5-cache/net-dns/bind-9.16.36
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
 INHERIT=python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles
 IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.36/bind-9.16.36.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1308533f0af52a0967e95fea99515983
+_md5_=b950687c701e927e4abe18483dbbb382
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.36-r1 b/metadata/md5-cache/net-dns/bind-tools-9.16.36-r1
index ec63196822f0..190f7706a5f4 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.36-r1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.36-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9
 INHERIT=autotools flag-o-matic multiprocessing toolchain-funcs
 IUSE=+caps doc gssapi idn libedit readline test xml
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=>=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.36/bind-9.16.36.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3f68fef34c6d76907371b8090652e0f2
+_md5_=6f7e1a0dcea32d1a97dc45dc4aa6347a
diff --git a/metadata/md5-cache/net-dns/c-ares-1.19.0 b/metadata/md5-cache/net-dns/c-ares-1.19.0
index 9264ca22b13b..b0434efecc3f 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.19.0
+++ b/metadata/md5-cache/net-dns/c-ares-1.19.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://c-ares.org/
 INHERIT=edo multilib-minimal verify-sig
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://c-ares.org/download/c-ares-1.19.0.tar.gz verify-sig? ( https://c-ares.org/download/c-ares-1.19.0.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=9dca624ffce4c89f9cda33a68da93b8e
+_md5_=ef1130f7bede3767c5c182cd5cdbcf13
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.89 b/metadata/md5-cache/net-dns/dnsmasq-2.89
index cddcc5c835ba..0995a2272d06 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.89
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.89
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://thekelleys.org.uk/dnsmasq/doc.html
 INHERIT=toolchain-funcs lua-single systemd
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +loop +inotify ipv6 lua nettlehash nls script selinux static tftp lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) nettlehash? ( !static? ( dev-libs/nettle:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) dnssec? ( !nettlehash ) lua? ( script ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) libidn2? ( idn )
 SLOT=0
 SRC_URI=https://thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a1e48bed54018a8fe451d660d0511f24
+_md5_=fde8772d27a7713a179c5c04ed98213b
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 27bf67551e90..507143870e4f 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.3.0 b/metadata/md5-cache/net-firewall/firewalld-1.3.0
index 976bd144146c..3f17cde96cd3 100644
--- a/metadata/md5-cache/net-firewall/firewalld-1.3.0
+++ b/metadata/md5-cache/net-firewall/firewalld-1.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://firewalld.org/
 INHERIT=bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
 IUSE=gui +nftables +iptables test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_11(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/releases/download/v1.3.0/firewalld-1.3.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d94bcd2fe1a02de1732cfa4883371f65
+_md5_=4c8d91d37f1439c2fa0ebc907dc02175
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.9 b/metadata/md5-cache/net-firewall/iptables-1.8.9
index acf388ac16fb..14dabd667eed 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.8.9
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.9
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.netfilter.org/projects/iptables/
 IDEPEND=>=app-eselect/eselect-iptables-20220320
 INHERIT=systemd toolchain-funcs autotools flag-o-matic usr-ldscript
 IUSE=conntrack netlink nftables pcap static-libs split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:= >=net-libs/libnftnl-1.1.6:= ) pcap? ( net-libs/libpcap ) nftables? ( net-misc/ethertypes ) !<net-firewall/ebtables-2.0.11-r1 !<net-firewall/arptables-0.0.5-r1
 SLOT=0/1.8.3
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.9.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=7bfed1a2b6cf595029721fd79a974400
+_md5_=c5a3d609bf9bb919c16d38af4a4c9c60
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.6 b/metadata/md5-cache/net-firewall/nftables-1.0.6
index 75008ad38260..ce47b6e9c252 100644
--- a/metadata/md5-cache/net-firewall/nftables-1.0.6
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://netfilter.org/projects/nftables/
 INHERIT=edo linux-info distutils-r1 systemd verify-sig
 IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.4:= >=net-libs/libnftnl-1.2.4:= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) libedit? ( !readline )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.6.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/nftables-1.0.6.tar.xz.sig )
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=3bd14618f9409e9a85f9f14c2722efd0
+_md5_=e01640182c37f0c7b591200cc0e1152c
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index ed67eded2e80..6de5200cce2c 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/mcabber-9999 b/metadata/md5-cache/net-im/mcabber-9999
index 869387f033f9..f384715e9813 100644
--- a/metadata/md5-cache/net-im/mcabber-9999
+++ b/metadata/md5-cache/net-im/mcabber-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=crypt? ( app-crypt/gpgme:= ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn:= ) spell? ( app-text/enchant:0 ) dev-libs/glib:2 net-libs/libnsl:0= sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	mercurial	53b96197cb26db4afb5056f1bbfa4845	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	mercurial	9d4fc47e076850b06fede471ee147ec5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f389056394ecff750fe2c21bc0aac684
diff --git a/metadata/md5-cache/net-im/prosody-modules-9999 b/metadata/md5-cache/net-im/prosody-modules-9999
index 2b123e2a7ff2..4b82cb81df02 100644
--- a/metadata/md5-cache/net-im/prosody-modules-9999
+++ b/metadata/md5-cache/net-im/prosody-modules-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=net-im/prosody
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	mercurial	53b96197cb26db4afb5056f1bbfa4845	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	mercurial	9d4fc47e076850b06fede471ee147ec5	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=47eb213342d2da5c6782ed717c870d4f
diff --git a/metadata/md5-cache/net-im/synapse-1.78.0 b/metadata/md5-cache/net-im/synapse-1.78.0
new file mode 100644
index 000000000000..08d6db23ffab
--- /dev/null
+++ b/metadata/md5-cache/net-im/synapse-1.78.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-db/postgresql[server] ) ) >=virtual/rust-1.53 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=acct-user/synapse acct-group/synapse
+DESCRIPTION=Reference implementation of Matrix homeserver
+EAPI=8
+HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
+INHERIT=cargo distutils-r1 multiprocessing optfeature systemd
+IUSE=postgres systemd test debug python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+RDEPEND=acct-user/synapse acct-group/synapse dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/frozendict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ijson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matrix-common-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/phonenumbers[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,webp] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pymacaroons[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/signedjson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/treq[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) systemd? ( dev-python/python-systemd[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/matrix-org/synapse/archive/v1.78.0.tar.gz -> synapse-1.78.0.gh.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/arc-swap/1.5.1/download -> arc-swap-1.5.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2/0.10.6/download -> blake2-0.10.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.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/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.135/download -> libc-0.2.135.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.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.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-log/0.8.1/download -> pyo3-log-0.8.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/pythonize/0.17.0/download -> pythonize-0.17.0.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.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/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.104/download -> syn-1.0.104.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
+_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3da292fcf0c2a7891b3929c9ae30e356
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 818e9a228fad..47b51fe6f71f 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/libcloudproviders-0.3.1 b/metadata/md5-cache/net-libs/libcloudproviders-0.3.1
index 64c9a691bef1..4984debbba62 100644
--- a/metadata/md5-cache/net-libs/libcloudproviders-0.3.1
+++ b/metadata/md5-cache/net-libs/libcloudproviders-0.3.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/World/libcloudproviders
 INHERIT=gnome.org meson-multilib vala
 IUSE=gtk-doc +introspection vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.51.2: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(-)?] introspection? ( dev-libs/gobject-introspection )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libcloudproviders/0.3/libcloudproviders-0.3.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=ae8693043bf1220e22f9182923d6e9b7
+_md5_=5adf8b26aae8114fddcf056e6f9175fb
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1
index ae5d7ce3ac7d..d9973cbf815c 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_conntrack/
 INHERIT=autotools linux-info verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2.sig )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=b04813fefe9917f00cc7c1fc1e83176f
+_md5_=39051b33ccd89b605a71dca0665fae33
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.3.0 b/metadata/md5-cache/net-libs/libsearpc-3.3.0
index 13237ea2e21e..35290dae042b 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.3.0
+++ b/metadata/md5-cache/net-libs/libsearpc-3.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
 INHERIT=autotools python-single-r1
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1:= python_single_target_python3_9? ( dev-python/simplejson[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/simplejson[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/simplejson[python_targets_python3_11(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/15f6f0b9f451b9ecf99dedab72e9242e54e124eb.tar.gz -> libsearpc-3.3.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=35740bd7a554087dc18c214a119d230f
+_md5_=6583b41d3e46480c2349bdc3c4a45c09
diff --git a/metadata/md5-cache/net-libs/libsmi-0.5.0-r5 b/metadata/md5-cache/net-libs/libsmi-0.5.0-r5
index 5db72fb76f89..f186de052639 100644
--- a/metadata/md5-cache/net-libs/libsmi-0.5.0-r5
+++ b/metadata/md5-cache/net-libs/libsmi-0.5.0-r5
@@ -4,10 +4,10 @@ DESCRIPTION=A Library to Access SMI MIB Information
 EAPI=8
 HOMEPAGE=https://www.ibr.cs.tu-bs.de/projects/libsmi/ https://gitlab.ibr.cs.tu-bs.de/nm/libsmi
 INHERIT=autotools
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.ibr.cs.tu-bs.de/projects/libsmi/download/libsmi-0.5.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f1d7a612f4e3aa7eabb8500ed5cfeca6
+_md5_=576bf0dfd2ff434df3256999a59612ee
diff --git a/metadata/md5-cache/net-libs/libupnpp-0.22.2 b/metadata/md5-cache/net-libs/libupnpp-0.22.2
deleted file mode 100644
index d0e990e0949a..000000000000
--- a/metadata/md5-cache/net-libs/libupnpp-0.22.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/expat net-libs/libnpupnp net-misc/curl
-DESCRIPTION=The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay
-EAPI=8
-HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat net-libs/libnpupnp net-misc/curl
-SLOT=0
-SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.22.2.tar.gz
-_md5_=d1f0403705af3930d3edc976af102323
diff --git a/metadata/md5-cache/net-libs/libupnpp-0.22.4 b/metadata/md5-cache/net-libs/libupnpp-0.22.4
index 1e2ce1746b00..27b4b6cd5d5f 100644
--- a/metadata/md5-cache/net-libs/libupnpp-0.22.4
+++ b/metadata/md5-cache/net-libs/libupnpp-0.22.4
@@ -3,9 +3,9 @@ DEPEND=dev-libs/expat net-libs/libnpupnp net-misc/curl
 DESCRIPTION=The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay
 EAPI=8
 HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat net-libs/libnpupnp net-misc/curl
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.22.4.tar.gz
-_md5_=0fef04cd92731f3752622cb1bb15a547
+_md5_=d1f0403705af3930d3edc976af102323
diff --git a/metadata/md5-cache/net-libs/nodejs-14.21.1 b/metadata/md5-cache/net-libs/nodejs-14.21.1
deleted file mode 100644
index aa05f4158706..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.21.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= ) sys-devel/gcc:*
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= ) sys-devel/gcc:*
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/14
-SRC_URI=https://nodejs.org/dist/v14.21.1/node-v14.21.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0da538495b1fa5b82efe0019f36c1fa9
diff --git a/metadata/md5-cache/net-libs/nodejs-14.21.3 b/metadata/md5-cache/net-libs/nodejs-14.21.3
index 22b3c22888e6..83757596b973 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.21.3
+++ b/metadata/md5-cache/net-libs/nodejs-14.21.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~ppc64 -riscv x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= <dev-libs/openssl-3.0.0_beta1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.21.3/node-v14.21.3.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f516d31105702842ce8752addfd7aca7
+_md5_=0da538495b1fa5b82efe0019f36c1fa9
diff --git a/metadata/md5-cache/net-libs/nodejs-16.18.1 b/metadata/md5-cache/net-libs/nodejs-16.18.1
deleted file mode 100644
index f1ecb1da116c..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-16.18.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=8
-HOMEPAGE=https://nodejs.org/
-INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.18.1/node-v16.18.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=77aa6c87faf6569f647636f7c2fe02a5
diff --git a/metadata/md5-cache/net-libs/nodejs-16.19.1 b/metadata/md5-cache/net-libs/nodejs-16.19.1
index 934f75a682b3..cde575dc802b 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.19.1
+++ b/metadata/md5-cache/net-libs/nodejs-16.19.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://nodejs.org/dist/v16.19.1/node-v16.19.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0d0f30b0689774f3f9ba14d650544b3e
+_md5_=77aa6c87faf6569f647636f7c2fe02a5
diff --git a/metadata/md5-cache/net-libs/nodejs-18.12.1 b/metadata/md5-cache/net-libs/nodejs-18.12.1
deleted file mode 100644
index e416f273fe7d..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-18.12.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-lang/python-3.10.9-r1:3.10[threads(+)] >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=8
-HOMEPAGE=https://nodejs.org/
-INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/18
-SRC_URI=https://nodejs.org/dist/v18.12.1/node-v18.12.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ed6d6fdd313de76a98845e9b5ea23834
diff --git a/metadata/md5-cache/net-libs/nodejs-18.14.2 b/metadata/md5-cache/net-libs/nodejs-18.14.2
index 8fb05c787085..a314c76aa3f4 100644
--- a/metadata/md5-cache/net-libs/nodejs-18.14.2
+++ b/metadata/md5-cache/net-libs/nodejs-18.14.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://nodejs.org/
 INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test
-KEYWORDS=amd64 arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://nodejs.org/dist/v18.14.2/node-v18.14.2.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8f5f243b2114ac222675bb8a6d02b84c
+_md5_=78e563343fe577ac4fa01c600e63971e
diff --git a/metadata/md5-cache/net-libs/xdp-tools-1.2.8 b/metadata/md5-cache/net-libs/xdp-tools-1.2.8
index 8f8a6582689f..70e89870f165 100644
--- a/metadata/md5-cache/net-libs/xdp-tools-1.2.8
+++ b/metadata/md5-cache/net-libs/xdp-tools-1.2.8
@@ -10,4 +10,4 @@ LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=dev-libs/libbpf:= sys-libs/zlib net-libs/libpcap virtual/libelf
 SLOT=0
 SRC_URI=https://github.com/xdp-project/xdp-tools/archive/refs/tags/v1.2.8.tar.gz -> xdp-tools-1.2.8.tar.gz
-_md5_=538e9092bedf1f009a56992fb8b3014e
+_md5_=8a77dc6727917e8f33734305416b57c4
diff --git a/metadata/md5-cache/net-libs/xdp-tools-1.3.1 b/metadata/md5-cache/net-libs/xdp-tools-1.3.1
new file mode 100644
index 000000000000..d9015930092c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/xdp-tools-1.3.1
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/grep[pcre] >=sys-devel/clang-11.0.0
+DEFINED_PHASES=configure install test
+DEPEND=dev-libs/libbpf:= dev-util/bpftool net-libs/libpcap sys-libs/zlib virtual/libelf
+DESCRIPTION=The libxdp library and various tools for use with XDP
+EAPI=8
+HOMEPAGE=https://github.com/xdp-project/xdp-tools
+IUSE=+tools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 BSD-2
+RDEPEND=dev-libs/libbpf:= dev-util/bpftool net-libs/libpcap sys-libs/zlib virtual/libelf
+SLOT=0
+SRC_URI=https://github.com/xdp-project/xdp-tools/archive/refs/tags/v1.3.1.tar.gz -> xdp-tools-1.3.1.tar.gz
+_md5_=08b2f259e14d8075686444c64f6cf784
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 0616553c7f5e..6764e7c15b03 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.37 b/metadata/md5-cache/net-mail/fetchmail-6.4.37
new file mode 100644
index 000000000000..28eb72bd9750
--- /dev/null
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.37
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-fs/e2fsprogs ) socks? ( net-proxy/dante ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
+DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
+EAPI=8
+HOMEPAGE=https://www.fetchmail.info/
+INHERIT=autotools systemd tmpfiles toolchain-funcs
+IUSE=ssl nls kerberos tk socks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 public-domain
+RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-fs/e2fsprogs ) socks? ( net-proxy/dante ) virtual/tmpfiles
+SLOT=0
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.37.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=549d4256db13b5a0f3794798427e1d05
diff --git a/metadata/md5-cache/net-mail/mu-1.8.14 b/metadata/md5-cache/net-mail/mu-1.8.14
index 9f432c7f5617..79eeb7ed6ff9 100644
--- a/metadata/md5-cache/net-mail/mu-1.8.14
+++ b/metadata/md5-cache/net-mail/mu-1.8.14
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
 INHERIT=elisp-common meson
 IUSE=emacs readline
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.14/mu-1.8.14.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=777e2dd47710d26bceacaa6475fb81f7
+_md5_=90803e51ddace410769549d159105bbe
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 97209952ee07..f26d2cbc5047 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/dropbear-2022.82 b/metadata/md5-cache/net-misc/dropbear-2022.82
deleted file mode 100644
index cc01c52dd084..000000000000
--- a/metadata/md5-cache/net-misc/dropbear-2022.82
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( || ( ( >=dev-lang/python-3.11.1-r1: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.9-r1: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(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/attrs[python_targets_python3_9(-)] dev-python/iniconfig[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] dev-python/pluggy[python_targets_python3_9(-)] dev-python/py[python_targets_python3_9(-)] dev-python/pyparsing[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-dropbear ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-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=7
-HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
-INHERIT=savedconfig pam python-any-r1 verify-sig
-IUSE=bsdpty minimal multicall pam +shadow static +syslog test zlib savedconfig verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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 ) test
-SLOT=0
-SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.82.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.82.tar.bz2 verify-sig? ( https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.82.tar.bz2.asc https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.82.tar.bz2.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=67e80ff6d7dd8f9c63a6ca75d1159c94
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.24.5 b/metadata/md5-cache/net-misc/gallery-dl-1.24.5
index 00deb407eb9e..3da917b8a87f 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.24.5
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.24.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mikf/gallery-dl
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,ssl,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,ssl,xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,ssl,xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.24.5.tar.gz -> gallery-dl-1.24.5.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e48b7348021c9bcc19b78e1d0eaea745
+_md5_=531745191dcf0a5efc2c9fa3923393e1
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.9 b/metadata/md5-cache/net-misc/seafile-8.0.9
index bb755be78b51..2cf5d5a2a403 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.9
+++ b/metadata/md5-cache/net-misc/seafile-8.0.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile/
 INHERIT=autotools python-single-r1 vala
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/future[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/future[python_targets_python3_11(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libsearpc[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-misc/curl sys-apps/util-linux sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/6bd36a957573eda6a53f3d1bc538dbfc001aa9fd.tar.gz -> seafile-8.0.9.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=318e24f144affa9469e45df63960bf8a
+_md5_=0e73daf25673d9b30a9b4774368c15e4
diff --git a/metadata/md5-cache/net-misc/seafile-client-8.0.9 b/metadata/md5-cache/net-misc/seafile-client-8.0.9
index 7d3592fa96ef..a72806f24426 100644
--- a/metadata/md5-cache/net-misc/seafile-client-8.0.9
+++ b/metadata/md5-cache/net-misc/seafile-client-8.0.9
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.seafile.com/ https://github.com/haiwen/seafile-client/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake
 IUSE=shibboleth test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=net-libs/libsearpc-3.2.0_p1 ~net-misc/seafile-8.0.9 sys-libs/zlib virtual/opengl elibc_musl? ( sys-libs/fts-standalone ) shibboleth? ( dev-qt/qtwebengine:5[widgets] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile-client/archive/5701514e89114b97795d4cfcbc3b59a1fd2f91e8.tar.gz -> seafile-client-8.0.9.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=178a9c6d72e9d1ca5c99a15c76551faf
+_md5_=024ba3646d26e8b56da50ffdfd20078c
diff --git a/metadata/md5-cache/net-misc/socat-1.7.4.4 b/metadata/md5-cache/net-misc/socat-1.7.4.4
index 4b5a7aa29478..837ced3dfab7 100644
--- a/metadata/md5-cache/net-misc/socat-1.7.4.4
+++ b/metadata/md5-cache/net-misc/socat-1.7.4.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=bindist ipv6 readline ssl tcpd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.4.4.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8977a443a5abcdef0f505d4d715c005d
+_md5_=166e1a3aa0e4667426cd4dc9b2802664
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2023.03.04 b/metadata/md5-cache/net-misc/yt-dlp-2023.03.04
new file mode 100644
index 000000000000..81a337336e5d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/yt-dlp-2023.03.04
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=youtube-dl fork with additional features and fixes
+EAPI=8
+HOMEPAGE=https://github.com/yt-dlp/yt-dlp/
+INHERIT=bash-completion-r1 distutils-r1 optfeature wrapper
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/yt-dlp/yt-dlp/releases/download/2023.03.04/yt-dlp.tar.gz -> yt-dlp-2023.03.04.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=7a34d8eac3b41429104fc267d8fef9bc
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 87dc570fb4ce..d6b9d71d3dfa 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.17 b/metadata/md5-cache/net-print/cups-filters-1.28.17
index f61b7d589832..87813f912a6f 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.28.17
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.17
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 INHERIT=perl-module systemd flag-o-matic
 IUSE=dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib exif? ( media-libs/libexif ) dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( media-libs/libjpeg-turbo:= ) ldap? ( net-nds/openldap:= ) pdf? ( app-text/mupdf:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:= ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups-filters/releases/download/1.28.17/cups-filters-1.28.17.tar.xz https://www.openprinting.org/download/cups-filters/cups-filters-1.28.17.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e0b8ce42aab1cc7436af6d3f533bb4bb
+_md5_=7fd03a58727487b78cd67d082c21c21f
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.24 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.24
deleted file mode 100644
index 7925084fd0e2..000000000000
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-print/cups
-DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
-EAPI=8
-HOMEPAGE=https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64 ~ppc64
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/14/31/90/d2f5b28fcfaa0a1d1753eac5703aa5d88004ce06/epson-inkjet-printer-escpr-1.7.24-1lsb3.2.tar.gz
-_md5_=6a58351aa0076d8c2a3b927dcb5e7203
diff --git a/metadata/md5-cache/net-print/hplip-3.22.10 b/metadata/md5-cache/net-print/hplip-3.22.10
index 36d0cb4d441d..d9995532046a 100644
--- a/metadata/md5-cache/net-print/hplip-3.22.10
+++ b/metadata/md5-cache/net-print/hplip-3.22.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
 INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 udev
 IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_10? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] fax? ( dev-python/reportlab[python_targets_python3_10(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_10(-)] libnotify? ( dev-python/notify2[python_targets_python3_10(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_10(-)] >=dev-python/pillow-3.1.1[python_targets_python3_10(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.22.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.6-patches-1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=118af466bfd97f8fbadb7e3092e33473
+_md5_=cee0417f2f0491539e403e06aea77416
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0acaef9af56d..95e078c1804a 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.8 b/metadata/md5-cache/net-vpn/libreswan-4.10
index 9d0c4d90c6a2..371dc08132ce 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.8
+++ b/metadata/md5-cache/net-vpn/libreswan-4.10
@@ -11,6 +11,6 @@ LICENSE=GPL-2 BSD-4 RSA DES
 RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.8.tar.gz
+SRC_URI=https://download.libreswan.org/libreswan-4.10.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6c1c9269f153340e4d1b349d76988a32
+_md5_=41b8d634a381c3074b9191a5ebd312aa
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.6-r1 b/metadata/md5-cache/net-vpn/libreswan-4.6-r1
deleted file mode 100644
index 23510731ba18..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-4.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) elibc_musl? ( sys-libs/queue-standalone )
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=8
-HOMEPAGE=https://libreswan.org/
-INHERIT=systemd flag-o-matic toolchain-funcs tmpfiles
-IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-4.6.tar.gz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fb6ff66ae6f7b4877dae8ddae79d1bc5
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index a6f0c8242c1d..0981b2f0c058 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0
index db26775b8b0a..88d6a0c11bf9 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://qalculate.github.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-4.5.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v4.5.0/qalculate-gtk-4.5.0.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d943a68d3dbe95413bd6a8a982ba01a
+_md5_=6b990b4fdbcdb6933419991b366347a2
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index a4ede95ee0a3..0c95786748f6 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/gpxsee-11.5 b/metadata/md5-cache/sci-geosciences/gpxsee-11.5
deleted file mode 100644
index a5acadc0120d..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpxsee-11.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5 dev-qt/qtsvg:5
-DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
-EAPI=8
-HOMEPAGE=https://www.gpxsee.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=plocale qmake-utils xdg
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5 dev-qt/qtsvg:5
-SLOT=0
-SRC_URI=https://github.com/tumic0/GPXSee/archive/11.5.tar.gz -> gpxsee-11.5.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=822b2698975ee7f408d9412f124360a4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3aafd293e0da..add9b69e0ed9 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/arpack-3.9.0 b/metadata/md5-cache/sci-libs/arpack-3.9.0
new file mode 100644
index 000000000000..aa5389ddb0c9
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/arpack-3.9.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/fortran
+DEFINED_PHASES=configure install prepare setup
+DEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
+DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
+EAPI=7
+HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng
+INHERIT=autotools fortran-2 toolchain-funcs
+IUSE=examples mpi
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
+SLOT=0
+SRC_URI=https://github.com/opencollab/arpack-ng/archive/3.9.0.tar.gz -> arpack-3.9.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=103e0dd9464e86696ed3c8f7105dd1ff
diff --git a/metadata/md5-cache/sci-libs/cgnslib-4.3.0 b/metadata/md5-cache/sci-libs/cgnslib-4.3.0
index 5604746ccba4..f8be312a5bbb 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-4.3.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-4.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://cgns.github.io/ https://github.com/CGNS/CGNS
 INHERIT=cmake fortran-2
 IUSE=base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
 REQUIRED_USE=mpi? ( hdf5 ) szip? ( hdf5 )
@@ -14,4 +14,4 @@ RESTRICT=fortran? ( test ) !test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/CGNS/CGNS/archive/v4.3.0.tar.gz -> cgnslib-4.3.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c2fa6669dab9eff314b986af12a9d4e6
+_md5_=78ea9c6ef9eac24d92a268f2feeaaea7
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5 b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5
index eb650f9de721..be173eff6f77 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs prefix
 IUSE=cxx debug examples fortran +hl mpi szip threads unsupported zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=!unsupported? ( cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl ) )
 SLOT=0/1.12.2
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.2/src/hdf5-1.12.2.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=26bf73bc652f7419d938e796436ce6a7
+_md5_=d7138e8532befe2b95d747f4052aeb15
diff --git a/metadata/md5-cache/sci-libs/lapack-3.11 b/metadata/md5-cache/sci-libs/lapack-3.11
index 2b956a2e2b0d..161d8881df37 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.11
+++ b/metadata/md5-cache/sci-libs/lapack-3.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.netlib.org/lapack/
 INHERIT=cmake python-any-r1
 IUSE=lapacke deprecated doc eselect-ldso test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=!app-eselect/eselect-cblas virtual/fortran eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) doc? ( app-doc/blas-docs )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Reference-LAPACK/lapack/archive/v3.11.tar.gz -> lapack-3.11.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0c216d2fe922bf3636d0ff130569f676
+_md5_=c81825762f4e0039db30fb91210ed2a7
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.9.1 b/metadata/md5-cache/sci-libs/netcdf-4.9.1
new file mode 100644
index 000000000000..333d9101db36
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/netcdf-4.9.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
+DESCRIPTION=Scientific library and interface for array oriented data access
+EAPI=8
+HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
+INHERIT=cmake flag-o-matic
+IUSE=+dap doc examples hdf +hdf5 mpi szip test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=UCAR-Unidata
+RDEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
+REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
+RESTRICT=!test? ( test )
+SLOT=0/19
+SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.9.1.tar.gz -> netcdf-4.9.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=522c49d7f8cbea8e930fac4aeb5da8d4
diff --git a/metadata/md5-cache/sci-libs/scotch-7.0.1-r1 b/metadata/md5-cache/sci-libs/scotch-7.0.1-r1
index cf7ecdc7f6cd..793bdf463129 100644
--- a/metadata/md5-cache/sci-libs/scotch-7.0.1-r1
+++ b/metadata/md5-cache/sci-libs/scotch-7.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
 INHERIT=toolchain-funcs flag-o-matic multilib
 IUSE=doc int64 mpi static-libs test tools +threads
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
 REQUIRED_USE=test? ( threads )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v7.0.1/scotch-v7.0.1.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ba1d14c63f8611a7b7caffaab2f6701d
+_md5_=764ef46ade36211e4d20fbc8caec8ecd
diff --git a/metadata/md5-cache/sci-libs/sundials-6.5.0 b/metadata/md5-cache/sci-libs/sundials-6.5.0
index ec62cdf705dd..7a2baa7ff623 100644
--- a/metadata/md5-cache/sci-libs/sundials-6.5.0
+++ b/metadata/md5-cache/sci-libs/sundials-6.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://computing.llnl.gov/projects/sundials
 INHERIT=cmake flag-o-matic fortran-2 toolchain-funcs
 IUSE=doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=lapack? ( virtual/lapack ) mpi? ( sci-libs/hypre:=[fortran?,mpi?] virtual/mpi[fortran?] ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:=[int64=] ) fortran? ( virtual/fortran )
 REQUIRED_USE=fortran? ( static-libs ) hypre? ( mpi )
 SLOT=0/6
 SRC_URI=https://github.com/LLNL/sundials/releases/download/v6.5.0/sundials-6.5.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d6317d49af8fbf6f66e6150d27657305
+_md5_=fd28ad8b083370072e6dcfad349122a6
diff --git a/metadata/md5-cache/sci-libs/vtk-9.2.5 b/metadata/md5-cache/sci-libs/vtk-9.2.5
index 11307e3e1036..6195e1f74ea8 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.2.5
+++ b/metadata/md5-cache/sci-libs/vtk-9.2.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.vtk.org/
 INHERIT=check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp
 IUSE=all-modules boost cuda debug doc examples ffmpeg freetype gdal imaging java las +logging mpi mysql odbc openmp openvdb pdal postgres python qt5 qt6 +rendering sdl tbb test +threads tk video_cards_nvidia views vtkm web java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
 RDEPEND=app-arch/lz4:= app-arch/xz-utils dev-cpp/eigen dev-cpp/nlohmann_json dev-db/sqlite:3 dev-libs/double-conversion:= dev-libs/expat dev-libs/icu:= dev-libs/jsoncpp:= >=dev-libs/libfmt-8.1.1:= dev-libs/libxml2:2 dev-libs/libzip:= <dev-libs/pegtl-3 dev-libs/pugixml dev-libs/utfcpp media-libs/freetype media-libs/libjpeg-turbo >=media-libs/libharu-2.4.2:= media-libs/libogg media-libs/libpng:= media-libs/libtheora media-libs/tiff:= >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] sci-libs/hdf5:=[mpi=] sci-libs/proj:= sci-libs/netcdf:=[mpi=] sys-libs/zlib boost? ( dev-libs/boost:=[mpi?] ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:= ) freetype? ( media-libs/fontconfig ) gdal? ( sci-libs/gdal:= ) java? ( >=virtual/jdk-1.8:* ) las? ( sci-geosciences/liblas ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mariadb-connector-c ) odbc? ( dev-db/unixODBC ) openvdb? ( media-gfx/openvdb:= ) pdal? ( sci-libs/pdal:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( mpi? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( mpi? ( dev-python/mpi4py[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( mpi? ( dev-python/mpi4py[python_targets_python3_11(-)] ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,opengl,sql,widgets] dev-qt/qtdeclarative:6[opengl] dev-qt/qtshadertools:6 x11-libs/libxkbcommon ) sdl? ( media-libs/libsdl2 ) rendering? ( media-libs/glew:= virtual/opengl x11-libs/gl2ps x11-libs/libICE x11-libs/libXcursor x11-libs/libXext ) tbb? ( dev-cpp/tbb:= ) tk? ( dev-lang/tk:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) views? ( x11-libs/libICE x11-libs/libXext ) web? ( app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=all-modules? ( boost ffmpeg freetype gdal imaging las mysql odbc openvdb pdal postgres rendering views ) cuda? ( video_cards_nvidia vtkm ) java? ( rendering ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) qt5? ( rendering ) qt6? ( rendering ) sdl? ( rendering ) tk? ( python rendering ) web? ( python )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/9.2
 SRC_URI=https://www.vtk.org/files/release/9.2/VTK-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKDataFiles-9.2.5.tar.gz doc? ( https://www.vtk.org/files/release/9.2/vtkDocHtml-9.2.5.tar.gz ) examples? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz ) test? ( https://www.vtk.org/files/release/9.2/VTKLargeData-9.2.5.tar.gz https://www.vtk.org/files/release/9.2/VTKLargeDataFiles-9.2.5.tar.gz )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	webapp	67df5bab481d0b9428f9ab7b3de690e4	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f2a75bbb05b847e4eae3e1a9f91d6cad
+_md5_=704851f67979ca9d87caf2d3431f7600
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 332bee6fd206..0cf5fb01301e 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/boolector-3.2.2_p20220110 b/metadata/md5-cache/sci-mathematics/boolector-3.2.2_p20220110
index f65c950f0f28..26692d7cdc9b 100644
--- a/metadata/md5-cache/sci-mathematics/boolector-3.2.2_p20220110
+++ b/metadata/md5-cache/sci-mathematics/boolector-3.2.2_p20220110
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Boolector/boolector/archive/13a8a06d561041cafcaf5458e404c1ec354b2841.tar.gz -> boolector-3.2.2_p20220110.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a29a088d5af2315603204bc3a1b03c9c
+_md5_=38c5e146c0c6da6e8fc45214ecbbf639
diff --git a/metadata/md5-cache/sci-mathematics/btor2tools-1.0.0_pre20220518-r1 b/metadata/md5-cache/sci-mathematics/btor2tools-1.0.0_pre20220518-r1
index bdc145efd840..256a62ec6173 100644
--- a/metadata/md5-cache/sci-mathematics/btor2tools-1.0.0_pre20220518-r1
+++ b/metadata/md5-cache/sci-mathematics/btor2tools-1.0.0_pre20220518-r1
@@ -10,4 +10,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/Boolector/btor2tools/archive/b8456dda4780789e882f5791eb486f295ade4da4.tar.gz -> btor2tools-1.0.0_pre20220518.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b9bf6d2694d86736ef280da748ed228c
+_md5_=c276ec66337a42e48e2194b4a977133c
diff --git a/metadata/md5-cache/sci-mathematics/cvc4-1.8-r3 b/metadata/md5-cache/sci-mathematics/cvc4-1.8-r4
index cba79b61cf53..5c26f09fdcda 100644
--- a/metadata/md5-cache/sci-mathematics/cvc4-1.8-r3
+++ b/metadata/md5-cache/sci-mathematics/cvc4-1.8-r4
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost readline? ( sys-libs/re
 SLOT=0
 SRC_URI=https://github.com/CVC4/CVC4-archived/archive/refs/tags/1.8.tar.gz -> cvc4-1.8.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=78c2e432bdd5ae22d0df8705a99d93aa
+_md5_=779b5140e62b9e1f70d19407f1230c89
diff --git a/metadata/md5-cache/sci-mathematics/metamath-databases-20220303 b/metadata/md5-cache/sci-mathematics/metamath-databases-20220303
index 68e178802ed7..1a3ad6b3224c 100644
--- a/metadata/md5-cache/sci-mathematics/metamath-databases-20220303
+++ b/metadata/md5-cache/sci-mathematics/metamath-databases-20220303
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=Sample databases for Metamath
 EAPI=8
-HOMEPAGE=http://us.metamath.org/mpeuni/mmset.html
+HOMEPAGE=http://us.metamath.org/mpeuni/mmset.html https://github.com/metamath/set.mm/
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 RDEPEND=sci-mathematics/metamath
 SLOT=0
 SRC_URI=https://github.com/metamath/set.mm/archive/99d707bc3c600a9d6052a46a7c85f05b74c589a2.tar.gz -> metamath-databases-20220303.tar.gz
-_md5_=b623cbe16b0699c67af13a4af1e1702f
+_md5_=c834deabd97c966f7c0c99f8bb8acd37
diff --git a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018 b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
index a91f7abebdc6..80766b33fc44 100644
--- a/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
+++ b/metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=Interpolating SMT-solver computing Craig interpolants for various theories
 EAPI=8
-HOMEPAGE=http://ultimate.informatik.uni-freiburg.de/smtinterpol/
+HOMEPAGE=http://ultimate.informatik.uni-freiburg.de/smtinterpol/ https://github.com/ultimate-pa/smtinterpol/
 INHERIT=java-pkg-2 java-ant-2
 KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/ultimate-pa/smtinterpol/archive/32d7fa8751f668f9e9a18e4e96df3337b53d2150.tar.gz -> smtinterpol-2.5_p20211018.tar.gz
 _eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cddb4993a2dae6b0b45f68eff017989f
+_md5_=3ecc5cfa262ba9fd5ffbd0f2587dbb92
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index bfe28db00ff4..14660b91e35a 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.7
index fe7f0ce01f89..1b165d4178ce 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.6
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.7
@@ -4,6 +4,6 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/download-90.cgi
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=public-domain
-SLOT=10.1.6
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.6/KEYS -> openpgp-keys-apache-tomcat-10.1.6-KEYS.asc
+SLOT=10.1.7
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.7/KEYS -> openpgp-keys-apache-tomcat-10.1.7-KEYS.asc
 _md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.87
index ddd6a185f15d..e750c111ef0c 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.86
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.87
@@ -4,6 +4,6 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/download-80.cgi
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=public-domain
-SLOT=8.5.86
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.86/KEYS -> openpgp-keys-apache-tomcat-8.5.86-KEYS.asc
+SLOT=8.5.87
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.87/KEYS -> openpgp-keys-apache-tomcat-8.5.87-KEYS.asc
 _md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 7ae55ae1282e..9191bee2ac2e 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/ack-3.6.0 b/metadata/md5-cache/sys-apps/ack-3.6.0
index ebca75e7fe8a..3d3d5f022524 100644
--- a/metadata/md5-cache/sys-apps/ack-3.6.0
+++ b/metadata/md5-cache/sys-apps/ack-3.6.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://beyondgrep.com
 INHERIT=perl-module
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/File-Next-1.180.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.6.0.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=f9bb48a074f2d633cc08c44cf1824077
+_md5_=c4ee15a3ed4066872d051a022364ea16
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.9-r1 b/metadata/md5-cache/sys-apps/diffutils-3.9-r1
index fef9a19aaef2..c2686abc4328 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.9-r1
+++ b/metadata/md5-cache/sys-apps/diffutils-3.9-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 INHERIT=flag-o-matic verify-sig
 IUSE=nls static verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.9.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.9.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=1d245141487acd4642da0b4f1bd03d45
+_md5_=fe1fd8c493f45cedb36eb514a55de730
diff --git a/metadata/md5-cache/sys-apps/ed-1.19-r1 b/metadata/md5-cache/sys-apps/ed-1.19-r1
index c4ba2e5e230b..9ee320ddf69a 100644
--- a/metadata/md5-cache/sys-apps/ed-1.19-r1
+++ b/metadata/md5-cache/sys-apps/ed-1.19-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/ed/
 INHERIT=edo toolchain-funcs unpacker verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ed/ed-1.19.tar.lz https://download.savannah.gnu.org/releases/ed/ed-1.19.tar.lz verify-sig? ( mirror://gnu/ed/ed-1.19.tar.lz.sig https://download.savannah.gnu.org/releases/ed/ed-1.19.tar.lz.sig )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=f62e1a1c4cb1d51c9e4cf19401efab7a
+_md5_=d0ac361a5b9c0ba76081590d3ab2bf37
diff --git a/metadata/md5-cache/sys-apps/ethtool-6.1 b/metadata/md5-cache/sys-apps/ethtool-6.1
index 88327c4cd636..bde8c7948f03 100644
--- a/metadata/md5-cache/sys-apps/ethtool-6.1
+++ b/metadata/md5-cache/sys-apps/ethtool-6.1
@@ -5,9 +5,9 @@ DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
 IUSE=+netlink
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=netlink? ( net-libs/libmnl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/ethtool/ethtool-6.1.tar.xz
-_md5_=527bf6d4a65e01ec77145a891d4683d2
+_md5_=6d8a3e9aa2516080c345bf2ff917f88c
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.30.1 b/metadata/md5-cache/sys-apps/fakeroot-1.30.1
index 0214f8df6af0..cf29d391bab0 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.30.1
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.30.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
 INHERIT=autotools flag-o-matic plocale
 IUSE=acl debug nls test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.30.1.orig.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b3cd52ff5af130be937c93287b609d89
+_md5_=b443825ad06c9c2bbb7a37efe5dbe72a
diff --git a/metadata/md5-cache/sys-apps/help2man-1.49.3 b/metadata/md5-cache/sys-apps/help2man-1.49.3
index 45d6c6d75466..a0c8afaee468 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.49.3
+++ b/metadata/md5-cache/sys-apps/help2man-1.49.3
@@ -4,9 +4,9 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/help2man/ https://salsa.debian.org/bod/help2man
 IUSE=nls
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ nls? ( FSFAP )
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.49.3.tar.xz
-_md5_=ca45c2e9f0f89898040fe2a304ba334f
+_md5_=6bab9f51ae279f13c4b3bdd285645b9a
diff --git a/metadata/md5-cache/sys-apps/iproute2-6.2.0 b/metadata/md5-cache/sys-apps/iproute2-6.2.0
index 7f77c26a65a1..43f9fbfc1617 100644
--- a/metadata/md5-cache/sys-apps/iproute2-6.2.0
+++ b/metadata/md5-cache/sys-apps/iproute2-6.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
 INHERIT=edo toolchain-funcs
 IUSE=atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.2.0.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6a9be1db23c9bd85e039dadd8ec36224
+_md5_=862aa1f1e14cafeb3e04cea044ec2357
diff --git a/metadata/md5-cache/sys-apps/kmod-30-r1 b/metadata/md5-cache/sys-apps/kmod-30-r1
index 9768c8ed76c1..c75b8c8145d3 100644
--- a/metadata/md5-cache/sys-apps/kmod-30-r1
+++ b/metadata/md5-cache/sys-apps/kmod-30-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 INHERIT=autotools libtool bash-completion-r1 python-r1
 IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-30.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=87040cdcd406b76697101f68bb236b51
+_md5_=1333574541795ca8fe5df7e04ca521c2
diff --git a/metadata/md5-cache/sys-apps/man-db-2.11.2 b/metadata/md5-cache/sys-apps/man-db-2.11.2
index 6d337d5bb8c0..305b9818fc15 100644
--- a/metadata/md5-cache/sys-apps/man-db-2.11.2
+++ b/metadata/md5-cache/sys-apps/man-db-2.11.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/
 INHERIT=systemd prefix tmpfiles
 IUSE=+manpager nls +seccomp selinux static-libs zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=manpager? ( app-text/manpager )
 RDEPEND=>=dev-libs/libpipeline-1.5.0 sys-apps/groff sys-libs/gdbm:= seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb ) virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://nongnu/man-db/man-db-2.11.2.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3f9a7498519bb8a0f4644cfbf96e0895
+_md5_=9bb926eaeff36dfdd730a5bfdb9e7a23
diff --git a/metadata/md5-cache/sys-apps/pcsc-tools-1.6.1 b/metadata/md5-cache/sys-apps/pcsc-tools-1.6.1
index 2bcf59bb6b51..efaeb4d67ad4 100644
--- a/metadata/md5-cache/sys-apps/pcsc-tools-1.6.1
+++ b/metadata/md5-cache/sys-apps/pcsc-tools-1.6.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/ https://github.com/LudovicRousseau/pcsc-tools
 INHERIT=desktop toolchain-funcs xdg-utils
 IUSE=gui network-cron
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.4.14 dev-perl/pcsc-perl gui? ( dev-perl/Gtk3 )
 SLOT=0
 SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.6.1.tar.bz2
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8ce19eff63e71f1d1688213e6e8f1f9b
+_md5_=a8ce2803cf59a9bee9e48fbf36ab8520
diff --git a/metadata/md5-cache/sys-apps/sg3_utils-1.47-r1 b/metadata/md5-cache/sys-apps/sg3_utils-1.47-r1
index 4fa77eb390c1..08c1c16a493b 100644
--- a/metadata/md5-cache/sys-apps/sg3_utils-1.47-r1
+++ b/metadata/md5-cache/sys-apps/sg3_utils-1.47-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Apps for querying the sg SCSI interface
 EAPI=7
 HOMEPAGE=https://sg.danny.cz/sg/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/rescan-scsi-bus
 SLOT=0/1.47
 SRC_URI=https://sg.danny.cz/sg/p/sg3_utils-1.47.tar.xz
-_md5_=2c58efe0d21b663f2cf89832a85bb5bf
+_md5_=d96a4337cdc228fa50ee5db9f946657c
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.10-r1 b/metadata/md5-cache/sys-apps/systemd-utils-251.10-r1
index f7fd679c7ee1..f9fee06b7866 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.10-r1
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.10-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.10.tar.gz -> systemd-stable-251.10.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=f667321bd31bca38def032e618db3f6d
+_md5_=258933f3c2526c07e9fe65393c3560a1
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-252.6 b/metadata/md5-cache/sys-apps/systemd-utils-252.6
index 62cdba357fd1..a7d3842ea8b9 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-252.6
+++ b/metadata/md5-cache/sys-apps/systemd-utils-252.6
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v252.6.tar.gz -> systemd-stable-252.6.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-252.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=f91dfa53d7da674c3deaf3025a69bbc1
+_md5_=480670781424ea9774aaa42116f43679
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-252.7 b/metadata/md5-cache/sys-apps/systemd-utils-252.7
index 92bb2a6157d0..86f1574e1719 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-252.7
+++ b/metadata/md5-cache/sys-apps/systemd-utils-252.7
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v252.7.tar.gz -> systemd-stable-252.7.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-252.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=f91dfa53d7da674c3deaf3025a69bbc1
+_md5_=480670781424ea9774aaa42116f43679
diff --git a/metadata/md5-cache/sys-apps/usbutils-015 b/metadata/md5-cache/sys-apps/usbutils-015
index d8568e83b628..e055ab7a18e6 100644
--- a/metadata/md5-cache/sys-apps/usbutils-015
+++ b/metadata/md5-cache/sys-apps/usbutils-015
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 INHERIT=python-single-r1
 IUSE=python python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= virtual/libudev:= python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-apps/hwdata )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-015.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5bb23266b30289885ce8cb984cd70cce
+_md5_=1f55d402ab5b7c1c14421b61a1dae55e
diff --git a/metadata/md5-cache/sys-apps/watchdog-5.16-r1 b/metadata/md5-cache/sys-apps/watchdog-5.16-r1
index 67e1528f6829..3bc854871aa0 100644
--- a/metadata/md5-cache/sys-apps/watchdog-5.16-r1
+++ b/metadata/md5-cache/sys-apps/watchdog-5.16-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/watchdog/
 INHERIT=flag-o-matic systemd toolchain-funcs
 IUSE=nfs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=nfs? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=mirror://sourceforge/watchdog/watchdog-5.16.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=345fa0fb26f92bfdcd5ec0cb3d838785
+_md5_=692f79aba07762929997b2e1be2847a0
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 6b29442d6b5e..f4d8543fa9a9 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7
new file mode 100644
index 000000000000..5908723c8015
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.7
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gtk-doc-am test? ( dev-libs/libxml2 )
+DEFINED_PHASES=configure install test
+DEPEND=dev-libs/icu:= pam? ( sys-libs/pam ) pskc? ( dev-libs/libxml2 dev-libs/xmlsec )
+DESCRIPTION=Toolkit for using one-time password authentication with HOTP/TOTP algorithms
+EAPI=8
+HOMEPAGE=https://www.nongnu.org/oath-toolkit/
+INHERIT=pam
+IUSE=pam pskc static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3 LGPL-2.1
+RDEPEND=dev-libs/icu:= pam? ( sys-libs/pam ) pskc? ( dev-libs/libxml2 dev-libs/xmlsec )
+REQUIRED_USE=test? ( pskc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://nongnu/oath-toolkit/oath-toolkit-2.6.7.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a7269e6ff52f0704dd3df130cf9090e6
diff --git a/metadata/md5-cache/sys-auth/polkit-122 b/metadata/md5-cache/sys-auth/polkit-122
index 0b50bbfc0c2c..3e621e7157f9 100644
--- a/metadata/md5-cache/sys-auth/polkit-122
+++ b/metadata/md5-cache/sys-auth/polkit-122
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit
 INHERIT=meson pam pax-utils python-any-r1 systemd xdg-utils
 IUSE=+daemon +duktape examples gtk +introspection kde pam selinux systemd test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-libs/glib:2 dev-libs/expat daemon? ( duktape? ( dev-lang/duktape:= ) !duktape? ( dev-lang/spidermonkey:102[-debug] ) ) pam? ( sys-auth/pambase sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:0=[policykit] ) !systemd? ( sys-auth/elogind ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/polkit/polkit/-/archive/122/polkit-122.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pam	01b77091d5b6560b0aeafa7fbb1bd818	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7877e1519159762541e8a9d3fed39e9a
+_md5_=8108144f07fc04927703a8156dfa685f
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4485995a1a35..a4692f397f25 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index d245820594aa..283fb6909b6a 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=86c93692eb7f156cf22a7a103b6e1bea
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 06c97e762b0f..f428acadea38 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a165541c0e27cc5aaa8e451e68bd7128
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index c6cf0602c70b..768d9a8ade0d 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pyth
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
index d632b6cdbede..4e9c11659b28 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=38a6e26399d1c00c341ec62dc29ab579
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
index e4110e908883..bcd9ed289fef 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pyth
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225
index 5b911d3b4b0a..546f93b76309 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=77df09abc2688e2dd9097d9bda100822
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304
new file mode 100644
index 000000000000..50ca79f4322d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-17.0.0_pre20230304:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
+IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=~sys-devel/clang-runtime-17.0.0_pre20230304 sys-devel/clang-toolchain-symlinks:17
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-17.0.0_pre20230304:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-17.0.0_pre20230304 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230304[llvm_targets_Xtensa] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=17/17.0.0_pre20230304
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index 2428463ef58d..4ceea07bd3ff 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3
index e7eb5cbfa55e..11a68d4851a5 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=f49aabb29904c888f9dfd9f2165bf39b
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
index 2694f7616fac..68bafb108771 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d75f961655c054b8c3b0dbbd6ebed902
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1
index 2d0a220ce0be..db080a2db298 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_rc3 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=217209beffe304e53d1b826c40fce259
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
index 5fed37c2ae94..88e1de0c0f32 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d75f961655c054b8c3b0dbbd6ebed902
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225
index 4b3bdebf4712..28952c96c0f1 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230225 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=d75f961655c054b8c3b0dbbd6ebed902
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304
new file mode 100644
index 000000000000..82d99334a6d2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install preinst prepare pretend unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
+INHERIT=bash-completion-r1 llvm.org
+IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230304 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d75f961655c054b8c3b0dbbd6ebed902
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230304
new file mode 100644
index 000000000000..a47938e1b2f1
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230304
@@ -0,0 +1,13 @@
+DEFINED_PHASES=pretend
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=8
+HOMEPAGE=https://clang.llvm.org/
+INHERIT=multilib-build toolchain-funcs
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-17.0.0_pre20230304:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=17
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a2cbb671ba47f2c77b593a6e199d20d0
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230304 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230304
new file mode 100644
index 000000000000..f4278ecf3791
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20230304
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20230304/gcc-12-20230304.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-13.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-7.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	51f0678e2e1381b8304778eb5a6c85a3	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4b71fc1924353878d60a11d68a8fe985
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index dd5ec7706885..029688553c01 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26671ae41a4c43c90c6965c6a33bad29
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index cdcf5cf51405..370015d5a57d 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0.9999 b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
index f44fd0bf820d..8daf52f3c333 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_rc3 b/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
index d55d20d8abc5..5141881a5754 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_rc3[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0.9999 b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
index a773ce0b39bc..e16314e6d5c5 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-17.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225
index 96ac0efb7e34..54707ba161ca 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230225[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304
new file mode 100644
index 000000000000..78ff9a5cdedf
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-17.0.0_pre20230304[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-17.0.0_pre20230304[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-17.0.0_pre20230304[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-17.0.0_pre20230304[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=debug test zstd test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
+RDEPEND=~sys-devel/llvm-17.0.0_pre20230304[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=17/17.0.0_pre20230304
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
index da54060e1f0f..8ebdf9f24164 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2362a7217e269a5256781605e8568eea
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7 b/metadata/md5-cache/sys-devel/llvm-15.0.7
index 15c188e3229c..9cf5a929e62e 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=57206fed54382599056d6ab0dd917f0a
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
index 724317923073..5448749a338c 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e3fa1f37d07e819d02984749fe11bb78
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
index f1bb0811b2ae..bef8c8e21374 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c66f484d3faa6207f229330811256576
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
index 2f49ad7200ea..a71afcddea5b 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e3fa1f37d07e819d02984749fe11bb78
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225
index a66b1035cd9c..f30be5d80cde 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=cf0002658757642dda274a6d94c87f2a
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
new file mode 100644
index 000000000000..b089230a4bc7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
+IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=17/17.0.0_pre20230304
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e3fa1f37d07e819d02984749fe11bb78
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index 30d2c5f475a4..67dc08c28768 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index a01b950d2150..082ffa9a2e38 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
index d77e65ee372b..c49024afac4a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2d553af5e8a17dfd7140dd660f48b48a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
index 54d85bad96f1..4ad2d54409f2 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
 _md5_=c9d578123645e9827b6020e0dc4dd9b3
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
index 9da90d5c31b0..120298c86718 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225
index 8562e1035ee2..d449e3a1392b 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=llvm.org	7fc16ff522366c1da2ff13695cb44b72	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304
new file mode 100644
index 000000000000..2c95c1200633
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-roc-5.0.2 b/metadata/md5-cache/sys-devel/llvm-roc-5.0.2
deleted file mode 100644
index 860942f1dd49..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-roc-5.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sys-libs/zlib sys-libs/ncurses:=
-DESCRIPTION=Radeon Open Compute llvm,lld,clang
-EAPI=8
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm/
-INHERIT=cmake
-IUSE=debug +runtime
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA rc BSD public-domain
-RDEPEND=dev-libs/libxml2 sys-libs/zlib sys-libs/ncurses:=
-SLOT=0
-SRC_URI=https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.0.2.tar.gz -> llvm-rocm-ocl-5.0.2.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2acdc21f12f3834ddcf89245c367ecbc
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.19-r1 b/metadata/md5-cache/sys-devel/m4-1.4.19-r1
index b3901719ff78..d7cf1d6ebbe8 100644
--- a/metadata/md5-cache/sys-devel/m4-1.4.19-r1
+++ b/metadata/md5-cache/sys-devel/m4-1.4.19-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/m4/m4.html
 INHERIT=verify-sig
 IUSE=examples nls verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=virtual/libiconv nls? ( sys-devel/gettext virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/m4/m4-1.4.19.tar.xz https://dev.gentoo.org/~floppym/dist/m4-1.4.19-test-198-sysval-r1.patch.gz verify-sig? ( mirror://gnu/m4/m4-1.4.19.tar.xz.sig )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=f3fb9576e7d24892df9156cb665e3260
+_md5_=e67a4f17213b2b86f9e0e61bc1326677
diff --git a/metadata/md5-cache/sys-devel/mold-1.10.1 b/metadata/md5-cache/sys-devel/mold-1.10.1
index 655a17e313ee..293fbfa92773 100644
--- a/metadata/md5-cache/sys-devel/mold-1.10.1
+++ b/metadata/md5-cache/sys-devel/mold-1.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=A Modern Linker
 EAPI=8
 HOMEPAGE=https://github.com/rui314/mold
 INHERIT=cmake toolchain-funcs
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3 BSD-2
 RDEPEND=app-arch/zstd:= >=dev-cpp/tbb-2021.7.0-r1:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.10.1.tar.gz -> mold-1.10.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=79c9ab581a0a51cb66383d81b4def837
+_md5_=4ffdacc67a7ce53ae521c996c5d24d0b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index ad67f6812302..42d23d7f3949 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-6.1.2 b/metadata/md5-cache/sys-fs/btrfs-progs-6.1.2
index 267485e9fba8..651987e49f5a 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.1.2
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.1.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://btrfs.wiki.kernel.org https://btrfs.readthedocs.io/en/latest/
 INHERIT=bash-completion-r1 python-single-r1 udev
 IUSE=+convert python +man reiserfs static static-libs udev +zstd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.1.2.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=16fad8b5be40e47999f1a28c58879cf4
+_md5_=9d6eba382e7ffc8120eea6a7fdf253ae
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-131 b/metadata/md5-cache/sys-fs/libeatmydata-131
index fec35b670132..5bfa3bb6a5ca 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-131
+++ b/metadata/md5-cache/sys-fs/libeatmydata-131
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.flamingspork.com/projects/libeatmydata/
 INHERIT=multilib-minimal
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm arm64 ~hppa ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~x86
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stewartsmith/libeatmydata/releases/download/v131/libeatmydata-131.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a4373bf5c5491fe698e1a651517b49bf
+_md5_=99d9872f6f66cbe01dcece09eba61d97
diff --git a/metadata/md5-cache/sys-fs/ubi_reader-0.8.0 b/metadata/md5-cache/sys-fs/ubi_reader-0.8.0
deleted file mode 100644
index 92ebe14bef5c..000000000000
--- a/metadata/md5-cache/sys-fs/ubi_reader-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of Python scripts for extracting data from UBI and UBIFS images
-EAPI=8
-HOMEPAGE=https://github.com/jrspruitt/ubi_reader
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/python-lzo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/jrspruitt/ubi_reader/archive/refs/tags/v0.8.0-master.tar.gz -> ubi_reader-0.8.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0fba6a5334e2d978f242a7ab71775a63
diff --git a/metadata/md5-cache/sys-fs/ubi_reader-0.8.5 b/metadata/md5-cache/sys-fs/ubi_reader-0.8.5-r1
index fe3015a32444..b2937b9dd9e9 100644
--- a/metadata/md5-cache/sys-fs/ubi_reader-0.8.5
+++ b/metadata/md5-cache/sys-fs/ubi_reader-0.8.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of Python scripts for extracting data from UBI and UBIFS images
 EAPI=8
 HOMEPAGE=https://github.com/jrspruitt/ubi_reader
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/python-lzo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/python-lzo[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/jrspruitt/ubi_reader/archive/refs/tags/v0.8.5-master.tar.gz -> ubi_reader-0.8.5.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0fba6a5334e2d978f242a7ab71775a63
+_md5_=585a5651d57e9ae1db4ab398bca6ee90
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-6.1.1 b/metadata/md5-cache/sys-fs/xfsprogs-6.1.1
index 6df6fa6a0f17..9cada467a0c3 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-6.1.1
+++ b/metadata/md5-cache/sys-fs/xfsprogs-6.1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 INHERIT=flag-o-matic systemd usr-ldscript
 IUSE=icu libedit nls selinux split-usr
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) selinux? ( sec-policy/selinux-xfs )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-6.1.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6da995aa9bfabe29588303c2525bfaf9
+_md5_=b72fa12964fbd17883c38198872bb5c1
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b065e77019bc..43f01b4b9a63 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/cryptodev-1.11 b/metadata/md5-cache/sys-kernel/cryptodev-1.11
deleted file mode 100644
index 221e25e80c34..000000000000
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst pretend setup
-DEPEND=virtual/linux-sources kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=device that allows access to Linux kernel cryptographic drivers
-EAPI=7
-HOMEPAGE=http://cryptodev-linux.org/
-INHERIT=linux-info linux-mod
-IUSE=examples dist-kernel
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.11.tar.gz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=196f68d751106c3912e66af73e531658
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.12 b/metadata/md5-cache/sys-kernel/cryptodev-1.12
index 198528dd6018..9e414615b9c5 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.12
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.12
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.12.tar.gz
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4671274b1c6bbc42a6bc339c0077d970
+_md5_=d45604e2758922815ec8f11bd1730801
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-9999 b/metadata/md5-cache/sys-kernel/cryptodev-9999
index a7afe232f91b..82cc55263a67 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-9999
+++ b/metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -12,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a63ac6e762c33048f8484829a3e757ea
+_md5_=d8a43ae3358b995e20d621f1abb47a33
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 12beb8f5b4bd..2c8c561d167c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r2 b/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r2
new file mode 100644
index 000000000000..9ecc9a74882f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=!dev-libs/libdispatch
+DESCRIPTION=BlocksRuntime library needed for clang's -fblocks support
+EAPI=8
+HOMEPAGE=https://github.com/mackyle/blocksruntime
+INHERIT=toolchain-funcs vcs-snapshot
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!dev-libs/libdispatch
+SLOT=0
+SRC_URI=https://github.com/mackyle/blocksruntime/archive/9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81.tar.gz -> blocksruntime-0_pre20171027.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_md5_=34bd05604a40d684f6590c5efd4be050
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index 9bea7191ae6e..fd91beea672c 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f3a74dc36235bcb8a49192085575cfb
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index d89504aa5e06..c7859f4f568a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=53e39020c8d23997da8e61e17fdb8a19
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
index fba8f76276e0..bc7c7d1a7de3 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
index f1b8020a1e19..431f1cc77b30 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f1cfd6265c76cf75d7f4fcca558a9dc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
index 594a1f8af998..87e3930c36d3 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225
index 924642243a14..3db28f953aa0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304
new file mode 100644
index 000000000000..740fe8947b5c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-17.0.0*:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=17
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index a19ffb60a50a..939c2d866a25 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1c1c912e6047d4dbf13b18213c38e789
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index 596469ae9957..a5853393e00c 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=073adf97b984c7834ca31d3d6fe4093c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
index 87402d23ba45..8e6c150c2efe 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
index 867cea3d087e..15daec273ab8 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fce1412d6da5b3de84960351b38788f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
index 99359067f6ff..f74fab93f6b0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225
index 9f41c13e731a..a27f1dc7a863 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304
new file mode 100644
index 000000000000..620b7a6c9162
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-17.0.0*:17 sys-libs/compiler-rt:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm:17 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
+SLOT=17
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.10-r1 b/metadata/md5-cache/sys-libs/freeipmi-1.6.10-r1
index 4a1c50faf0ef..94d7d296f2f7 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.6.10-r1
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.6.10-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/freeipmi/
 INHERIT=autotools toolchain-funcs
 IUSE=debug nagios without-root
-KEYWORDS=~amd64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 hppa ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.6.10.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d1b9cfa880ebd0607746a1fb5548b0e6
+_md5_=83666bd6cf70a73ab724ab8ff415b3e9
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index 24285cb2bf9b..b5734e640554 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ed4b7b665367a12874548fbffbf304e1
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index 1dc6ae304590..ba72a681d699 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f5a8fba7d5d2d43189bfb259f861a89
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index ee457a75f67a..40d7a3a7c6be 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ec12a0f6e108c8b13319626ed8ce9939
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
index 66b44f262bc1..4027b0880b9f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
index 86a2a2c1e469..b36ca99ab08f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3b5d2a89f3ff0de6b78538deede4c459
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
index cc8be62b72f8..4752fe7d70a7 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225
index 040af632c063..050b0b2886fb 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304
new file mode 100644
index 000000000000..81330171fd94
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230304[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:17 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=8
+HOMEPAGE=https://libcxx.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230304[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 4539a1ad9323..af5a90a70c19 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4e54b656411cc807bdd92b2f892aa32f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 89560d4d06c9..d09879f5bd05 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=462e3f649f8df58db11379d6fa9c34ff
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
index c73163b4f1b7..8a1fb42985cd 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
index 0d87bf367dcd..aaa788669fd4 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b954666ca4eb119a11c79056bb84e7da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
index 23ab9b7626ba..266001a2d180 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225
index baa4ed7d3d1a..5ce6f69099ef 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304
new file mode 100644
index 000000000000..ca5336daf2db
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:17 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=8
+HOMEPAGE=https://libcxxabi.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!<sys-libs/libcxx-15
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index d71a66c3d75e..5e6be20ae774 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=55c75cae8b91cb6694cc87a534f0ba90
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r1 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r1
index 3da0e9742145..3867a541b462 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r1
@@ -12,5 +12,5 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5d46a3628fe61d15763191e9e875b952
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
index b92a14f4762e..58fa7a667ee7 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/16
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6a0cdd8c99018970ca3b6ce691a94e76
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
index 7015b9ae2db6..f37cb5a41229 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=daf52c08c30f40588169a0fc723248d1
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
index e6ad649472a1..49b22276f9b2 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6a0cdd8c99018970ca3b6ce691a94e76
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225
index 107d0c11c081..a39549eee02d 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230225
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6a0cdd8c99018970ca3b6ce691a94e76
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
new file mode 100644
index 000000000000..e96a21a5bbde
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=8
+HOMEPAGE=https://openmp.llvm.org
+INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
+IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
+REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/17.0.0_pre20230304
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6a0cdd8c99018970ca3b6ce691a94e76
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index 072fb36faefd..812c089cba89 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=25063be8361a17395740423df3d4e2ff
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index 792f066607b8..25255e35b624 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
index 9307dc852f11..5d9bc1002132 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
index be519f2d19f7..4d2aa604c145 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=18c4e40ac44a141aa1d0f2633a34cd9a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
index c41307791108..532b98ebb442 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225
index 978b39fc0fe6..d708b831a2e2 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	7fc16ff522366c1da2ff13695cb44b72	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304
new file mode 100644
index 000000000000..ab3bc94273a6
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304
@@ -0,0 +1,16 @@
+BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.33 b/metadata/md5-cache/sys-libs/openipmi-2.0.33
index 6f43c10b7aa8..76b21c628223 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.33
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.33
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
 INHERIT=autotools python-single-r1
 IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt sys-libs/gdbm:= sys-libs/ncurses:= sys-libs/readline:= crypt? ( dev-libs/openssl:= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) tcl? ( dev-lang/tcl:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.33.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3dfa3c94d50353c948659e0cca6dbc33
+_md5_=ab581b5b2942ea92cd948106fba8bd5e
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index a6b676234b90..ad454b35abb9 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/atop-2.8.1 b/metadata/md5-cache/sys-process/atop-2.8.1
index e4363f057c01..4d89a5a0364d 100644
--- a/metadata/md5-cache/sys-process/atop-2.8.1
+++ b/metadata/md5-cache/sys-process/atop-2.8.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.atoptool.nl/ https://github.com/Atoptool/atop
 INHERIT=linux-info linux-mod systemd toolchain-funcs
 IUSE=dist-kernel modules
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= >=sys-process/acct-6.6.4-r1 modules? ( sys-libs/zlib ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.8.1.tar.gz -> atop-2.8.1.tar.gz modules? ( https://www.atoptool.nl/download/netatop-3.1.tar.gz )
 _eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=97b1f8bacc3b49ca46fa2e8d0bb72281
+_md5_=346efe585cbfd76a2a7be7893e70c432
diff --git a/metadata/md5-cache/sys-process/numad-0.5_p20180531-r1 b/metadata/md5-cache/sys-process/numad-0.5_p20180531-r1
index 73dadffb33d6..9ca771708982 100644
--- a/metadata/md5-cache/sys-process/numad-0.5_p20180531-r1
+++ b/metadata/md5-cache/sys-process/numad-0.5_p20180531-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The NUMA daemon that manages application locality
 EAPI=8
 HOMEPAGE=http://fedoraproject.org/wiki/Features/numad
 INHERIT=flag-o-matic linux-info systemd toolchain-funcs
-KEYWORDS=~amd64 -arm arm64 ~ppc64 ~s390 x86
+KEYWORDS=~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/numad-0.5_p20180531.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c4e4df7c275fab467ab1a5f200b9b1cc
+_md5_=cecdd13215ce5642d74dd78b5389fc46
diff --git a/metadata/md5-cache/sys-process/psmisc-23.6 b/metadata/md5-cache/sys-process/psmisc-23.6
index dcc3d722557a..0b6bf7016095 100644
--- a/metadata/md5-cache/sys-process/psmisc-23.6
+++ b/metadata/md5-cache/sys-process/psmisc-23.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://psmisc.sourceforge.net/
 INHERIT=toolchain-funcs
 IUSE=apparmor nls selinux test X
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!=app-i18n/man-pages-l10n-4.0.0-r0 >=sys-libs/ncurses-5.7-r7:= apparmor? ( sys-libs/libapparmor ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/psmisc/psmisc-23.6.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=73b1dd15042f1a3d293c83de56339e59
+_md5_=648983ed31a5b288c8105c75ab2f264b
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 718a86d23064..9bcc4f5fce86 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/qutebrowser-2.5.3 b/metadata/md5-cache/www-client/qutebrowser-2.5.3
index 6535080e232c..dc95ab66ccc1 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.5.3
+++ b/metadata/md5-cache/www-client/qutebrowser-2.5.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.5.3/qutebrowser-2.5.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a7dc1d7fb7915c5dd138137bd720119
+_md5_=bbafe14ade158976586728ce753beb35
diff --git a/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999 b/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999
index fff587aef398..0e07c399cd47 100644
--- a/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999
+++ b/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=337fbe9a9ad20a08bcf99c919ca1f53f
+_md5_=761f55bcc345081494254bb5c0c40319
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index 32f276de6196..033de9f5f5e0 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a7dc1d7fb7915c5dd138137bd720119
+_md5_=bbafe14ade158976586728ce753beb35
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 415d6f52e7b2..648e5446ac21 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.6 b/metadata/md5-cache/www-servers/tomcat-10.1.7
index ad46736d3990..a1daad5ed903 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.6
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.7
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.6:10.1.6 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.7:10.1.7 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=10.1
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.6/src/apache-tomcat-10.1.6-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.6/src/apache-tomcat-10.1.6-src.tar.gz.asc )
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.7/src/apache-tomcat-10.1.7-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.7/src/apache-tomcat-10.1.7-src.tar.gz.asc )
 _eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=a6323620fd2fae84898b0e4d6499085d
+_md5_=4715795a1d8c909468fb9b1a1abcce2b
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.86 b/metadata/md5-cache/www-servers/tomcat-8.5.87
index 3af1e89e96cf..19b763e3e033 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.86
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.87
@@ -1,4 +1,4 @@
-BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.86:8.5.86 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.87:8.5.87 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.86/src/apache-tomcat-8.5.86-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.86/src/apache-tomcat-8.5.86-src.tar.gz.asc )
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.87/src/apache-tomcat-8.5.87-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.87/src/apache-tomcat-8.5.87-src.tar.gz.asc )
 _eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=cad7d9471948cec23e24ac2b264cf819
+_md5_=a0bf378037d796d2ac9e271322d4c57b
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.73 b/metadata/md5-cache/www-servers/tomcat-9.0.73
index 3b524287c0f6..484df39f8efa 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.73
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.73
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.73/src/apache-tomcat-9.0.73-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.73/src/apache-tomcat-9.0.73-src.tar.gz.asc )
 _eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=417ec283f824a6780b311aa870c07eba
+_md5_=6405cb34f29b28defc3e52fbefac6c60
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index a24a02edc193..8e9071390c88 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/beforelight-1.0.6 b/metadata/md5-cache/x11-apps/beforelight-1.0.6
index 8bf4c0776d56..9dc1d6899196 100644
--- a/metadata/md5-cache/x11-apps/beforelight-1.0.6
+++ b/metadata/md5-cache/x11-apps/beforelight-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=Sample implementation of screen saver
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/beforelight
 INHERIT=xorg-3
-KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXt x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/beforelight-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=86f6d6081ba1261e3e227b76c0261eff
+_md5_=a11392e2d8fcbfd4cacb971e3b14a9da
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.7 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.7
index 3a185f6e32dd..69e0769028e1 100644
--- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.7
+++ b/metadata/md5-cache/x11-apps/xdriinfo-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=query configuration information of DRI drivers
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdriinfo
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 virtual/opengl
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdriinfo-1.0.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=a9c8711d5382b48588907a57330f162f
+_md5_=abbb311d6c6b239777f14c223bca8141
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.4 b/metadata/md5-cache/x11-apps/xvidtune-1.0.4
index eb1cc782ba2b..bf12c22bdd61 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.4
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=video mode tuner for Xorg
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xvidtune
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xvidtune-1.0.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=141cb84c2ab52f4d6f715a15d922204f
+_md5_=742ff0cf9c4e61cccde1a5982b1b9878
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 079b2597a0ed..6b91fd232339 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-apps-1 b/metadata/md5-cache/x11-base/xorg-apps-1
deleted file mode 100644
index c03b8e395857..000000000000
--- a/metadata/md5-cache/x11-base/xorg-apps-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=X11 Applications (meta package)
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
-LICENSE=metapackage
-RDEPEND=x11-apps/appres x11-apps/bdftopcf x11-apps/beforelight x11-apps/bitmap x11-apps/editres x11-apps/fonttosfnt x11-apps/fslsfonts x11-apps/fstobdf x11-apps/iceauth x11-apps/ico x11-apps/listres x11-apps/luit x11-apps/mkfontscale x11-apps/oclock x11-apps/rgb x11-apps/rstart x11-apps/scripts x11-apps/sessreg x11-apps/setxkbmap x11-apps/showfont x11-apps/smproxy x11-apps/transset x11-apps/viewres x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xbiff x11-apps/xcalc x11-apps/xclipboard x11-apps/xclock x11-apps/xcmsdb x11-apps/xconsole x11-apps/xcursorgen x11-apps/xdbedizzy x11-apps/xditview x11-apps/xdm x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xedit x11-apps/xev x11-apps/xeyes x11-apps/xf86dga x11-apps/xfd x11-apps/xfontsel x11-apps/xgamma x11-apps/xgc x11-apps/xhost x11-apps/xinit x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbprint x11-apps/xkbutils x11-apps/xkill x11-apps/xload x11-apps/xlogo x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xlsfonts x11-apps/xmag x11-apps/xman x11-apps/xmessage x11-apps/xmodmap x11-apps/xmore x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xrestop x11-apps/xset x11-apps/xsetroot x11-apps/xsm x11-apps/xstdcmap x11-apps/xvidtune x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud
-SLOT=0
-_md5_=a2679c108a87661cdb074345377afd13
diff --git a/metadata/md5-cache/x11-base/xorg-apps-2 b/metadata/md5-cache/x11-base/xorg-apps-2
new file mode 100644
index 000000000000..5899aae180b8
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-apps-2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=X11 Applications (meta package)
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
+LICENSE=metapackage
+RDEPEND=x11-apps/appres x11-apps/bdftopcf x11-apps/beforelight x11-apps/bitmap x11-apps/editres x11-apps/fonttosfnt x11-apps/fslsfonts x11-apps/fstobdf x11-apps/iceauth x11-apps/ico x11-apps/listres x11-apps/luit x11-apps/mkfontscale x11-apps/oclock x11-apps/rgb x11-apps/rstart x11-apps/scripts x11-apps/sessreg x11-apps/setxkbmap x11-apps/showfont x11-apps/smproxy x11-apps/transset x11-apps/viewres x11-apps/x11perf x11-apps/xauth x11-apps/xbacklight x11-apps/xbiff x11-apps/xcalc x11-apps/xclipboard x11-apps/xclock x11-apps/xcmsdb x11-apps/xconsole x11-apps/xcursorgen x11-apps/xditview x11-apps/xdm x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xedit x11-apps/xev x11-apps/xeyes x11-apps/xfd x11-apps/xfontsel x11-apps/xgamma x11-apps/xgc x11-apps/xhost x11-apps/xinit x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbprint x11-apps/xkbutils x11-apps/xkill x11-apps/xload x11-apps/xlogo x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xlsfonts x11-apps/xmag x11-apps/xman x11-apps/xmessage x11-apps/xmodmap x11-apps/xmore x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xrestop x11-apps/xset x11-apps/xsetroot x11-apps/xsm x11-apps/xstdcmap x11-apps/xvidtune x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud
+SLOT=0
+_md5_=bacacd8cea92195b25506e137b8f56be
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 15be053b4664..5249c4daa45c 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/xf86-video-amdgpu-23.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-23.0.0
index 57b9c64011b5..645cddaabc32 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-23.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-23.0.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
 INHERIT=xorg-3
 IUSE=udev
-KEYWORDS=~amd64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=62aabd2bbf5ac44834cc379d1dd5ce01
+_md5_=a68571a92c6953204df992a4e42c92e1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
index 60ea8939fc00..79c93faaacde 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=62aabd2bbf5ac44834cc379d1dd5ce01
+_md5_=78e469e4b2a2d8d7c6357532982f66af
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0-r1
index ec2ae958dd08..9de75319383e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ati/
 INHERIT=linux-info xorg-3
 IUSE=udev
-KEYWORDS=~alpha amd64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-19.1.0.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=3bb01dfb2c172637bf9d62a99af532b8
+_md5_=97b5177b3451f14b2b8cd3d9cd650e20
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999 b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
index fa01b65c8239..6dac18520638 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=e1b953385747aa06524f24e305885182
+_md5_=85ebd159d43b5af7afd2b79b9c958e0d
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index f5599c4640a2..453669b15a34 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/cairo-1.17.6-r1 b/metadata/md5-cache/x11-libs/cairo-1.17.6-r1
index 369f2e0d47a2..99ce0f412a02 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.17.6-r1
+++ b/metadata/md5-cache/x11-libs/cairo-1.17.6-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
 INHERIT=meson-multilib
 IUSE=X aqua debug +glib gtk-doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[png,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] debug? ( sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/cairo/cairo/-/archive/1.17.6/cairo-1.17.6.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=692ad0aebf48045bdb2cea4b22fdea4c
+_md5_=644e6195b9ca5b6927759dba002fff68
diff --git a/metadata/md5-cache/x11-libs/libX11-1.8.4 b/metadata/md5-cache/x11-libs/libX11-1.8.4
index 4359c032ebd0..9789ffef4617 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.8.4
+++ b/metadata/md5-cache/x11-libs/libX11-1.8.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
 INHERIT=toolchain-funcs xorg-3
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables !<xfce-base/xfce4-settings-4.16.3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=12e245b07dcf749e4a86b22c2acaf5a7
+_md5_=9f8d837a62ad3bff406c2e5a646ba2e4
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.115 b/metadata/md5-cache/x11-libs/libdrm-2.4.115
index c38e2af21470..bb4744183fd6 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.115
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.115
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 INHERIT=python-any-r1 meson-multilib
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.115.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d8259b44d9e98cf9cbfbd400fadccca5
+_md5_=17a0aa6b948a338afb35d37708091222
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.5.0 b/metadata/md5-cache/x11-libs/libxkbcommon-1.5.0
index bfaf95e5f059..35e6a6c13f87 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.5.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-1.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
 INHERIT=meson-multilib python-any-r1 virtualx
 IUSE=doc static-libs test tools wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables x11-misc/xkeyboard-config
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.5.0.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=6ed73e36f209b1c6fc2c97b5d55a4b5a
+_md5_=43bbc61477780f705bfd5c0c7e6549fd
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b92f04b008f4..c430c0aa5102 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.8.4 b/metadata/md5-cache/x11-misc/compose-tables-1.8.4
index 449a0edf4be6..d1b10dfd84b4 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.8.4
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.8.4
@@ -5,9 +5,9 @@ DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=79fe97e60a6c2454cf2239cd9aea8874
+_md5_=60104851e6e3d9523dbbddf7ec70db4d
diff --git a/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109 b/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109
index 900c5162228b..43323ae6812e 100644
--- a/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109
+++ b/metadata/md5-cache/x11-misc/screenkey-1.5_p20230109
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/screenkey/screenkey/-/archive/7bdba66574244061c6e1934c4f204d02d570f182/screenkey-7bdba66574244061c6e1934c4f204d02d570f182.tar.bz2 -> screenkey-1.5_p20230109.tar.bz2
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e71921e41ecead1923d1457a206d645c
+_md5_=5880ad8d1d487115926659f599893f95
diff --git a/metadata/md5-cache/x11-misc/sunflower-0.5-r2 b/metadata/md5-cache/x11-misc/sunflower-0.5-r2
new file mode 100644
index 000000000000..db7a004c1fdc
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/sunflower-0.5-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Small and highly customizable twin-panel file manager with plugin-support
+EAPI=8
+HOMEPAGE=https://github.com/MeanEYE/Sunflower https://sunflower-fm.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=distutils-r1 xdg
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/vte python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/MeanEYE/Sunflower/archive/refs/tags/0.5-63.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=46ed9b9a27ec5038cdb3f6db5d8543aa
diff --git a/metadata/md5-cache/x11-misc/trayer-1.0-r5 b/metadata/md5-cache/x11-misc/trayer-1.0-r5
index b5f9941a0841..6f327c17c45a 100644
--- a/metadata/md5-cache/x11-misc/trayer-1.0-r5
+++ b/metadata/md5-cache/x11-misc/trayer-1.0-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight GTK+ based systray for UNIX desktop
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/fvwm-crystal/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/fvwm-crystal/files/trayer/1.0/trayer-1.0.tar.gz/download -> trayer-1.0-sourceforge.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=789718730f506a7ebc500572ecc5bcb2
+_md5_=39d7c9aaa4d3c679873c04f942fcd2a3
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.20.0 b/metadata/md5-cache/x11-misc/util-macros-1.20.0
index 00310b7d2d18..2e7bb8740060 100644
--- a/metadata/md5-cache/x11-misc/util-macros-1.20.0
+++ b/metadata/md5-cache/x11-misc/util-macros-1.20.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile
 DESCRIPTION=X.Org autotools utility macros
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.20.0.tar.xz
-_md5_=68f8471b1a21fb6bd4c6ac69e460048d
+_md5_=c64b8937adb5052fd156ff7f0a8d4432
diff --git a/metadata/md5-cache/x11-misc/xdaliclock-2.47 b/metadata/md5-cache/x11-misc/xdaliclock-2.47
index 45b4a3cc0803..4db95364bb64 100644
--- a/metadata/md5-cache/x11-misc/xdaliclock-2.47
+++ b/metadata/md5-cache/x11-misc/xdaliclock-2.47
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.jwz.org/xdaliclock
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils xdg
-KEYWORDS=~amd64 ~ppc ppc64 x86
+KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 virtual/opengl
 SLOT=0
 SRC_URI=https://www.jwz.org/xdaliclock/xdaliclock-2.47.tar.gz
 _eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=884b08d57a636d1dfd20e49162cf5c52
+_md5_=b763c1bb5e4e25a10c6fb33192cf6bf8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index a7a4387a8514..96a751a44521 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/page-1.9.10-r1 b/metadata/md5-cache/x11-wm/page-1.9.10-r1
new file mode 100644
index 000000000000..e67bdca4b4b7
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/page-1.9.10-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=>=x11-libs/libxcb-1.11 >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2 >=x11-base/xcb-proto-1.12-r2 x11-base/xorg-proto
+DESCRIPTION=A mouse friendly tiling window manager
+EAPI=8
+HOMEPAGE=https://github.com/gschwind/page
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/libxcb-1.11 >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfixes-5.0.3 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXrandr-1.5.1 >=x11-libs/libXcomposite-0.4.4-r1 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXext-1.3.3 >=x11-libs/cairo-1.14.6[X] >=x11-libs/pango-1.40.5 >=dev-libs/glib-2.50.3-r1:2
+SLOT=0
+SRC_URI=https://github.com/gschwind/page/releases/download/1.9.10/page-1.9.10.tar.gz
+_md5_=4ca7666b53df12b5421b615f0fce474c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d0beefb96579..f490830a4ecd 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-03-04T10:39:50Z
+TIMESTAMP 2023-03-05T23:09:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQDH/dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQFITlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDE8Q/+JJjtM401MWc69WEprix6DEKzMy9dvFBQ0AACj3qIkwDa+6u3cYXpnMHa
-R3jpMjgQfe5I4E4W+H5pc3x+JOS3BhpnkB46FA+JmpPVSZTHx6z+KuxH1f+xWeoI
-vS7Y9v2Pdsg+v9Wb84NAir8KRR9oK//ydKxn7EKINMqB/oV6IkEyEkrODtinbHFA
-N0Lt7RnZYrZgNQr9gglR9zuaJLl8/UyBfxPh8TIJFBXSwc3lIvpSEKheg/HwQFG1
-PiNuSemFQboCzViQGgkXn7B5v8OImTIJN3N4uEuhyegBHIr43FFYZ3X6kufVX1Cp
-ymr4skNuXzQjaM4zv+QYxa5dEl1uSSOdMazrxGyf2cBAfzUzD8tk1+FNBlfQBdpg
-hSWqQjhidMPM8DJ0H5ywmuXlS+5oAsHni/7kCZsUD6Y7T+iBd/TgYK+mKxADfws8
-gOAkWNSOKtsdyZ3UC2ydCuXXBnbQAtiRKhCw9SjR5cdakxZsIGI7FooLNDb99ZHN
-EwbdyLz4QFTFabFi1l64pjDuiqtjB1y9aSOr6vViet5EiNW9tEGAwuzv2Z5yG5vj
-yPEOv6l1qFq4Fd07lqv/OTmQnweMSNMw0QjxfSD31spgIhpHDr1T9aZEHXnWs4Rh
-IWgxGut6QPUqYabIH5y03bOpImM3+QWjmqNIp5kZNHOhOGDfo7A=
-=CcVG
+klCnYA/9GPND1qFVi6C1yTN1y9+mEEZttKLQRXUWWcmuretjlI5TJsilI18aDgaF
+UaKtIBDTsEDnJzsn2xPWY5Fna1iSH2/QTrh/B3b8/71bhgEcoJlFrWkz5traYXTJ
+8QVzTQ+3JoUSdSPtaDIpMYgKOVLU40ZzdOrRL8+9dobUgHFXI2UxHAJKRByBiZUg
+9ntkOu57xu3pw4ulubYC70rVidDCH0MJPA0taLWpW3h6UMHTYphXeFuGocZ7Q3F6
+Fqvk3mLu63QkrNpzXFwp9I8QGzih94bZ2Sg0l+Bup2pjdhejisiYklfQXfAdMBzj
+RHT1Cvsw37Mm+Qj4lpfJpsQqJRqleDFSx6mwgkfxH9IyUelPV/FPrhUtNAAZUtMN
+2VZsguPY6AIJvpzJ4N353EqikN6q0M0rZiIXlFIVLcjdFuntUdqJ2rowemaDvgL3
+sIgNfrSF1X+qtDs2EW6FZGIF5VtKDaXuxuPasC36II94NghiPRGkdJ0UTB5ls7Bt
+5+Fpk3G0CbVwcoh5fKfbi/JQigKT/aLKA7EUSnKlcNFZ6Ffs+Loir16fMPtRHm/Q
+nuT8MpMODQP08cPLec4AjJITnUULA82zi9cAQcZYffdV38Vvo6rz+Kh78nRsi/ZY
+UBTqXxcOunSdudYp7qEn+uh92RMUDwGFf9Kop9i6a701paq3Joc=
+=vy32
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ed4c6fd7a205..3b95588421f1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Mar 2023 10:39:47 +0000
+Sun, 05 Mar 2023 23:09:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3e064d4b4cd4..bcde886f7762 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Mar  4 10:39:47 AM UTC 2023
+Sun Mar  5 11:09:42 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d0fdd3cc218e..2eeffa1c2d7a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Mar 2023 10:45:01 +0000
+Sun, 05 Mar 2023 23:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f36d60e224c4..bdc70716b9f2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-68d1a76055f00aad512e03550886aa93848d74fa 1677925484 2023-03-04T10:24:44+00:00
+8c937bf9f251dd9c477143b4e6604c0f41976d3b 1678056738 2023-03-05T22:52:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 859f6e76127b..8e67cf5d0f66 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1677926401 Sat 04 Mar 2023 10:40:01 AM UTC
+1678057801 Sun 05 Mar 2023 11:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ed4c6fd7a205..3b95588421f1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 04 Mar 2023 10:39:47 +0000
+Sun, 05 Mar 2023 23:09:42 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a76ccf05532d..f77e1d5de39d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 103606d431f2..0dfc9aedc339 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -8,5 +8,5 @@ AUX argus-clients-3.0.8.4-autoconf-2.70.patch 1991 BLAKE2B a427573acefd042e7a1b4
 DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
 DIST argus-clients-3.0.8.4.tar.gz 2773840 BLAKE2B 0b5a24bc6a5c3163a0ac19a3a354e6573491e130c4b854bc4c9b19e6dfa1d27acea8338a88e589043b839994182756b04e205d9ef6815b2f7dc347fb51405c88 SHA512 5b6a03528c31b534d56370b4b8189d223691bb0d8f465349e7850bf54b4663e9851bddb54060a8bc263be3b80f4eab829413a7ff4da312e6640e2f7191d65473
 EBUILD argus-clients-3.0.8.3.ebuild 1515 BLAKE2B 0f57ac0135c8f41a205a91f4f58c7eeea3fc08fd6458b456716f24ad1c9673e00cb222f182115a7c67f47dd4becd114c48140dea4c604aee9399d8216f27835c SHA512 94cd545aca182702e25b29774bbb7cd191a96e709ad882a8434a2b09b482496d7865938c82006f6473a27b2c3771a5816868c1e58d3c112ca32ab9103e8b6d5d
-EBUILD argus-clients-3.0.8.4.ebuild 1658 BLAKE2B 916842aeaa556eef40ee585c9a7198af04fe4918e8b634d376474f448552100655a9a26a74ebd4c97c609949a49982f20d2e6c3477f8bf51a534d59d7e7468b5 SHA512 6eef5f6a647ac8db3a3ed17f454eb5f22ac6e2756a5c204a25b45da5c9ca184b0af8aa458191da5a747a4416c4ce756b11a64e1e43e476ffbe80537bdaedb57b
+EBUILD argus-clients-3.0.8.4.ebuild 1657 BLAKE2B e3f042cced512acba61c2a4027ea8d79d425e7555535291441463013686d14e0d11c46280dfdea1e53af48b254b4aaad2ff39984817dbe958f705a51cdba6c3b SHA512 10137a423818e3f0986a21f4b8053350ec262b2f57e16d0c1407adf099bfaf9b73fd33527c8cde489d59308aaaa82941596cdeead70aeaa892729743d3372e07
 MISC metadata.xml 478 BLAKE2B cf272a8304aac515a3d31880a655e5d3425df1977666466f9589981d0b4add05f5a7b263a39ab2d1eb3b7099e07db0e0a518088e709521c52dde4ad45d8cd21c SHA512 bc5f2c51bbddbdbab7e4737e699c9f71ba43f342a164726bbde48f31de83ef124d8b303491a2bf4f440b58e7a2fbcbca1f6ff2b3d0c2fcef9f48d5033585d727
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild
index f4ffe2e22591..a0548b6dcfdb 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/clients-${PV}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug ft geoip mysql sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 87ca0b7e0fa4..dff7c8ca1faf 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -21,6 +21,6 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
 EBUILD net-snmp-5.9.3-r1.ebuild 6255 BLAKE2B 8b30492799dfec7f7e44e2ce22d3fc8ae7dd67801933b4d2fd2f705a45e49d6ddb7913f85a3a9656ee60ff8a28decb7b7355d9262d61d7754e70657b6905465f SHA512 52f33d593d218eefc821d7a701a7ee1b833874b82e2f54de86c57cff0704fb772f53371dfbbb0a77e7aef453c125a4553d6e069db1c810eebd86a80251d14141
-EBUILD net-snmp-5.9.3-r2.ebuild 6353 BLAKE2B 9077aba264e1dc10e545ff4ad6499fda707cc4442cba03940193bafaa767cbbf41e37abf5184919de891ef6dca70564d2042340ec1448f65adbbb22579c5317d SHA512 ed2dbd5ffcb7bc58f1f3ffbb5f22d49e155e2b796defc82879313093c2e4e83efc1f94f0bc69455a3f45926cfacdaf7754bb522f5f76f8172aa0d38bad45345d
+EBUILD net-snmp-5.9.3-r2.ebuild 6351 BLAKE2B d5c8b865893da3ee1701ba16081c8fd5eef557ddf51b8cf6d22d471525726b4401c30423c219c65ce644564bac5ebf8db003aaa763ebbf3c39e03ba22c8e9c2b SHA512 a4c94828317db92fd55bab71c0ab3d9a72527f68eeaa42ed8ca705a25ddf75269e1ed5ea3c21731daac355fc07b356ee0b9c106251604e6b7bd4097346a53336
 EBUILD net-snmp-9999.ebuild 6358 BLAKE2B f4fdf2b5a29eedb660d79664f44b12c5cf7e63ef9a04a127f4e5929e90d447e7d4c503f84ac0395feca10ee1ae61b5367e7141715067873b8fea5846372f0c35 SHA512 26e49c91f50f97958108c821f9ebd26a31d3274710541fb156772ed55b5f1aef476319ac0f703f2a8e693d13ddd53e40e5c3bb920066cb2c9a175359193afb3c
 MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
index d81066db176c..0b561f21a70f 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
@@ -20,7 +20,7 @@ else
 	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 989a20d487e8..08e7804a6edd 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -2,5 +2,5 @@ AUX scapy-2.5.0-no-install-tests.patch 339 BLAKE2B 0702c8c40d3358dd1e05eeb98ebf9
 DIST scapy-2.4.5.tar.gz 3323309 BLAKE2B af94b3ec6324c4544aca25f63bcca8aa60a3b1cbbf132d3ed07b5bc73b95e4298bf250e65157bdb7851226fd0ac039367892a9a14d844e5815832ad4ab556819 SHA512 b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
 DIST scapy-2.5.0.tar.gz 6082895 BLAKE2B 2673de913d46532760dce93914916b909a4706d846e1e699c16f35b738cac8a073e23b194f9ed4647ade41170a04849ebd33ab3d0ba5b7f09fea8fa527e14c5d SHA512 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a
 EBUILD scapy-2.4.5.ebuild 1093 BLAKE2B 089fb2b7a0d01930e115173cf767f8db013152c28fc5d8474726ac339c087044fcf1cc65518b64cc7e3f60ea1c0722f9ce14324b54afdaada5bdfc6feb361bb0 SHA512 fd644a3e9b5f133424aa10a45df4e77b5b8cdeb8d18a04c16aefbd1eb0933707f81be6890f877764040f58b88e068a3976bfc9ae8a7f289c79a34db482a82eb2
-EBUILD scapy-2.5.0.ebuild 1757 BLAKE2B f5b0d728b1c4302c25e0cdc976a4d8d274af57677ca6c5d04871663f4fef0e7602ba0841de59b2c2ebc68cef025b565e754a7044e7c3d79c17ab57518a268181 SHA512 6afa5a5377e9f2bfc108ad0f543e0aa68a66a7b19315066b1cab27f7efcc779b77264ccdf381d9e435046881886746aa175226a5b63d50de571654ceaaaabeef
+EBUILD scapy-2.5.0.ebuild 1755 BLAKE2B c25d5d50909b478bd00905d4da8147b12a2bd5203c5b616372a271c703ad7a9dfaf700a1d2381765679d8c8a63f9a1384e837186b81373754c6ad02534d8e986 SHA512 438a3a69def310f21a266d35aaa9cbbc4e51faa4fc0b5af699bfab43104437abc42fa6ed5463c64045322ba29fbc58b9ab96a9cca22d6ff36ed4fbf974074b1b
 MISC metadata.xml 494 BLAKE2B bb5ea4ee5cdbc940e503d4f8eb8e54185bb9bb7f1160810d4448f275a072cef31d7e3c1cfe167ef84b180a7b9a2c6b3babe8c767831fe97954381dbd38bf090b SHA512 74ec713bccc253ec16dd0178e04275a456df12ff485cbde8323b8b05ff96679ca747334441bf621d0762dd1a235f5cdcb07e4207c30d25a909d8ffefd1f29852
diff --git a/net-analyzer/scapy/scapy-2.5.0.ebuild b/net-analyzer/scapy/scapy-2.5.0.ebuild
index e9f675f6bbff..3a385c66fe57 100644
--- a/net-analyzer/scapy/scapy-2.5.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index c474439312e3..e43f309086c7 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,5 +1,5 @@
 DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3
 DIST traceroute-2.1.1.tar.gz 73063 BLAKE2B 89a828f7a0fec30ece599ee7fdd13fd93db0668f6c9f930f1d6d7d94140bcfdf0c75d2d8c5cc52d699e5c4377239f1a4123ad73a98b619968955d029d0842d9f SHA512 f3358e57ffb4a8dc40650e941da879c60407414e44f9887ae65820d1089491dbfac579bd06c1df296738af89a6c61c1e7944ae4495464f8c9ae21afb19b8f296
 EBUILD traceroute-2.1.0-r2.ebuild 857 BLAKE2B 9a19183cbc97b945ae53531ec5e60e38b88f85b63342427384b6d8e62c6d07bb06bd043468d6242ebe614ec810083d347287d8a772f3180a6d1ec7f7f097494e SHA512 17091ce57449fd0e11bbebc4b8f458bc7b5d77a142d89578ef35821eaab0e7433b54e068c0fa74475d1bcbd7675fd4f00395f25b26d982d27479a7cff8b6dc80
-EBUILD traceroute-2.1.1.ebuild 859 BLAKE2B 98c1f032a2a34ebd41a760c48876d03dcf548bad4abab5abad9618df8f8756c0d09a8369183af9b242b9c819ba7d6c2ac1912fc4550d7d91010cf935599832f5 SHA512 7531f31a46f7e405cbbacc773b80d43e60fc2a06aae2eddde15f6350f701af96174b7d7ed1f1444c756318f985c9b41234267ca180efa633b4d481fb90225e5c
+EBUILD traceroute-2.1.1.ebuild 857 BLAKE2B e953d4fe8760e8d2aea40f27efefc2e0a67089dfe88c497918cd2fe118427201429e764c4235324e4b6af95d69e4c4e3b077f2af65c5080b0db62a2dd27bd97d SHA512 7f010cbdbc01bd02b55ad27d6a183815f0eefe928a47e8bb95d1bc9fee1f33924baa8de033d837b77ecb01f084d4327b27749212edb7c6f6e1a46352b7113b0a
 MISC metadata.xml 361 BLAKE2B b60204801c379608dfce0a04007e5cee10344c9088df0ca272b2a28ed8ccbdf7b262239667282bd534a8b1e4faa01dc19e9336277fc1aef266a0898fc684357e SHA512 56dc2934532a25edd164a98ac97808388e828b824456e800809c7e2ea45c007d622d0c12366d30acfeb40ead802b287449673d6283330007e4513721e3759263
diff --git a/net-analyzer/traceroute/traceroute-2.1.1.ebuild b/net-analyzer/traceroute/traceroute-2.1.1.ebuild
index 2c25d9b12a2c..328a9946483f 100644
--- a/net-analyzer/traceroute/traceroute-2.1.1.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!net-misc/iputils[traceroute6(-)]"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 34e551f804e5..cc468fc92d61 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 64e38f20d1d0..7814c85fb86b 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -2,6 +2,6 @@ DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfa
 DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44eadc1d86a0a0cf7126f615a929fa95fa27a63db3a5bcbff2af6aebc74a734ed5abcdfd38c9488ca89ebeb536875a SHA512 521a021456b6daf260fead75efc298dd964ff00947fd95fadb3c13d52f4c07fb61b74861601d22722e8d546dca284524fd4d770cc5cf347d9659b6df9654ed95
 DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
 EBUILD bind-tools-9.16.33-r1.ebuild 3981 BLAKE2B b4f0d7145d60a8259efd98cec7ef7ad23bcd9cdd69e47bb8853c6b5044ba76d6f85ae61b544ce418a0e6f2be2a15b4849df45422aa948ed29c8e44334619c1d3 SHA512 f553f33fbff4c2a93791122799cc7d499645a6580a28c070a229b997888781b8e1baf7aa06f8263949151e73d89d04c88a08dcc5155b2f98a9b5e7d105e48f7c
-EBUILD bind-tools-9.16.36-r1.ebuild 3983 BLAKE2B 08d8868998c93dad4267d3e63f03b6a03dedbac461994b2625ab9dafcdf82e6ef8e63a4caa418c850b28c92686417397a15b19cdb3c06bb2d8adfec323b0ee95 SHA512 21ac1730a22f8213c012d2a00881384d50e5745d3fe66edb4a74b341dd82e56ce9f525bbfabd35a44cbdbed3ede7c1b5ec87d91b986f04527d23825910b7a3ce
+EBUILD bind-tools-9.16.36-r1.ebuild 3982 BLAKE2B de4e52e01822bedf4ad43609fa327ce0e353ee4b4af71a43df3d2ecbba2fe654ab95a474ec18e76986f7af457eb9f47b79e09042fd46ea369445191682b86759 SHA512 ee123755fc9ca1fc8ad4da3e1603f238c6eafc36d0abf7934434521dcffb178a17dbe0381093123d6733933990aa11bc528199b6be80c9ac1de6e1e8c920163b
 EBUILD bind-tools-9.16.37-r1.ebuild 3982 BLAKE2B 252006f01db2b3b6334f7c867ebdbe8b13e8b029cfa4a92dd1a9875cf889473eca9f1e0da7089634c52626f82fed7fb2bba191d7c19f15e7278a78b8ab5ff556 SHA512 d591ae5a99e5f84398ebfe79bdabcf3f985c2cf90b86c286a8fa6f99516f0194ac0dd1f7a67754d1910b0aeb9f3332daf14d504d3cda1d34729419bae9b7cdec
 MISC metadata.xml 316 BLAKE2B d3d5b29fadc8120581e31e73a19d580b6648056b96f24e6a17710a010143e18c473397b7ab1e37a0e4286502e828ca7def0a588fb2cc9e55b53d08abd6ba89d2 SHA512 ea847ab00b8d94429509aa83bc00daaae1403c16785d60eeb6c1d3e8e731ce9761ede3206b7e6bfc92a33b07ebdb107622f6511dd6bae994a65dfacc666a70f3
diff --git a/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild b/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild
index 632173751156..9b1613129d66 100644
--- a/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 5c67980837a6..8a2beba2c66a 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,6 +13,6 @@ DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44ead
 DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.33.ebuild 11173 BLAKE2B 0b6f58ae69c6e9d4a318b38e6a1d0b5ccc61e081270db96e1e81d0055f1eef4f5d56c20895547c51b766238c422d73991a55ca4961bf945b30d2a4e22a95fd43 SHA512 7e75d079efcd77357be11b584a0d77dcb3ff8b4718427f4203222631d239f05f3ebceb093ec45260a358b571094f83dc89cc5de33ad60024bf924e3ec051d23f
-EBUILD bind-9.16.36.ebuild 11176 BLAKE2B 59b1ab32fe4104e2c6169dea50185c8b0c12c29a54cc1c6c0687df9179b0868fdb393c73c48f2fe75b70766478490c0acbbc487df45324f3dc98a8227a7faf23 SHA512 a2bab0dfc57c1570c2e5f487a308e66b643f8bf3969eb2250db8920b4911b877d4afe541b18add08e70b5accaa2f6730a9d976cdb8308330a82fa791bb998a35
+EBUILD bind-9.16.36.ebuild 11175 BLAKE2B 11591ed657b53550bd287362df60f164c5d7f78f78b354a3a238d980dbb022e9775e31739d1b25fec336b77a22c4d98af322183f16a57a70b9200ea554744f6c SHA512 e060d3b37670ea2a756e3f0994966c44be631dd3f82cdfb7585d04725ad993a854e462acbc569fed1182e645a4f0b5167b4ea51e52db20719d9fae401a396979
 EBUILD bind-9.16.37.ebuild 11174 BLAKE2B ecdacbc64350c98769d165723ada8100a08365cce2213f79b89a8981c26293601b2df76c84451a2ecea58499ac1d14e7c46925a6b1392a2f3e9faccbd16a56d0 SHA512 50a5a78e902ec9bc37f4373ebcacd233cf112962af6ad6d9199f91bd833138dcc93552d99bb800f3d3d71631c1824f68def71f5a631ff986c1eec6068ff7a14d
 MISC metadata.xml 866 BLAKE2B 672d411e2fef8ac9003d975fff049d1c17da75984efccc30bd98812a4b3e1be74ebf408f6c650813deff5f326a9858dca3755383e9573059f3c8b5c290497fcf SHA512 fd16dda7b0f54faeec5429a8763fb9075da4eb8c358c88891e388b3e3c76e062e7f585cf0134b99648cfcbae07da7b786c3c16920aed329864ba2cf7c29d93c8
diff --git a/net-dns/bind/bind-9.16.36.ebuild b/net-dns/bind/bind-9.16.36.ebuild
index 8912bdea6ddb..559d2e6e3c38 100644
--- a/net-dns/bind/bind-9.16.36.ebuild
+++ b/net-dns/bind/bind-9.16.36.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug #602682
 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib"
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index e9ea6ed6e9bb..675cb0a1c7d4 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -2,5 +2,5 @@ DIST c-ares-1.18.1.tar.gz 1560165 BLAKE2B c03a572726c6bbb24a3e4773673d0c87f4833b
 DIST c-ares-1.19.0.tar.gz 1572210 BLAKE2B d77be535dfa852bf3d91258ddf06b3c63a40123883adb83a4e5652d4b1b16801ddefefad70d83a7d6d9aa81c9c81956fef42bc778d7380d6b398ccfc9f8b82dc SHA512 a7f5988bef393afec08a225be92f6eee54a3e67170fb26cbe00dcc5c5a457b27037bbcfeccc39fb855ed72f100196958d6cbbe251bf1ccfbdd353be18f098359
 DIST c-ares-1.19.0.tar.gz.asc 488 BLAKE2B 1b8dc3ad7b916cb5ea1c95ffd12315d303f78880416836d11d2fa7d8ca93fa1ca30898e6a865af79a35e5dc4d0f4fccfcc9eae6f028d456d38ede9fe8b7edd71 SHA512 814aad5dbe2bb987035b53d977e03a73a90356200f671f36949a77e978cf8311ccc8375e63ade6fe2e1380f1f9c3b34c1ba7d48365fd5689cf5c24425ab8a129
 EBUILD c-ares-1.18.1.ebuild 1669 BLAKE2B 26aa13dc454664ee1c0371f2f9d9d9a7d87966e47b036e0f5dab4325e476ac14b66bb857a717d2372fd7a0be5f3cd0b34389c5b6a99043715afc060cc721c23a SHA512 13cd23a060f90ec5620aa0de89629bb3235913485012408cb17273b24aa0713a5b619dd1e9b40cb54d6f40ee417c96ec0a5fb58cf041ce39d6448bd2ee58e0a5
-EBUILD c-ares-1.19.0.ebuild 1909 BLAKE2B b3df8634bfcdd3f133e097a2e84635351a675c0307964bdad32e96d30bcf13b97f07fa0e565662725f9538e2e4b356084cffa42983e8cf5fd9d204b06398073e SHA512 4ab1a4a5e001b49d395c57ec05df7ee26d79ce1bd898ebc6b28bf9045dd8a505f70b67acc715603220ce31db3389dae77e51ff40e6add7a5b978d7af5195c4ba
+EBUILD c-ares-1.19.0.ebuild 1908 BLAKE2B b69fd24be7f2482ad975064a589f9be9d3eb8bed968ea94324586642f008f0f8dbb56dba6893efb735b4bec0c85216d4a16e82152b3b424963bbb0e5d87c4345 SHA512 5d8c13f10a735919b9cd3e5401579dc1bbff5859b375c5f386c521114f4075d9e983e29b6651c149d4e5b2bceb1aa42b470e570ed1d0d5ed758f2e161bacf427
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.19.0.ebuild b/net-dns/c-ares/c-ares-1.19.0.ebuild
index 94d360de6c40..2a78ce3658c1 100644
--- a/net-dns/c-ares/c-ares-1.19.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="MIT"
 # Subslot = SONAME of libcares.so.2
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 89e5b92d4fe0..416b29059ffb 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -12,5 +12,5 @@ EBUILD dnsmasq-2.85.ebuild 4656 BLAKE2B 8dafe90669b9cd371966234f3d076b4c9c67b2fd
 EBUILD dnsmasq-2.86-r1.ebuild 4797 BLAKE2B c6bc501df8d1c53ea6097c5aee31fc7eb01323a0351a393457e44df151e6236bae3206982ef9830aa0419939da820c114d5c81bf2eaeef37ea2d0e3bb42a60d0 SHA512 c082f6952dcd8f23f0697c12825fe92472f812b0c4648de309c30a4f8854569346a15765476ac6acdf5c32c878a2aca43eeb5b049d527e5e8694758cc7343a27
 EBUILD dnsmasq-2.87.ebuild 4811 BLAKE2B dd23eb4befb76e15d784c73e49e4fbe1638ce77c66cac383e5f4665a9033e26a9aed3e7a7749b7664aeb94127ee3b219b9d04889ded611b96d27de119d0715e2 SHA512 7dfe9ef536bcad2f9afd8e4ef43fc2b1b260076b8ae6ae7a836d32241fcafc8f5f3b4a06baef49206e0bcbadae483d0fdaca0497b1745a820126be33e2acfd42
 EBUILD dnsmasq-2.88.ebuild 4811 BLAKE2B 2e45a4907368e6e346aa20db2b16a92f3c46a551f548c69b5bff96aac0e7626da9c736f6d0cde3ce394b1858bdb1d6dc5ab88c55c18b127a848f60e6df7df5b7 SHA512 4517f3f0b22addad836709485e8136725b50fdee1162b267f9127e18ea58bc72d98cf17f2f0306914c61d17755f4bcfd65fe6ada62e7844de1916f33c41f1067
-EBUILD dnsmasq-2.89.ebuild 4807 BLAKE2B 08ea7c61a462ceeffd9c73fffbf3b7f96a2c6c1d0e78770bd8f6fcf69c56af0fac67c12b639ac105c52c8cb4aa5373acc60c4216f7a1f03fbbe9710d79ab07b8 SHA512 042500140ad774b519751295e531f460a32aecb8c8bd62e600fb18e6bc733f4b965baba39c855d6c14f67ebb5794f9fd8680d53fdc78b8cdd2232f9ed0c6147b
+EBUILD dnsmasq-2.89.ebuild 4804 BLAKE2B a1627dc5c015ec3f5a83f5a23a61ed3c800b1aa395891aa4930c2e0341028d35bfc9989b5517cadf947fbbf3d8b2ce04d7ef8e84db6776236800f55b569fed79 SHA512 95106ab5d07b11ba1eeb1d890c4478a6370b42a217876f1e3d99c58f8a2a428df6cdb450532b705eb7b72d1277c559bf26d8e85b1ecda0afd4c62e5d19d48cc9
 MISC metadata.xml 1449 BLAKE2B 532b630e5c03652df74dec95bbb6c1c03b0d8a8fbc78ed1b2d40f47fdfbc20ce21172259f630acb5d14eb32b849d1d5b34482ffe77d4b5eee64051e839f17607 SHA512 e58549ceaf7a252f0b8b4c3a678cbc57bca66bf749bffbf8ec5544e79a380af695e3412c8d59d941bd08ed6cb95ab27bc2a13fbc46a4f5368d9e209e3e33bc99
diff --git a/net-dns/dnsmasq/dnsmasq-2.89.ebuild b/net-dns/dnsmasq/dnsmasq-2.89.ebuild
index bc31511e849e..a446b6d1fb2c 100644
--- a/net-dns/dnsmasq/dnsmasq-2.89.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.89.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp"
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 324701640a62..821a2ccc2bc9 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index f6048f87c5e9..3bdfcda113e3 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -5,5 +5,5 @@ DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841
 DIST firewalld-1.3.0.tar.gz 2146120 BLAKE2B ea023278099e095ab46ea46f78f2e75c33ebadfc253cbc74beb56cf6176b98a3104f3d048c4b5379ce1ee0cca05010f9a90d019602233d869b563dd92de0cf7c SHA512 e20605c8f12c12a2a692eaa38d7833b0c258092a6742c1adc359928fb4fb1872667e3a3bf0bad0b139dfc132a5507a8745789745fd9408324f7d171ad2cd5d68
 EBUILD firewalld-1.2.1.ebuild 5230 BLAKE2B 15455c8f8509f6410edb956b24e571a44de4f4e43232725eae00904476e8c44c30cfe3748089f8da6add4ff7d1cdc86cc67674346570cb3129187a7fa9c1c0d8 SHA512 ee20c1423b23496e1e3bf7afe38ed5e360402adb513661783b8c0c72ccf538614f2b42beec8ae528a58889c6393dbc6ef8d25717896724908804c889a5e2f812
 EBUILD firewalld-1.2.2.ebuild 5298 BLAKE2B b6e875a8fb0b23927babd45c55c66b0ae2d2cc1b9aa43ad7ca9dcd11363993971ebd67e8bb5ffdf7d632e2ceefdc2782cbc1e83a109a07eda58ef6ba64c3ebdd SHA512 48c6e7d58caa191be03597754b626a7acafaa3ce0eecb3813ba7e28e3bb51743c110a566281e3e0301c4e1ed6aa8637ec7b01e799a5656faeed5ea2e53acdb58
-EBUILD firewalld-1.3.0.ebuild 5284 BLAKE2B 075a6e4f316d52fef77b796cda690ace289cd3d97523d695684162750a0f858ff9317ba024ab7143c040fb08059c6f423fec8d225e6880918dd606a3a2871c70 SHA512 2c3f9d4ece6916b9927af39715c40ee731afe3c1b968d18b36bd11af213d42937cf18fc38399e85421eeae171d33cae7dc76c7f706878f734d614bf38b4ed150
+EBUILD firewalld-1.3.0.ebuild 5283 BLAKE2B 93926f1bab6849b2326b9cfead9cb5880449a23a8b950824d09a17016e8839f7092628d07f7222f821327377300a2ec9eb71fc383f3d30261277f12aaecf73d0 SHA512 b40b862dab7a873c5fe83b869321cc282e4c2b5e6e69bfbf683421b1ab2d32c4b4105cb41f365cd8311cd8dc3c11254d2d4918fe38c47c9e8800238bf99bf727
 MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe
diff --git a/net-firewall/firewalld/firewalld-1.3.0.ebuild b/net-firewall/firewalld/firewalld-1.3.0.ebuild
index e09a8446fbeb..79d062f3b4ae 100644
--- a/net-firewall/firewalld/firewalld-1.3.0.ebuild
+++ b/net-firewall/firewalld/firewalld-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="gui +nftables +iptables test"
 # Tests are too unreliable in sandbox environment
 RESTRICT="!test? ( test ) test"
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index f8f484b9ec94..60d11ae1a1b7 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -15,5 +15,5 @@ AUX systemd/iptables-store.service 240 BLAKE2B 7ddb4425e63cd41f421767fab25a7b055
 DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3de245a7b03965129f3d7f13097fc03fbb1390167dcd971eff216eabad9e59b261a9c0f54bfc48a77453aa40d164 SHA512 f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59
 DIST iptables-1.8.9.tar.xz 637848 BLAKE2B 37ba80be0ee7049c4d3ee5689b273b4d2cc6e6fb9ebb297e86976b5750f987f2ae4536013fe1749ae79b6989c241eaece3202019fafd47d842c7a4fe3e5093b1 SHA512 e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70
 EBUILD iptables-1.8.8-r5.ebuild 4733 BLAKE2B 46f0e77386ae051047868354c5ce774e4d88113aed56e70338c98150de672b959d2200d5da59051f1272cbad28a03153bc5503705c1b58bbb9c7fb041947fd6e SHA512 d0379b878c8c7d52b6967a9a8634ee5e48fceee70910733d1ec46f793fdf5adceb8946924619052b63c77a4715a5225a2a95f61402c29c4110aa0af4a5e88a33
-EBUILD iptables-1.8.9.ebuild 4558 BLAKE2B 5495e16fd5616051dbd1d9b8e5610b11fb647f506be28edf589699ca3d136dce8ad735a451f18b51a0e621e3f44c93bc61ca21a8b4f0430e11647168f51689d8 SHA512 8bbf97b626085aafe531eb802cffb8e7e76c64328759c651d1a47df97eb83b95cea65870e3cb7a702bbc5c7b53aed09d9e88543cd526344725a1eb7999976dfd
+EBUILD iptables-1.8.9.ebuild 4557 BLAKE2B 43d8d56f583c4dd4692d588d00341507c7b429c7a447ccfbcd968be8fa040c1fce9b5c69f3e946cca7f2803ad0995cfb8c1d89c14f7879a67cc36a1638744c99 SHA512 2bdda1882fc468965afba4193c7474e671d9dd9675f2e08b31991a4a59452ee8199ba18771283f5f3484bb1b38ea040608d67445e8fb579d0a5a62b0804aceef
 MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842
diff --git a/net-firewall/iptables/iptables-1.8.9.ebuild b/net-firewall/iptables/iptables-1.8.9.ebuild
index 09aace20ecdd..85e211b38f2a 100644
--- a/net-firewall/iptables/iptables-1.8.9.ebuild
+++ b/net-firewall/iptables/iptables-1.8.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 # Subslot reflects PV when libxtables and/or libip*tc was changed
 # the last time.
 SLOT="0/1.8.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="conntrack netlink nftables pcap static-libs"
 
 COMMON_DEPEND="
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index ec084bf2f756..a9ba6cf368f2 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -11,6 +11,6 @@ DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 7744a84c213999b35c3094fa5d9f974acec6
 DIST nftables-1.0.6.tar.xz 834584 BLAKE2B 7c14db883f0ee9394b603870c93dcc92ce472bf0349a59d0e377f1d44efc870df3449d6f2dc9a198f2e396e5d73b19532dac498e832083ca8cf65cc78db9ccd4 SHA512 afe08381acd27d39cc94743190b07c579f8c49c4182c9b8753d5b3a0b7d1fe89ed664fdbc19cef1547c3ca4a0c1e32ca4303dba9ec626272fa08c77e88c11119
 DIST nftables-1.0.6.tar.xz.sig 566 BLAKE2B 3f90c48f521a1c433be9d0bee3b2beb080ac51f07c213f598af217b2d1b2e883e432f014c1a378c18eac4b8620e323fbdebb654aa53b345210a3f62ccfe93507 SHA512 83657d213e675c8ffa377112efc7fb0f5b756287f06aa9ccd3716eb76b87a14dab01a3ee82929511f26f7e9ce407d8b7ac0dd706c8211ad007fdfcf11d679a93
 EBUILD nftables-1.0.5.ebuild 5944 BLAKE2B 51116a81230b4a137a792a670d3bf3bbbe10664679a1a37a7bcf62bd6b756ea9fe4dffad52a10b38712fa5b3480ea631ceb5439fc473083413ada879f524520a SHA512 8d29abc5b03930aa4531283f65f83550f59cf874e22b69507f7c7d9dffa74e7b39de6cc4eaf6d914d234d779174b309491cbfd63dd5cacf30e4990fcea9f39d1
-EBUILD nftables-1.0.6.ebuild 5941 BLAKE2B 86e0d83e46094a0250d08dd402ec2a7c9d14b8665304dced3516e00ac5066cce5bc9481558d84cc5d86a669d1069ccc8bf879022dcceabb52b909bad84637164 SHA512 47192381d175436ecd4fcbb58b69588d568439020c25ed884acaf90fbef231e98fb3847d7e4f12f41c0a34648b5306509443ae5dfedfa07000a4e72894e2f579
+EBUILD nftables-1.0.6.ebuild 5940 BLAKE2B b8053380e4ab0d7044a40394e6ba04cba4a1116ff4972ce89dbf703ad49fc047d10cb1717d156d578dd65424cd699cd64b4c31da759940f6635373842676a67d SHA512 d70ab489688894b67006a6f469d624aea05239a6fef122a9987e5b4e2f3c00efc60eca6cf5c4f519a52a8c1c84c8c521dcba48465b3cdf9ada81a009daa67cc7
 EBUILD nftables-9999.ebuild 5948 BLAKE2B acd301874c91f4553c76240e9a440e61a8a0f9edda2b1811ab6da76673c11a0bc971f068b637586f2961c199028b17794f1c41aad7b41784882649c876707550 SHA512 0c0f07de93867703ad7e5af0c22c247725815c01438f69689b4d3648a3628535b1e0ac41add05dc6997356c78b6b5e6031af4eee8734ea8ab638a1f911def387
 MISC metadata.xml 933 BLAKE2B 8e76ce489c41dcc01e222d77af40f2ba5cb7ddffc2bc818c6fc8c16e24dc308c125ce4d78db1647e77af96f32c85dd3391f7079e2cee26c129c56557e0c48c8a SHA512 058d38df1dbb2c1d0e611bd992f37498d3977561c3b34846fdf0d569573f2ef93a29a216ab491e583cfc2399c55c839d256dfcf8b1d7aaba63ed6ea90f22df25
diff --git a/net-firewall/nftables/nftables-1.0.6.ebuild b/net-firewall/nftables/nftables-1.0.6.ebuild
index 70bb0c3752f5..e434040260a7 100644
--- a/net-firewall/nftables/nftables-1.0.6.ebuild
+++ b/net-firewall/nftables/nftables-1.0.6.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 else
 	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.xz
 		verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.xz.sig )"
-	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ef10e0d39edc..654ba86b1fa0 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 39952080abc8..8c432cb3c115 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -1,3 +1,4 @@
+AUX synapse-1.78.0-frozendict-version.patch 888 BLAKE2B 013f493d5e156d70acb4ecfea22288b2e5bf6139c1c52dc120e765e8e16976ac2ae125ac439a409ddeb1964645465e21b883af0d2a8c2dd53c89e6dcd34ae1a8 SHA512 248487f4e6dd11b4cf2fd944304fc760c67911ce3e1ca3b6ebb3ab9ece7d57b7c7d7121d4d8f71e8c6ab53f4b607f90e879f90a5215c3609119e6646c43f2ce6
 AUX synapse.initd 365 BLAKE2B 064dce5e10596316509f321de9819edab15fc91551e5fc9747c3a2bf28326d9db764046831689cc425ffb7bfedde9607132ebd412ad0ac0becd9d79990c0fc80 SHA512 ec87c250b9d72d3c937ec57fcd6a487c92ef341b3b46ac53fdd7b1371d71ed518c5f94e7ec63e5c859736c73b7762143e113fed9b2dfffbf070e14525b25a840
 AUX synapse.service 549 BLAKE2B 4b91a2da29b2a9afc5a6cff3c74a8b2f0dbe86063d0a47e60fddf8eb712b3642c308181ba2444a7e59b58f942368e7217dc94088a2487816aa44e28f49094573 SHA512 a9039c2883008c191cc89bec6f52893b489688e83525eeef09a979fc22b09b048cd03d6a7a450ac3d1441abccdcd6786cfd6c8f0b90ea98d1516c312bf634636
 DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
@@ -28,6 +29,7 @@ DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644
 DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
 DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
 DIST pyo3-log-0.7.0.crate 13774 BLAKE2B 4f70c0fcef4c735e2b36704fda16f987a24acacfafac3cf25cbdef5f95d2a70e05736d171bec48a23d0d85e25acda90d98b4ea2b19f7b5bdfbac2520c0a745e9 SHA512 a9170e53a8f745a3f8c271acb629461b902d403e76b47c218660d1e9ab17fa67e44c250b60c15c11c35e68c18135c357c7a6797a91018d42b660b5331e4ee507
+DIST pyo3-log-0.8.1.crate 14082 BLAKE2B 1920a34d18f1f418857abca05c59f5f9a16d00fc460082c2cbe97bc55b8f429d6433780d667a211beecf4df81a2606aa502ce2a1ebb6c0833b74a604abb5eecb SHA512 d69f7c8e3d1997ca06201c15500a2e0e043f7c0b39c8bd826ce9dbced220b4b0fde0c31b865fbc41f94f188e4b9ea15b49e2e2e42068a82678668f3a51a2fca1
 DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
 DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
 DIST pythonize-0.17.0.crate 10949 BLAKE2B 6d3c311aae1ef97a2a965124eb23e312f94c4d1e2a8ec17d9316c9fd2f72990b95977a87f722012e4fb54ce0a8be1a2eaac57b71e9d429dbbe59b0da387b2b81 SHA512 a9a46d27b8aa9e5bd7bb0b114b7457275131d90e20acd07110fbc18b3af3b9aa0683b9306fb645645f3801b64c0c479998665f3e4fcec0ed8e5b5947008b76bc
@@ -40,10 +42,12 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
 DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_json-1.0.92.crate 144180 BLAKE2B ff8f7ae5539c7febf542bcd8c97a47b5b280d650edde368995e2342f037a611f87d7b42e0dcf7ab89033dbc7fc703f9189bf4022cde6982935690b510585ac10 SHA512 4fa760e4105484af6def828894a216059f037ca0286555e4f1ac56e9442ed781bb4ed5c286d264910602992d66cda0d0c15a077d394c21b148b39b389d2f1ee3
+DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.104.crate 236683 BLAKE2B 865904923ecac469f1d92bab04ea9ee384be0592c7a303d9d0f2f4bc755744bd883372c215a8f1add8bc2728d7c2c27489ab292fc8a89bdce918fc4a32deae44 SHA512 8feabd8e6b1b5eb15077d7c92f0b3269e848d33b1f233b3df343b6d445ed332fb23e0222911a13edfd82cee969d25c43434268cd7a20ce1c0a608a1bbe327b29
 DIST synapse-1.77.0.gh.tar.gz 8180884 BLAKE2B 1a5ee318e005384d80e1ae0d3d1dfe035263b13b88cdc3319f5eee4f9dd1c51b203bbc4bde9035e82bd976ef7f4314c6ae62601149227557745723c07cafc0fc SHA512 7e9efda255e44efb1916c903ece4d6eacc4ee069d4415bc0bd2723aef655101cfe40be9cfd1a321b1f434e6df0482c792d2dbba8b6c05c1f1ce14cac0a16926b
+DIST synapse-1.78.0.gh.tar.gz 8215627 BLAKE2B 22e3cb1ef7349548052c81ec09b715848a061bda9fc56563733e292403b975a5ceea0be0b3f39b0f1effc8e25c775d59d4db273422530ccabf2a64ed786eadc5 SHA512 fef3bdac42fc8ca6a8642eae840edaba789ccbda78b3a749e90ca5785e232a5ac9e8a3185dfc27f7c6f6f7fdcdb28b53483f884df0b3fc7f7ba9c18e73350698
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
@@ -56,4 +60,5 @@ DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f8
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 EBUILD synapse-1.77.0.ebuild 5287 BLAKE2B da180755b2755fa3987d3f4127c04e76fb254357adfdf5db5bac7ddbcc81c564b3d758319312e5e36086c43073f11b7f66ce33280bf7a0627d4062037268de97 SHA512 76b971c8fdc688aa25490c0e697e8a9f8323e3c7ff96f655f9c90cb97495bc33edcedd6294ddd1739b47b5a6379a6ef1be8d6667d2a9605cb8b11a5e39549e2f
+EBUILD synapse-1.78.0.ebuild 5346 BLAKE2B d06744a3a475d91b79256387a4e0c29469c7161967d4b067df74e7eca044ef788205fd2691f93e8dd9bb2f7564decf4e069fe8f6643c5eeedc2f69589dbc793e SHA512 5c0a7e7315c4cbe54331938c54319c349a9e4fc51a269a63f2267d20c1dcbe71cea6b32144321b186eaacdf6b76b7d5365b19b0aae88dc5e78c085d5c976e1ed
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/files/synapse-1.78.0-frozendict-version.patch b/net-im/synapse/files/synapse-1.78.0-frozendict-version.patch
new file mode 100644
index 000000000000..2253e597d2dc
--- /dev/null
+++ b/net-im/synapse/files/synapse-1.78.0-frozendict-version.patch
@@ -0,0 +1,16 @@
+Revert frozendict restriction, because we don't have issue with 2.3.5 version.
+This is related to upstream PR https://github.com/matrix-org/synapse/pull/15114
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -154,9 +154,7 @@ python = "^3.7.1"
+ # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
+ jsonschema = ">=3.0.0"
+ # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
+-# We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this
+-# because frozendict has been more trouble than it's worth; we would like to move to immutabledict.
+-frozendict = ">=1,!=2.1.2,<2.3.5"
++frozendict = ">=1,!=2.1.2"
+ # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0
+ unpaddedbase64 = ">=2.1.0"
+ # We require 1.5.0 to work around an issue when running against the C implementation of
diff --git a/net-im/synapse/synapse-1.78.0.ebuild b/net-im/synapse/synapse-1.78.0.ebuild
new file mode 100644
index 000000000000..2da15407303b
--- /dev/null
+++ b/net-im/synapse/synapse-1.78.0.ebuild
@@ -0,0 +1,203 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=poetry
+
+CRATES="
+	aho-corasick-0.7.19
+	anyhow-1.0.69
+	arc-swap-1.5.1
+	autocfg-1.1.0
+	bitflags-1.3.2
+	blake2-0.10.6
+	block-buffer-0.10.3
+	cfg-if-1.0.0
+	crypto-common-0.1.6
+	digest-0.10.5
+	generic-array-0.14.6
+	hex-0.4.3
+	indoc-1.0.7
+	itoa-1.0.4
+	lazy_static-1.4.0
+	libc-0.2.135
+	lock_api-0.4.9
+	log-0.4.17
+	memchr-2.5.0
+	memoffset-0.6.5
+	once_cell-1.15.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.3
+	proc-macro2-1.0.46
+	pyo3-0.17.3
+	pyo3-build-config-0.17.3
+	pyo3-ffi-0.17.3
+	pyo3-log-0.8.1
+	pyo3-macros-0.17.3
+	pyo3-macros-backend-0.17.3
+	pythonize-0.17.0
+	quote-1.0.21
+	redox_syscall-0.2.16
+	regex-1.7.1
+	regex-syntax-0.6.27
+	ryu-1.0.11
+	scopeguard-1.1.0
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.93
+	smallvec-1.10.0
+	subtle-2.4.1
+	syn-1.0.104
+	target-lexicon-0.12.4
+	typenum-1.15.0
+	unicode-ident-1.0.5
+	unindent-0.1.10
+	version_check-0.9.4
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+"
+
+inherit cargo distutils-r1 multiprocessing optfeature systemd
+
+MY_PV="${PV/_rc/rc}"
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+	https://matrix.org/
+	https://github.com/matrix-org/synapse/
+"
+SRC_URI="
+	https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/synapse
+	acct-group/synapse
+"
+RDEPEND="${DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/canonicaljson[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/frozendict[${PYTHON_USEDEP}]
+	dev-python/ijson[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	>=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/phonenumbers[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP},webp]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pydantic[${PYTHON_USEDEP}]
+	dev-python/pymacaroons[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	dev-python/signedjson[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	dev-python/treq[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		postgres? ( dev-db/postgresql[server] )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-frozendict-version.patch"
+)
+
+# Rust extension
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
+
+src_test() {
+	if use postgres; then
+		initdb --pgdata="${T}/pgsql" || die
+		pg_ctl --wait --pgdata="${T}/pgsql" start \
+			--options="-h '' -k '${T}'" || die
+		createdb --host="${T}" synapse_test || die
+
+		# See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
+		local -x SYNAPSE_POSTGRES=1
+		local -x SYNAPSE_POSTGRES_HOST="${T}"
+	fi
+
+	# This move is necessary otherwise python is not able to locate
+	# synapse_rust.abi3.so.
+	mv synapse{,.hidden} || die
+
+	distutils-r1_src_test
+
+	if use postgres; then
+		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /var/{lib,log}/synapse /etc/synapse
+	fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+	fperms 0750 /var/{lib,log}/synapse /etc/synapse
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+	optfeature "Improve user search for international display names" dev-python/pyicu
+	optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo
+		elog "In order to generate initial configuration run:"
+		elog "sudo -u synapse synapse_homeserver \\"
+		elog "    --server-name matrix.domain.tld \\"
+		elog "    --config-path /etc/synapse/homeserver.yaml \\"
+		elog "    --generate-config \\"
+		elog "    --data-directory /var/lib/synapse \\"
+		elog "    --report-stats=no"
+		einfo
+	else
+		einfo
+		einfo "Please refer to upgrade notes if any special steps are required"
+		einfo "to upgrade from the version you currently have installed:"
+		einfo
+		einfo "  https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+		einfo
+	fi
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 77ad2bdbe0eb..208777caeba3 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libcloudproviders/Manifest b/net-libs/libcloudproviders/Manifest
index 9fac0c89005d..cba49194b82b 100644
--- a/net-libs/libcloudproviders/Manifest
+++ b/net-libs/libcloudproviders/Manifest
@@ -1,3 +1,3 @@
 DIST libcloudproviders-0.3.1.tar.xz 22072 BLAKE2B ecd573507b75c144d94678b693181efc9420fed2d9103cb35653a5f83435e544e77cba232c490ad946ace1eb3cc7382d746ca9fadb55a69c87f55ba3aa09ec83 SHA512 66e951380da8447529d04cc9cbaa0587f40152ab0b66787ce3939104a49eeb16808499a5dcdcd38b7ae9c8cca8bec66ae0bbf04524e7ff8fdf6d420e8a71d609
-EBUILD libcloudproviders-0.3.1.ebuild 1070 BLAKE2B 58704648abf22ba2686e138f64fb5b18502df26205e1e5bc596925e83a6a24fd1e8483bde3b9ac3cd08f09fc112533e5d90d2ea6c221324eb9ab4e35638cac66 SHA512 a8f0ccc944499c9832c096943b46d3a5bf23b0d793810a92f6c4ee35f7aa3e9ad4e8c2ae0e6eb6aeaa0f69b8d530cb5f42d23beebcb26bee5850e26300f03e52
+EBUILD libcloudproviders-0.3.1.ebuild 1076 BLAKE2B 91ef837a1d339eeeae80af73c91b9d29ebea15f43455a1cf5517c83b0e8b631fb97e50cec8f85055ed5992d0312bc1c3a0e0779a0f6b5b3c861eab4297aa41a5 SHA512 068ba82c7563513d30964298a4ca8e27ba3894a9e9f26afcb125984621470ce95fa60525d2136c687b2f16fe8486d62dd181d46846f6aa772f48d7b65cb7ec1f
 MISC metadata.xml 358 BLAKE2B 5411f132651dd738aaaa1aad4bc8b1d28b08082c76c375145c660435e63c8422382c96b290bc3c194becd8251572b21528200e29badbd73274bd335f877677ac SHA512 4ce53f86d353badca979470dff17f1e30e1d7ad820561dcb348148d1e7cb6435319b1ed2ed2522d897763536a7680843aa7c5204807ce7f22b94cdb4bf172fd4
diff --git a/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild b/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild
index 08bbcadd26fe..ec842ecb5d9f 100644
--- a/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild
+++ b/net-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="gtk-doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.51.2:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index fc6e9e253145..8a463eea38dc 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -2,6 +2,6 @@ AUX libnetfilter_conntrack-1.0.9-configure-clang16.patch 462 BLAKE2B ce679a50047
 AUX libnetfilter_conntrack-1.0.9-musl.patch 1671 BLAKE2B c6618c82fbaf68f5c61dc7631d12630c82e597112c5131b0b3fa49344a4d70e6a3efaf13b42f4971d0b0ae9bca0a1b6183170111b7291cd374cc4a38ea64b167 SHA512 121cdbb92d17c4ffaaa93ddd8e881489f82f00aa931f14032aaafcb2c1a65ad18f122868baaa9d0c0b266638c9888c5f037f47ecba09321de683c569e2fe7466
 DIST libnetfilter_conntrack-1.0.9.tar.bz2 373177 BLAKE2B 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a SHA512 e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c
 DIST libnetfilter_conntrack-1.0.9.tar.bz2.sig 566 BLAKE2B 0f80f00858093ed5e9aac190fbb1ac5ac1dde60e6767b65adda49ed79fb7fb6cc7caea51793d8930a927d9b7a75d263851dd5741d6d408a8b56d3ea5b73da20e SHA512 83ed38f68bd38cf70d9c245a7f17373751ff9099ceff3066812b282b7426edf2eee79da8f5aea896b119327059008ff4a531b3dfdcd79d49944bea4079e67e1f
-EBUILD libnetfilter_conntrack-1.0.9-r1.ebuild 1446 BLAKE2B 6721c165ac3aa76d24f4c1b5d29b9310a192cfda246ee0dff34c0827ef879bf456864048d72b7961dc496f3741185f41260f1face888d563579807fe0235379b SHA512 95bf4175c60d57f82370cce3c534c48ade719bafb1caa6ccd412a104e94568b117f8c70ac1019c26270588eb7e203d8a9df32b8c7769ee42506de5abceecd76d
+EBUILD libnetfilter_conntrack-1.0.9-r1.ebuild 1443 BLAKE2B c913a3998f08e36dd09cad31b5d7b5df939bf11a0f0b122e30a1edf44598a28e94381b4f39f31d2a5ad04149261cea95dd8f373d4305536c71c7f001a797503d SHA512 924c76febd037593cd86093e541555770ec74235a5197c5b99b8d857efb2c429b42418ef55718c09a68f2d0be8a69320659b12b84b02c2cac1585a7d1a56fa1c
 EBUILD libnetfilter_conntrack-1.0.9.ebuild 1292 BLAKE2B 00750ac814d66da4879a370f821176cb183c281823267f2fed92573f9d1b3dcbf314c44fcb9bf537c905e4b3f61a974fbb427219b954509b2563f3dfff3ed94f SHA512 cc7dd96be46e8cd3900cbf060988f8d58d8592aa40f8fcee8c966abdcf488ec188abe8f6536072d6c6701003d8a4ed4a4faa291297fd880f57b6f258d64c13f9
 MISC metadata.xml 375 BLAKE2B fc9624816dbdf791c5d399fd9db83b402c1186387a7898c700f277e926e6424d9a2cf3dae39221041ec782c017fcf96cab8bd698878dad524f9feb111576a652 SHA512 016ff7eaeb05c1566ed7f53a2fda5c5808e847d6d5cd07521769ebfff4cdc76fe4d40abe13cd9ed68c56c83a2442720ba526e9454d596e3fee87e25843933f6b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild
index 877e90d7193f..88463d27641c 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
 
 RDEPEND=">=net-libs/libmnl-1.0.3
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 616018a03a10..116c71645bcb 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -3,5 +3,5 @@ DIST libsearpc-3.2.0_p1.tar.gz 54011 BLAKE2B 9bdfa72b207eb57d1242384e5581eea9083
 DIST libsearpc-3.3.0.tar.gz 54140 BLAKE2B 6645a7e4c14c9d50b59ce8ebaecd13bb247d16d66449b0d251d27d12d46507cc2e4b8468e87f6f1b222da2243b59fc01b69349eb06e96b5cd0d6aabd1aeff72b SHA512 0fd07dcd417b540cb8ed53f1103a03bc6b1a2b9bbb8ca0858aef44a352e3d5d2b6ad51901a29ac6be27acfe25f93233530003982315d0f6e268fa43992f04240
 EBUILD libsearpc-3.2.0-r2.ebuild 827 BLAKE2B 0ebbba012308b596e8698decfd326d4381463ef00284f41d4d82323845215c6ff87e3e99552dab209dedbfb22810107b41b908151edccedd4a911f02dc93757f SHA512 e6e058ff8661795cc06b5d961a61d9d38d89aaf1a6825fa0f55a5161e1edcf430887b0094142086448000941a7106aa5b6aed9b601d1b592713c07b6f33d460a
 EBUILD libsearpc-3.2.0_p1.ebuild 1018 BLAKE2B 2a87c16945071f6d5c332ec1560f3af5332a5ba75e4e849008b21cc4d4e499397fe333823e872db12d5e8c3e949aaf00c3cbd6abacc5222e7aa565faa3b120f2 SHA512 f347d2275f34a4728fde349a05b85d665e0b404f1490141ec875bbcfcd3765b29c475a23ccc06239f79cefe50a33a15f8db02c389a749afaf0e9ddc8def8a3d3
-EBUILD libsearpc-3.3.0.ebuild 1018 BLAKE2B 19239a015ad14f7d3c86f927bc1e5dca02a58308411be7d88d50e12960451122cbcc1265fc499e76b76310f0ba188468a809d4e3f46e51ff48aa10ed9a73c5f0 SHA512 9541276ede0c2ce3bd00090977592fd326214effc6c60f5ce9264a41932f54584ed4680a17198fdd22e37bad20745671f5d6aa2314743742003aa5e5c2fd768b
+EBUILD libsearpc-3.3.0.ebuild 1017 BLAKE2B 128a84a7b2a0d93312040cf75ec614edb19f037d5127d06ea9e91cbcab06602129d5503cbec0f557509dd7efb02db3c045bbcc891102d2c2842aa8bb27c19e71 SHA512 9ba55beda6557226b353d4c393fcc9aa672748826e57eff4165c8663c84220bb726b3d1e5e5f4b42efefb4eeb2a7d0bb576dce7ab72f063db9682b078ddc99c3
 MISC metadata.xml 480 BLAKE2B 087b5283b9c24e54190f2d964757dc82df0b887fc0ed1c6f70669bd2ca96ff3b098a31558993b982e5427c2c0b7a5ed86fe7fe44159fd494d4a7665ad00b5c7a SHA512 8497088fc5dd29ca69b2100c293562dd5f07c06d37d8097448b1233c17328c17618b3a4259dbf82ad6c2c32add052f288ee15d54ee1ae3bb0dbf7fcfc3d93cfa
diff --git a/net-libs/libsearpc/libsearpc-3.3.0.ebuild b/net-libs/libsearpc/libsearpc-3.3.0.ebuild
index ce3ebbe7e6a6..0cb48cecbff4 100644
--- a/net-libs/libsearpc/libsearpc-3.3.0.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 437bfe1ddce9..7a5a0bf94cab 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -3,5 +3,5 @@ AUX libsmi-0.5.0-fix-macro-clang16.patch 433 BLAKE2B 8ee8219c7b803fc24d78540bcc3
 AUX libsmi-0.5.0-implicit-function-declarations.patch 1887 BLAKE2B e18558f09095008d79a94a3baddc6e6623865b18b0a829d0e53f0bca7afa23ee4a45eda5c77edc54f3fd88c009d4623673909469164ec9c3d64b19ae35bfdec1 SHA512 ab4e978066252f4a8df72b6877bae8574579c3d06c0d31f268fce50aecd645b1f003b9d29b440070c80ad8025a6599e238399f4d037893e67f31cedb2476593c
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.5.0-r1.ebuild 913 BLAKE2B 4626df8d49a139986ee6ceb4919a55d44e1458c93e841d03af42670498b7c637aee0f969613494ea4c8b319e0412cd34efbf500e6e1413b009a8032eefdc83da SHA512 2eac483f4f86ced64c51bc19c0a6c08c7acfbe0433e74403708e528bdada268d92a2f119478b0be244f7afb644f1b5b3e1515d45f4dfdf67fd116a70ea399d69
-EBUILD libsmi-0.5.0-r5.ebuild 1234 BLAKE2B 9c524388e397d77bf72bb45858274173ff5caef27ee668f4f26d6841c23e4605aa6702d171d4cf48e665adabb2ab67bd0e3bb150e55356108fac0b2cc452cd58 SHA512 04aa1d54553710175ad2a55b9ee1d0f84970d5ee782596deed97b2867d4bfd0027311722093ab1262ce88306b5e97bf01449da16e2fcae360210772404958a14
+EBUILD libsmi-0.5.0-r5.ebuild 1233 BLAKE2B a3988688e15df305e5b2062bf47809c89def37d5b31569c126ddbbab56e855da390822c6e1eedce1e686dc40032e48e74ef8bc84633152469c0cef20e249af4f SHA512 515e9c6eacfe33777d1da4771bff877f2ce837683d2091f3842baf9db07f0eb1545127c8b8fb54f81288b3ba95b9cd061535a221f6794882e1391d0d74ae2219
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-libs/libsmi/libsmi-0.5.0-r5.ebuild b/net-libs/libsmi/libsmi-0.5.0-r5.ebuild
index 6e3cf2da5764..c3ed5ebae6b6 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r5.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 RESTRICT="test"
 
 # libsmi-0.5.0-implicit-function-declarations.patch touches parser
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index fba5caac1c1f..2a94022e45a8 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,5 +1,3 @@
-DIST libupnpp-0.22.2.tar.gz 479341 BLAKE2B 5dbfa76614bb1aca1d8a3f03019ed6a95de3640a86f4ca0f3736d15fee7ccb54d454b0cb08f9595789b7478a8238410adabfdaea3a39f131094b9485a0faa701 SHA512 670f9639a4068013e1cd5cc6610e9bf38c6ab0d854079c3344525a4c5e553088a1dc49354ca33338e8d8fb487fc2c0a724f1cf3a99bf6b6f47d6a281f3a8e9e4
 DIST libupnpp-0.22.4.tar.gz 481758 BLAKE2B 41da0dc744e0cddd2d322de297a87c50d975871dcc2b3c22e0381e044ea40787834442161c9bae8c2c3c89226aff7a264e172dedf3c107a8945308f915971785 SHA512 ab97a8a5903e43a138b59c9f5805b85fee07da8e73a1b205c5e57688334f3719f84b3483e6bdde461d9b201f064c4afba0f319989627939e6c9f9d6acef84f31
-EBUILD libupnpp-0.22.2.ebuild 566 BLAKE2B da165a9fc027b4b23b82b7107ffd8890938b4f74803f939f2eb4d0dbf29e3d2b71d976f884e64a5239e55f0a7873a23d01ce8e15701ba5bc60c3db93efe557c5 SHA512 dfea0fa54586ab1aaee2f168d5edba04e59d92ad4e0e5f5defb54280a25414ac13a5c856efb4d76bc55453f2300a68244052748ddd4a36a96c10d6d0259062d3
-EBUILD libupnpp-0.22.4.ebuild 568 BLAKE2B 494b9691acfb48d1b3ef23444d48f56b9bcfd1841bbe24ab06d0fb90df78f448a7ea8fe4ba6f1977cdce5a462df27b9eef330041380ef82309a5b637124b8d07 SHA512 a1fa8c97121841fdb24ebd5b4319ede3f21c2f52a858a7b72c3e675f654a402faaf2fdd7eaaeec6628f9c1b29aa64b13652fcf5d5fcf98f5acb4851afd4f05db
+EBUILD libupnpp-0.22.4.ebuild 566 BLAKE2B da165a9fc027b4b23b82b7107ffd8890938b4f74803f939f2eb4d0dbf29e3d2b71d976f884e64a5239e55f0a7873a23d01ce8e15701ba5bc60c3db93efe557c5 SHA512 dfea0fa54586ab1aaee2f168d5edba04e59d92ad4e0e5f5defb54280a25414ac13a5c856efb4d76bc55453f2300a68244052748ddd4a36a96c10d6d0259062d3
 MISC metadata.xml 218 BLAKE2B a724c5fc41f88a8b75cf9091c58241ae839c3d8a0275a28e4b61e76d8d51865b3dc363752961f61562b702b9e70c49643533164340360ac2d1fd41f8487d5c82 SHA512 e4a1847c2fb757c0e4fef284e730e49814e005f0fd7fcc12a3a4ed70867160635cede513455be1e88ca1b7fd8e671655ac6475be3ea8fe47d979523970ed2851
diff --git a/net-libs/libupnpp/libupnpp-0.22.2.ebuild b/net-libs/libupnpp/libupnpp-0.22.2.ebuild
deleted file mode 100644
index ec0227f9ec2d..000000000000
--- a/net-libs/libupnpp/libupnpp-0.22.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-libs/expat
-	net-libs/libnpupnp
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default_src_install
-	find "${ED}" -name '*.la' -delete || die "Couldn't delete .la files"
-}
diff --git a/net-libs/libupnpp/libupnpp-0.22.4.ebuild b/net-libs/libupnpp/libupnpp-0.22.4.ebuild
index b05822c3f097..ec0227f9ec2d 100644
--- a/net-libs/libupnpp/libupnpp-0.22.4.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.22.4.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/expat
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index ce1e82633e1f..cd1193000126 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,17 +6,11 @@ AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
 AUX nodejs-gcc-13.patch 841 BLAKE2B 86150b503987c2c84acfc2967883cd81109cb3117eb8d647c8682cad7ba04e2248b1465acdb188f083bc246e165be336c153ff850236fccf6de8d04115a3577b SHA512 2d8f6c132c2e7a9c9acbf46ad4f7687c3bc0d1382b1966eaf9a4bd30d5eb0e6513c2fe32c73e9ed2bc8ae4cf3ebfcca29251b71e4589df0f898e11f1242fd936
-DIST node-v14.21.1.tar.xz 34663612 BLAKE2B 9ae2034c56e8a4fe47c8a234c5d16a410e7e8a8df966d580451a04f51da697ab8691a211f9f5fcb8b4ae34d2b5e974216f9dbb10dd19c42e2cb9110c31ad58f5 SHA512 3c9247ee71b8deb0672ecebb68d4f330424598333f38ad8f8a19f251140815d4c2a288b0dc6fa227e93944ea6430934bd7419b1a7119d927ed9e85ff09bd335b
 DIST node-v14.21.3.tar.xz 34508116 BLAKE2B 6fa001be10499ff2dfc920690dda9df25423f3e5c0bf19ae2ab9df571ca905e164e5a4eb778d0aa16a6026c354e39e063bde39d734a0532c3d95c937e509a9cb SHA512 bea8ccbb95ba00c220a42d30f8827fc94fb63725079dc3b63c65fd62d5f4f85d1d78e00b9b1f882a80449fa251930d3f3f5f9c8ae8d14d132660d4c4fd0b08f0
-DIST node-v16.18.1.tar.xz 35843876 BLAKE2B f57bc1122207e846b9490960d648f412d72e6d414d7cf4459a90a7b3aa018aca405a43773344284748a5d68d3f29c4d579be3eb8053569a167fef48bd4d43f64 SHA512 3f05104f61ce8d18d11cc6964a4f8ed165cd5502127b8a0191c1e5609921886c38f48a842519f898c36b18a4a38c13a1e93bafe27c101fd89bdc61f283e7a452
 DIST node-v16.19.1.tar.xz 35465252 BLAKE2B 717cf15ab6fa5a2a643138959c4e539ef541783061605d0670564579bb43c89db0972228d42e529fb4104396ce7e1ed33486b6f28356752709a196924894b9f6 SHA512 7274ae1c7c92a4db9f8df9762f363cd9fb252c51142b98a25e718d749d10989d4228bc8d5fc864b83a4fe0c7f9541f59190b47374673a6ab4654a6366a373a48
-DIST node-v18.12.1.tar.xz 38454588 BLAKE2B dade180304ebe2bf30fc3270a13b8e024dd48a6dda26be7f730925500f997a9c703608b782eb40a16ed174699af256430434759678ae683b92f4fb4ba48b4707 SHA512 1eb4978a1de19c026561a8484df87bdeb6f7f2ec8ae1eb38b6241d0b0ff6158a4a7d19f42df7e295a63b8047eaf862a7470494143b2e27bb36b65e4663966588
 DIST node-v18.14.2.tar.xz 40330824 BLAKE2B d18cf6a23f091633e5298727eeee15dec65ca83e688ff9fbed78385102aa44707ff4b33bcb034f6d10aab9a81a646ad7e8c28a239de151b816ff7072977df0de SHA512 72bb788b40d83bc42850dd9e2d00ffc06d9bcb17d24280d4721038038d1632846f859864328c849498255d1095296402b9b3c6b8910bbd399f7f516a43b9c86f
-EBUILD nodejs-14.21.1.ebuild 7148 BLAKE2B ecd8918a645ec356baf03704bb80825a79254bd10008073957c34ea247d0e8b1b720f1c5cf9d0a82c677cf4287092d7c1b303150d611c4a0a40f29487aa95c2e SHA512 92893f7c22c769aed918f5afca14092c877c36e4c923a72dec2a1c66ac1a26292fe0814a49adbb3a4c02e65792154f4c84331b272e1554749efd82867958bbb5
-EBUILD nodejs-14.21.3.ebuild 7149 BLAKE2B beb6096495994720beddcb137c199d3363c329322365dbb1e5c93af5f8a95ac278568d2c34c046aacefae06eff8e3d06f5a30496fdab8aec8aa6a346b6955461 SHA512 90c3d4816fa7186dcf28578c52ca7ad6779a29fd68f3290829ff46bb6122ffb8858069fa6792f974a3ce01dfeaa4c1c948a13074e62ee92896d8bcd2ea368b48
-EBUILD nodejs-16.18.1.ebuild 6762 BLAKE2B 116bcfd6c91b607e79b4f3683f47e06893196c8193733d415f49bab394e97e98ca44f38f471848f45aecd524ff45465b20ca660d4ee535b9008008ee4713a2b6 SHA512 65206ad12b74f21a31cac476240f5f93cb5468f9254e622f4fe1cfdb5524cea58b09444515e36a17992e8a35a18bf9e3c8530d7710ea2f25e2fcc9078ed7378e
-EBUILD nodejs-16.19.1.ebuild 6763 BLAKE2B c9a3d9e4db031ee4d7c1aba5786a4327716355950e7ab31e042de497f0a013ae14822e7ce204ee5f8ae6d7b38e9a2aad88043674035f7a8199b6a64f2f221d66 SHA512 b43af7843c0e15f7a77e611d68e21f8eff9fad6ad3fe8bface1bcbc98e07d147bb97b20552bd4da61d2ed94aff608c631f22e65cc191c6a8a9dd4fa0698dc158
-EBUILD nodejs-18.12.1.ebuild 7521 BLAKE2B 2e9c3da423016cc273dc8ff97fd65c3e61959cb5136d04d29299647a05620f2d6f8a62c8bda745c1cb51f749e7cb577506c36e77e17d913eb990b728d93faf4d SHA512 051a5cde9653ef822561a3b78304345df5163c5849619aa785b0eef8e3502255619d6e7ed1fafbcb117d2436d8edfe6c0b964b987a81c1622e3844a1ce160c12
-EBUILD nodejs-18.14.2.ebuild 7679 BLAKE2B dcd6b2f2c7d2b46497b5b4e9b6d5d96656a21e311cc13a8884244d43cb579031ed6ec1dfd52607acf3565d92f620b6be6046d2937846b61ce47ac3c8d9d0f565 SHA512 9601072660db5238b0b70599226a78cc24297edbff13a4e6dfebb46e48ff6fc0bc08ace5535cd2646291ba48b36ae60828dd66fc270b307942605017cee8dca3
+EBUILD nodejs-14.21.3.ebuild 7148 BLAKE2B ecd8918a645ec356baf03704bb80825a79254bd10008073957c34ea247d0e8b1b720f1c5cf9d0a82c677cf4287092d7c1b303150d611c4a0a40f29487aa95c2e SHA512 92893f7c22c769aed918f5afca14092c877c36e4c923a72dec2a1c66ac1a26292fe0814a49adbb3a4c02e65792154f4c84331b272e1554749efd82867958bbb5
+EBUILD nodejs-16.19.1.ebuild 6762 BLAKE2B 116bcfd6c91b607e79b4f3683f47e06893196c8193733d415f49bab394e97e98ca44f38f471848f45aecd524ff45465b20ca660d4ee535b9008008ee4713a2b6 SHA512 65206ad12b74f21a31cac476240f5f93cb5468f9254e622f4fe1cfdb5524cea58b09444515e36a17992e8a35a18bf9e3c8530d7710ea2f25e2fcc9078ed7378e
+EBUILD nodejs-18.14.2.ebuild 7678 BLAKE2B 1177036da884aaa2b5a37bf70a33a6bc1c67635e9a0f223246cbd348153e41518ac30828c22013f7b4ed0dfa2f782710553a0006f600c8f526415eefa320178c SHA512 391304b712382ae1f18a9e3778b9a8a95e4ea24e3a7f8eb987ff6df7bd1c162767109a99df0d8d06286eeb9c14ba841b9c4a58f0d7e102913b34a43c866feb70
 EBUILD nodejs-99999999.ebuild 7683 BLAKE2B 571a81e1707f995eb742e93f0707e27ce8a3bb75586c75925cbf5a05c9f836f3b90eaa6089c19aba40c2f3217ee7594eb77499fa2eee6f1e791f72de8ac1485e SHA512 262006253292fba94f51685ed7372e62aab4cd080349db5eea179238f625b4e92ec969033b7564dbe6d7dec0dd27814be3fa27c02bf3596376b83ceff874b1e0
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-14.21.1.ebuild b/net-libs/nodejs/nodejs-14.21.1.ebuild
deleted file mode 100644
index 7543fd8dcedc..000000000000
--- a/net-libs/nodejs/nodejs-14.21.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? (
-		>=dev-libs/openssl-1.1.1:0=
-		<dev-libs/openssl-3.0.0_beta1:0=
-	)
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-	"${FILESDIR}"/${PN}-14.19.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-gcc-13.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.21.3.ebuild b/net-libs/nodejs/nodejs-14.21.3.ebuild
index 81c7e0096d10..7543fd8dcedc 100644
--- a/net-libs/nodejs/nodejs-14.21.3.ebuild
+++ b/net-libs/nodejs/nodejs-14.21.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~ppc64 -riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-16.18.1.ebuild b/net-libs/nodejs/nodejs-16.18.1.ebuild
deleted file mode 100644
index aad6661508fa..000000000000
--- a/net-libs/nodejs/nodejs-16.18.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-gcc-13.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-16.4.2-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		lp64*) myarch="riscv64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-16.19.1.ebuild b/net-libs/nodejs/nodejs-16.19.1.ebuild
index ec6589cec125..aad6661508fa 100644
--- a/net-libs/nodejs/nodejs-16.19.1.ebuild
+++ b/net-libs/nodejs/nodejs-16.19.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-18.12.1.ebuild b/net-libs/nodejs/nodejs-18.12.1.ebuild
deleted file mode 100644
index 554f26a07e14..000000000000
--- a/net-libs/nodejs/nodejs-18.12.1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CONFIG_CHECK="~ADVISE_SYSCALLS"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9:=
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.2:=
-	>=net-libs/nghttp2-1.41.0:=
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	sys-devel/gcc:*"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax-kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-gcc-13.patch
-)
-
-# These are measured on a loong machine with -ggdb on, and only checked
-# if debugging flags are present in CFLAGS.
-#
-# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
-# limit for memory usage. Disk usage was 19.1GiB for the build directory and
-# 1.2GiB for the installed image, so we leave some room for architectures with
-# fatter binaries and set the disk requirement to 22GiB.
-CHECKREQS_MEMORY="8G"
-CHECKREQS_DISK_BUILD="22G"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.3.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-	# nodejs unconditionally links to libatomic #869992
-	# specifically it requires __atomic_is_lock_free which
-	# is not yet implemented by sys-libs/compiler-rt (see
-	# https://reviews.llvm.org/D85044?id=287068), therefore
-	# we depend on gcc and force using libgcc as the support lib
-	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case "${ARCH}:${ABI}" in
-		*:amd64) myarch="x64";;
-		*:arm) myarch="arm";;
-		*:arm64) myarch="arm64";;
-		loong:lp64*) myarch="loong64";;
-		riscv:lp64*) myarch="riscv64";;
-		*:ppc64) myarch="ppc64";;
-		*:x32) myarch="x32";;
-		*:x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	if has usersandbox ${FEATURES}; then
-		rm -f "${S}"/test/parallel/test-fs-mkdir.js
-		ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \
-			"For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'."
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-18.14.2.ebuild b/net-libs/nodejs/nodejs-18.14.2.ebuild
index 92e7f6461da0..bb51f9d7af75 100644
--- a/net-libs/nodejs/nodejs-18.14.2.ebuild
+++ b/net-libs/nodejs/nodejs-18.14.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 31102a0b4e3b..360dada9768e 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,3 +1,7 @@
+AUX 1.3.1-disable-stack-protector.patch 1085 BLAKE2B 2afb9ae8f79c2aa9c65d07a509c60b2377b949edd61703652c38bf30fa0fe12357d9cbb4257bd7b421ebebdfab2f8c60e06ab915bd9595aa8a839bc7f23effa2 SHA512 cbfb776915f1606c79510a8a8bdd7681d53c544ee66de15dd879f22df0ff2fe1c5716ef3da4221641f76dac5549d3f8de0b643b9a6fa100f609ff0c9f33e2634
+AUX 1.3.1-fix-btf__type_cnt-detection.patch 1750 BLAKE2B 7086a709a02f7ea00c709373242cede140ff268c395afb97cba4754182e74e72bfdd300afba4cdc273168f78e63ecda5c58e957d66fa826fcb8ff4615714eded SHA512 27e3b4fe413230471aaffdd9c105ad739351b87914e48b01ed2fefd95213a60fc1ec237921036ca8115f48367d4c965b61002b33037955ba1c6447a497e42912
 DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626
-EBUILD xdp-tools-1.2.8.ebuild 1261 BLAKE2B 41ebbef1014c7730007c0765283cd8e34d66d75f99be846d762aada7045a5a72e23a0a02364eddd32f2d67b4baff54fdd97a70b585b3ced57cf3e3d91959bb1b SHA512 3cbbeae820d0cedfefc4c2b17f086dd86c55c39994606d6fe245c88e47eb6f9342474d3f0796db15b67d772e8734509cb900f202eb0cdcb618fecc040589294b
+DIST xdp-tools-1.3.1.tar.gz 330516 BLAKE2B 89a61f47ba26efe6d0630d971e913e034d111d05c896e5af1bb28e6cb4e94133e6ecd827a10ee12a935ae2e6856f04556ac564ded1bcc65182766d656f8d0c5f SHA512 9dd434095a043158d14fb6829fa632fc4a0714dc0b6e08c219dfb55cb9f34005300db750115e08bd54210e90142bd499904616da077b8aa827e4de28c31be637
+EBUILD xdp-tools-1.2.8.ebuild 1261 BLAKE2B 800efd8b697d0fe6e2e5fae5c34deb9b299aec42a4aa437b43a63cce77356c0d71107728a369287910f2d5948a24cf467518c3ce7809edbdf2baee27338b5d69 SHA512 40847494eeac46981c8a5beb41ea321a31656d37fd94b0cdeb010c1f084a6bd06d1bf61f3bc7ce319ba59b27eb82781e2922b4f33f317f4a26e42fcfca7a0faf
+EBUILD xdp-tools-1.3.1.ebuild 1412 BLAKE2B 491376a06fe88e191c967eca92312db41c86ee4822512731844d1a1e6433b475db9cadcb55ae4681d159414704a50bc342201b1e579b82472140e05411450fe2 SHA512 23a58b82e721b734b517ee37748b18bb45a64b5293bcea2a42e78949ccec98864860e54f804b80258067d3b6583465d81102e60f227cae8066fbdde8c10be192
 MISC metadata.xml 448 BLAKE2B 5e76000a49c2578dc872010907deab803bf25d58e5383b81f8953f3ac8549f017895c7afa39a2b8c3eb47efb66c5c322177032542cdffec41de733502da41ce4 SHA512 4010fb44ad655a9c58e3328623652d2f6c10aee934daeaaa2c5738c44b086cc2674e011e5de0b6e6a058c24131a16be679e971a692800458492cf3addbd761c2
diff --git a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch b/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch
new file mode 100644
index 000000000000..3a37b26efa14
--- /dev/null
+++ b/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch
@@ -0,0 +1,32 @@
+
+From: https://github.com/xdp-project/xdp-tools/commit/cb6d06219d1b49b07980b481a383e1dea74a0702
+Bug: https://bugs.gentoo.org/889842
+
+From cb6d06219d1b49b07980b481a383e1dea74a0702 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Sat, 4 Mar 2023 20:08:25 +0100
+Subject: [PATCH] make: disable stack protector for BPF bits built by clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The clang toolchain might have stack-protection enabled by default
+(e.g. via platform configuration) and that won't work for BPF,
+so unconfitionally disable it via -fno-stack-protector.
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+---
+ lib/defines.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/defines.mk b/lib/defines.mk
+index f134c43b..54b259f2 100644
+--- a/lib/defines.mk
++++ b/lib/defines.mk
+@@ -1,5 +1,5 @@
+ CFLAGS ?= -O2 -g
+-BPF_CFLAGS ?= -Wno-visibility
++BPF_CFLAGS ?= -Wno-visibility -fno-stack-protector
+ BPF_TARGET ?= bpf
+ 
+ HAVE_FEATURES :=
diff --git a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch b/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch
new file mode 100644
index 000000000000..d805e1077c76
--- /dev/null
+++ b/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch
@@ -0,0 +1,36 @@
+
+From https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3
+
+From a7df567634af77381832a2212c5f5099b07734f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
+Date: Sat, 4 Mar 2023 20:07:39 +0100
+Subject: [PATCH] configure: Fix function detection for btf__type_cnt()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The configure check for btf__type_cnt() swapped two arguments in the
+check_libbpf_function() call in the configure script, leading to the check
+failing if LIBBPF_CFLAGS is non-empty. Make sure the arguments are in the
+right order, and also pass a proper NULL parameter in the check instead of
+a 0.
+
+Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 016c5bbd..62c2f883 100755
+--- a/configure
++++ b/configure
+@@ -272,7 +272,7 @@ check_libbpf_functions()
+ 
+     check_libbpf_function "perf_buffer__consume" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
+     check_libbpf_function "btf__load_from_kernel_by_id" "(0)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
+-    check_libbpf_function "btf__type_cnt" "(0)" "$LIBBPF_CFLAGS" "" "$LIBBPF_LDLIBS"
++    check_libbpf_function "btf__type_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
+     check_libbpf_function "bpf_object__next_map" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
+     check_libbpf_function "bpf_object__next_program" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
+     check_libbpf_function "bpf_program__insn_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS"
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
index 0dd14f1dc39b..e881553d3eed 100644
--- a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-libs/xdp-tools/xdp-tools-1.3.1.ebuild b/net-libs/xdp-tools/xdp-tools-1.3.1.ebuild
new file mode 100644
index 000000000000..99a0ac49879d
--- /dev/null
+++ b/net-libs/xdp-tools/xdp-tools-1.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The libxdp library and various tools for use with XDP"
+HOMEPAGE="https://github.com/xdp-project/xdp-tools"
+SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools"
+
+DEPEND="
+	dev-libs/libbpf:=
+	dev-util/bpftool
+	net-libs/libpcap
+	sys-libs/zlib
+	virtual/libelf
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/grep[pcre]
+	>=sys-devel/clang-11.0.0
+"
+
+# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
+QA_PREBUILT="usr/lib/bpf/*.o"
+
+MAKEOPTS+=" V=1"
+
+PATCHES=(
+	"${FILESDIR}"/1.3.1-disable-stack-protector.patch
+	"${FILESDIR}"/1.3.1-fix-btf__type_cnt-detection.patch
+)
+
+src_configure() {
+	export PRODUCTION=1
+	export DYNAMIC_LIBXDP=1
+	export FORCE_SYSTEM_LIBBPF=1
+	default
+}
+
+src_test() { :; }
+
+src_install() {
+	export PREFIX="${EPREFIX}/usr"
+	export LIBDIR="${PREFIX}/$(get_libdir)"
+	export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
+	default
+
+	# To remove the scripts/testing files that are installed.
+	rm -r "${ED}/usr/share/xdp-tools" || die
+	# We can't control static archive generation yet.
+	rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
+
+	use tools || { rm "${ED}/usr/sbin"/* || die; }
+
+	# These are ELF objects but BPF ones.
+	dostrip -x /usr/lib/bpf
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4f1547752d4d..3360ec85b33e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 2ba72401f0b2..3c878741a4d8 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -8,8 +8,10 @@ DIST fetchmail-6.4.27.tar.xz 1326668 BLAKE2B fb349f8e4b17929d8ab5ec144e2d6e4227b
 DIST fetchmail-6.4.33.tar.xz 1330708 BLAKE2B ca76a4315c47013edc27859f4e6a16eec2564718a04bc82e5df72520b1dfabd3c746cabc5eb01c24f1fb552a0a9ea55eb8d659c9b4f6c313c8d993baa88635e6 SHA512 b95b89eaecdc98a92e1542f1bbdc6e1e51d38d392b564462413b602b3d5ebb004e4f4354694e369e6aceb6724753db55957e31a290e231fded74f1f523af41ac
 DIST fetchmail-6.4.34.tar.xz 1331428 BLAKE2B 796972391a0ac2c71382aaaad3d75fd5c10ddcc58807f6c7ef9940907779e0ec0a8403e077b24afd50e1a7df0646e852cba02ba314e99ea423904e9f8288df01 SHA512 5ebb11dad48736647c879a81826a57719978029833254b67df6bd571842bcfe552589d49161e55b22a565728902558ace6fec9d9783392383da1a3150fb677b6
 DIST fetchmail-6.4.36.tar.xz 1203448 BLAKE2B eb2f68d8e9254bd1cabb20aa8058326ee1c1e6819fc2ce011943708018b455d4259a2cf21d6eec0a4898ee1768c14f32d3617302ad418ccfbf6746c75c92c1fa SHA512 c9658f7b79de5e4f1dcaee4eee9b3a0039295e9dff8be1fb6c4ad0c3513b9c2bd14dce58e9cbca974716dd805621c83948168659345c7c190f3cb6f06b544b5d
+DIST fetchmail-6.4.37.tar.xz 1202860 BLAKE2B 4dc7d116e9dc32c2ff070f669306d9f2c0f93d5638b748d7362d6c9ab8684ae7ed8e26278ecf63bf23e2fff27916f83f7287aff891bd90bad82793bb84775c40 SHA512 99a620380d9bd0713d76495f587adbcc95fc16e5fcb048dc528f3039ebd8fcfbb1e2f44e10fc25f70e50940ce89922ff39f1f3d724d1f47a8d4918a37c07d8d0
 EBUILD fetchmail-6.4.27.ebuild 2413 BLAKE2B dac439e07c3fa9e3e424c4d4f5eccfb30edc82fbe7e68941488dfe1c1a7d21d437d64e51b6f42d1cceb357027e54f69605a5506cca074df90caecf02ff8d7ca5 SHA512 158f5f7de400acfcc1c7d143a818135c74fbd7c9531525730c31956f44a3d5714fc39230d98d6e222ba347b2d490daefc419b11c5b80f41fb1bfc02544b7cc69
 EBUILD fetchmail-6.4.33.ebuild 2419 BLAKE2B 085ec954b8b155086f9b885adcf80678825ab2ed21a5b93977a8f741bcbd9ab37f9cca7dfad64d23471b01a7aec244d28f0273a0d16d5d39b8a8a931ddd15e4c SHA512 456ecc96077d27a1fba95a45909db9a34246a802af737418032d6ba35552a5a05617c7fdae90d5a8e39dc5bd42f2ad4332053ba39eaa6f4a9d92f55cc4f6444c
 EBUILD fetchmail-6.4.34.ebuild 2419 BLAKE2B 085ec954b8b155086f9b885adcf80678825ab2ed21a5b93977a8f741bcbd9ab37f9cca7dfad64d23471b01a7aec244d28f0273a0d16d5d39b8a8a931ddd15e4c SHA512 456ecc96077d27a1fba95a45909db9a34246a802af737418032d6ba35552a5a05617c7fdae90d5a8e39dc5bd42f2ad4332053ba39eaa6f4a9d92f55cc4f6444c
 EBUILD fetchmail-6.4.36.ebuild 2042 BLAKE2B 48e62ead20eb7a3ed7f4d4eb4204ed471493998e71b161b815fc04d4c5538c912eae21d468eab16f9679fc35b2959f517ccea186b7bacb2f2bb8bf0993e7aa3b SHA512 6c282895be9dfc6c38e649ea8d0f2aa42696624c19493c24cf9bb8de4d6863366142a30a3ab4de28276d75419faa60c23c101f668249e4ef375c4ba60b018289
+EBUILD fetchmail-6.4.37.ebuild 2042 BLAKE2B 48e62ead20eb7a3ed7f4d4eb4204ed471493998e71b161b815fc04d4c5538c912eae21d468eab16f9679fc35b2959f517ccea186b7bacb2f2bb8bf0993e7aa3b SHA512 6c282895be9dfc6c38e649ea8d0f2aa42696624c19493c24cf9bb8de4d6863366142a30a3ab4de28276d75419faa60c23c101f668249e4ef375c4ba60b018289
 MISC metadata.xml 522 BLAKE2B 34e08c52e9391d8f01d717516857cde4c2c77af269d587a29ce6d6e3c6c2e989898f5afcb1240f6718dbdb18be2700b66980f5a684c253c69ed4123e6bb6905e SHA512 8c6fd6c541834669a9518b31859990c8d6e9946e35bc1aa00bf2e0c1822392508ff712119005b97f5e85ca74e97c0d5cf3ced5798a388c23f9c8fd959feaf8cc
diff --git a/net-mail/fetchmail/fetchmail-6.4.37.ebuild b/net-mail/fetchmail/fetchmail-6.4.37.ebuild
new file mode 100644
index 000000000000..524c47fe5b3b
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.37.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		>=dev-libs/openssl-1.1.1:=
+	)
+	kerberos? (
+		virtual/krb5
+		>=dev-libs/openssl-1.0.2:=
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-fs/e2fsprogs )
+	socks? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 7a545b277ac2..36f7f88829dc 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,5 +3,5 @@ AUX mu-1.8.13-add-cstdint-inc.patch 1158 BLAKE2B 6f8b7529c6a8b6f432303ee7aac811d
 DIST mu-1.8.13.tar.xz 543696 BLAKE2B 7e96040b12630d8dd1320475e8b7e62b7f349767d331237838e2dd092df51c4f94cf8605d1266d26f4d2fa9aa092ba03546ed21968448302c3a12495702e46bb SHA512 c9dd7564070191e251e8e072042c0d2957e9c9c31064aececf24b9dc99a9b51c6bd60138e88bd86f175365775e98ba49e3bdb5bea02f7738b5e1e68efd7e1a7c
 DIST mu-1.8.14.tar.xz 543828 BLAKE2B d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c SHA512 8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
 EBUILD mu-1.8.13.ebuild 2166 BLAKE2B 9d7bbb994a7d91528e80276d52a9e0944b86826d867d082e56db2297af23e7ae318a64016e1b945fd212757d4c65cfd45bfbb2088629d0ca61e049c07587f32b SHA512 e949d9e9a7fe1ea1141100abf67f21da7cdd73b045389c5ca933d40ad5a7e8c338a3c3837ba51d336b5ea37b21251a60b4fcac17e244f2478893056e2d1f4890
-EBUILD mu-1.8.14.ebuild 2173 BLAKE2B 771ec59a30fb656e018ce37148f5d1cc03b9431f7d27c5ca72dfaf9c26594044f4f6176583e41faae4be83aafa6e229bf7e8dbf4bd9e92b93cd4f05e344eaad3 SHA512 d2cc6c4eaa6e65ec55c9236cedf71a05011b154b0eb0503ee48fbcf1f437c3e05ec2d3416fac77fda66532151c6d84473a327a1ffe0695925abcd4cf0762f7d7
+EBUILD mu-1.8.14.ebuild 2169 BLAKE2B 01445458f171ac1bc539ca9eaf864e9b68978728dea36cdf476a790e4c19bc539d4da42480e1873ae8d3d4abc1d2c4ede618985f854edc5b4857d6a151b4e1d1 SHA512 a40006f6380b5411263189f40f1f77ca8a74a3d42d232678b118e9d1320df3d0e84301bbdffeae1378a694cf871bac8800aad7231d0e2b735e171cfddd5e56b5
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.8.14.ebuild b/net-mail/mu/mu-1.8.14.ebuild
index 508631d8e85f..f04ccccfcf43 100644
--- a/net-mail/mu/mu-1.8.14.ebuild
+++ b/net-mail/mu/mu-1.8.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
 IUSE="emacs readline"
 
 DEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 0f47e13aa75e..412464ba4f1e 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index a9f25c285890..c45e29523488 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,10 +3,7 @@ AUX dropbear-2022.82-tests.patch 820 BLAKE2B 8b8d7bbc80962fd4be56078d54c12097bd6
 AUX dropbear-2022.82-x11.patch 636 BLAKE2B 89e95851d9f184d215f1e6ffd972f9519be8ef0c153d49306c3fe09b97c8e3ae4b8c1705c0f1532681c4d5e49f17f6f85f8c75667f2340d3cdd1a1e52a9795cf SHA512 ceacd4776d3c7b4c830bdded66e61b77c8e267fdcc0f0b42fd0ad4981610bdcfca98e2dc14c48eac5681035f2e7f0644553dfb419424d1536bf4f7b81e577f6c
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
-DIST dropbear-2022.82.tar.bz2 2309514 BLAKE2B 56ff931de1e5681850a4c96b8f2c1d90db1680a08a8a741ae3034a433c2780715ede9754357477c9adfe35a310859641d7a03534e6a656e11cd7de8832fbc27d SHA512 94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b
-DIST dropbear-2022.82.tar.bz2.asc 833 BLAKE2B 7d152456f24a61add2935e7f2c9ae7a05e00137ae2c39638004cccc1fd0491311328b5e829443cbe727ae6ec9d58973270b917bae0f23ddcef0b5051b62ca60b SHA512 a45fa49857598195b8d7e51e02bf26498a74c6900245c114ce1fa19bc4eb0ef0518cbb68996c3584c0b98c22bb2078eb963e4a513f0dfb03baae6d04f5911105
 DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
 DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad
-EBUILD dropbear-2022.82.ebuild 4489 BLAKE2B d0ca38f8dfd5902126ea88fbc772c3d6e255830ba4f3b2bb5da23b4d05f19c760ced8127561da3df743ea715c3154d1c2857679dc3f1d07d7c0b91e98f11161b SHA512 3a9a2faa99a8af452ec1a806bbaea4585ee5e3b80f690a13f0eed9ce68cba59c45a8f0b287f5faddb60211d86120313a5f9286f0fa231a9abf4e719d888a8e86
 EBUILD dropbear-2022.83.ebuild 4449 BLAKE2B 5b4253b6ef3baff91c5106c67c78fb75ff0dbbd6690399b2d7802fedf6fc001fde7556d8fca2b1c13766b5138e33cf90e2dee2c33f3242aec9fd983cf555a59e SHA512 56f7dabf5fb251cb528065f70ae1a56d99dfeb72dadc969cf26b7b9dc2321ad1e3b371e0c2a3e596a9264743373fc0252b0ada721194745b7bba317d0a298313
 MISC metadata.xml 1814 BLAKE2B 77ddfd966cd18b81304eb8f43cccaecf1ee223896a5cbba75d3ec7140b9ee871ff83a3d7a938198f8fe29df4b30f61d2bb7d9a5058018ec4694f53667c7e83f7 SHA512 ed7051343a78900724eb077cc985d68d614902e2edc01e014d2b685158f143c67fee863599f0a40f318bed9dea81091d756e15d07e1e20ff1e9961b2f4e0f34e
diff --git a/net-misc/dropbear/dropbear-2022.82.ebuild b/net-misc/dropbear/dropbear-2022.82.ebuild
deleted file mode 100644
index 38dd3c97bd88..000000000000
--- a/net-misc/dropbear/dropbear-2022.82.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dropbear.asc
-inherit savedconfig pam python-any-r1 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 ~ia64 ~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 ) 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? (
-		$(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}-0.46-dbscp.patch
-	"${FILESDIR}"/${PN}-2022.82-x11.patch
-	"${FILESDIR}"/${PN}-2022.82-tests.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex 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
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i svr-authpam.c || die
-	restore_config localoptions.h
-}
-
-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[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin || 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 ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}" || 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/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 07d0c81315db..f9a073bb6253 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -9,6 +9,6 @@ EBUILD gallery-dl-1.24.1.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995
 EBUILD gallery-dl-1.24.2.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
 EBUILD gallery-dl-1.24.3.ebuild 1010 BLAKE2B 850bcffc0db807934fdbeb76a4f9227a2114ca2fb51f2b5303bc48bce23e0dccbfb3e3a7eae0e803c94b033aa98fa9a4491726bd5d2f090213007ff502435fe1 SHA512 dcc72fa9e34ba9898083bae3406860a3d6449b95a436886e1bb552724cdddb24cf6cb78bfc427ff88c49df3e3596328cbf42030a327fde84dc94b2ca30cee354
 EBUILD gallery-dl-1.24.4.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
-EBUILD gallery-dl-1.24.5.ebuild 1004 BLAKE2B cbb7dc2fa2054c00c1cafcf4f8be9311c4ae16a55bc1a91698b1bcc90aeeb363eeb3ffe66fc9ca2f8fd78a790210422e86124dda83ebe5234e7e6088f08ba130 SHA512 ad62e46159bbbed9851bcdb976d64da3601e9fa9757f8a16eeea0b0c9f963cf31aab5630c8ed7dc5d64daf9e59c068250ee0ad526bce9306fcb72ec34c1dbc01
+EBUILD gallery-dl-1.24.5.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
 EBUILD gallery-dl-9999.ebuild 1010 BLAKE2B 850bcffc0db807934fdbeb76a4f9227a2114ca2fb51f2b5303bc48bce23e0dccbfb3e3a7eae0e803c94b033aa98fa9a4491726bd5d2f090213007ff502435fe1 SHA512 dcc72fa9e34ba9898083bae3406860a3d6449b95a436886e1bb552724cdddb24cf6cb78bfc427ff88c49df3e3596328cbf42030a327fde84dc94b2ca30cee354
 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/gallery-dl-1.24.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.24.5.ebuild
index f0216d56b30a..f6cab0159f71 100644
--- a/net-misc/gallery-dl/gallery-dl-1.24.5.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.24.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 19506300adb2..89b59d1d0628 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,4 +1,4 @@
 AUX 363.patch 579 BLAKE2B 7402bde852b1317fd0f072902a8475c5e55e55b7001e8a87d834f7ddf6ae6c21d2f7df387df73ec64ac49086565efc131eb098c64568a9fbe6f5a48ad4a78e57 SHA512 9c4d73105309bb25e03d692313c46c5281b8b0b1f1f3f4fb7bfdd5d167d642e966203024d675d9139ca92de72a2d796819f04e8940da9c8bbb746eb8b5ed615f
 DIST grive-0.5.2_pre20211128.tar.gz 171412 BLAKE2B 62e966917959ed4306a7a787948bc1533cca6a5521f262450658c81f6dc88cb7914df6c3a8271d87fdc189ff74ada421f76c38bd9b89157cd27ef0f2ba531e67 SHA512 33e6a382f979a0a7a6c4236bce1779bbda0b3817b7d2f1750f6759350d7de79bd999bd0f4f7cb72fd32586683053ef1d21dc830403a9d1225b6e9a3408f830fa
 EBUILD grive-0.5.2_pre20211128-r1.ebuild 841 BLAKE2B 088460e3ef13a0af65753ef8ca914c22be72e830b0a3ae8d05b33a891c902190dac1522f5fab9705b9be2f0010ed5d8bbb903c60f634cf73f695daa0836ccd07 SHA512 14a6985e97670d42f3d238703ebec02909f38e9a01361766fdd226ea26eafbe706f3ba79112f1a87b194f1921089142b77eae82761df83819cd24b8a337d067b
-MISC metadata.xml 330 BLAKE2B 92f51d3512032afcce83d09f6543814fac1f75b79e89f9d350654d4f3954fd4a77afc9f3f5f2a27c8c1e57f22829ef27643383c0a9e58ca035c1a16e5d38cde5 SHA512 ddc7be8e9e3f6e5069c5a048e77e0d1de84d39ab7377ab89078ed446225e5a37d4bf5959d4761ba2bb954dc046c4b83a7418705b8e7e3565595200b4a4a0bc63
+MISC metadata.xml 244 BLAKE2B 1e0f2b66316d0cecbe9c2030d370a8ac86b1a30cbcf823eb974af1fca713007d11bd703f0a2e0f94972ae24bd2a087488f7629492f7d5840dc6fdcffb1a4fc93 SHA512 04a6e732d26a3bc0141fede68bc2e8ef0dfe133f8b84a3248437ebc6dad07530539b736f60b291cb8a055ee39fb88f65b3f4295738442f3c57d425db5b1af343
diff --git a/net-misc/grive/metadata.xml b/net-misc/grive/metadata.xml
index ec69db578ff8..cd02838d531c 100644
--- a/net-misc/grive/metadata.xml
+++ b/net-misc/grive/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Grive/grive</remote-id>
 	</upstream>
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 60c51afec831..494a586ab32e 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -12,5 +12,5 @@ EBUILD seafile-client-8.0.5.ebuild 1284 BLAKE2B 92adfa6c77231055f9eb3aea1328d603
 EBUILD seafile-client-8.0.6.ebuild 1354 BLAKE2B 43fc1d5e23cf923987f40eda58710df6bbe3e9e7a8fd9a587e3eb63d8330d7540c178229c7aa7a22b7f21979c6719e51efbf503783e75197c2ba318e7bbcbb18 SHA512 ae7adbec5df2758067c76f6b3fc731b7d403365835fc772661e0deef26538fefbc234f7112eeb9dc27708808f72bc2cb4d39f24e67be5803afa8e2b13d8f99c6
 EBUILD seafile-client-8.0.7.ebuild 1354 BLAKE2B 8639a80b834fe820379c1ff448f4ca72e9e7b066ba0a5e31eda1148f0f8320f6f880fe191fe6627977ef69f76796a251ae6b733d3a42702e3d4adddd5e94edbc SHA512 c4c5e5c406d74403ba20328727b4477a8e926f842f08015855ae0f52d207f8e0613a919d4b7bf5c1aa301e476da4259701faff0e864ae95a4245116ff3a7e3b4
 EBUILD seafile-client-8.0.8.ebuild 1365 BLAKE2B 7a02169719ffe3816d3209aa4185d2ed388f125ca00390f37a00c35c533d89888c2850ab319ce5ce33cd0347bad55d1094dd0caaed5e89f78a6f85f8532a3a3b SHA512 8ca4ef6606d68cdf2191400d15112c4dfc17978a1517b20151e9bda2dcc44f8ac3f2072e8cfaeff1a8c99b1528243df25d2fcfe0c9a04499477967a7f8e43c89
-EBUILD seafile-client-8.0.9.ebuild 1365 BLAKE2B a3528a4631d3904a6a583fc01534c40571a24246e2680f8123491953c7175f639dfe2621e8f5cb637a20cdd4d28e603de4ad4c2698b02f88d4fd9cd01b427bba SHA512 2e71e8a27a845e3b810880a2e0ad3e695e89c888286397d15c19866e5d3f63e275ea586f2ffa3d1d30ed6caf3c82c57879e6a24dde71d11cd1d706f8984ca057
+EBUILD seafile-client-8.0.9.ebuild 1364 BLAKE2B dd01f6e027e8ad4bc1c939cf6fb6f50e759791da2fdfec8f15fc675a9968d27c3c42f5fc75a7ab420710bca87401abeca45297618a682669a47499d0a124a889 SHA512 df6a985b3f2e17a50d96386f3b928f25ff7cd986e33f47c0a491300aed7f2884d6348fe86a1c05908153f01e65980b56e7658988efd7841badb47c2f9aa3df11
 MISC metadata.xml 577 BLAKE2B 2370893b5c79210e63c40cd24532db7f376f57bce60728359b8645dc77717e4453fd9e2abf95d7c67882104a88c402585c0493c0a52ca0f84eceafb2928d338a SHA512 810d37c18e32318a1e9797186d2d1f3c74adfb6366fa8d9ffc966adc46779e352550d5e01ac73a9fd259d14fe0d931e37835f2ccf5f42648e3a6a40c3029ad10
diff --git a/net-misc/seafile-client/seafile-client-8.0.9.ebuild b/net-misc/seafile-client/seafile-client-8.0.9.ebuild
index cef038e3e2f6..54a7323dc84f 100644
--- a/net-misc/seafile-client/seafile-client-8.0.9.ebuild
+++ b/net-misc/seafile-client/seafile-client-8.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="shibboleth test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 20d026d563c6..3c71ac8ac6de 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -9,5 +9,5 @@ EBUILD seafile-8.0.5.ebuild 1329 BLAKE2B 11e9838c757c48ca90916ade9cfac9db5b545db
 EBUILD seafile-8.0.6.ebuild 1393 BLAKE2B 3fa0a34fb17399d3724ad7cbfac6ea558d5c0965cfe1dafec8d12faf3e35b3357b02de0d4b49136eea00c7021b1038eb76c5ff9d3104e91e3d366ea37e2db8cc SHA512 67e08eb445368814eb331f168b13001996e86c804e524884d4263fd18fa5cfc5bc7363dfa8b2ca9154579aa09ee0ca2689bb3cd05b60581a64513ba7c53d7321
 EBUILD seafile-8.0.7.ebuild 1393 BLAKE2B 79830e7751da393f7b3559c753e4864754596970d43b442385bda1c43b77ca6b62c57a7602e57bc7850b4021d77c0a34b60503857bf6f8ad65d9b69ba0f488e4 SHA512 5ff682a144348454ad881738723a0b530278ada4dea0d1d9c62547c25ba6dd07c8027eb2f598f141e1d7d5adda8750825b3bbc0f1a566f30bc95801336656977
 EBUILD seafile-8.0.8.ebuild 1393 BLAKE2B 5eb618589caa71cbde3a5447b9753d793b300983afe0c334318ebad090df184ce84c93de18e369a27fe76c1e3faaa675bc07b77c8da40584d260dbabe83f02ae SHA512 ab2ea3becaac538103a74f3a951a877825a1cd88d2da61bef38c42462317c49ad5f8b2dcb80ab0d4e6991b68245dfc3e22394fccbe18b9a11e0ec27b3e1a89fe
-EBUILD seafile-8.0.9.ebuild 1432 BLAKE2B b62f2a7bc86cf51ad2623d167f8cc941476d951b025288e4f18e41627e009249d4b99c55f9f30cd922239207745ec7b8fdd79a29e0c398e5161339db9358dea8 SHA512 7500c290c8e0db7703bf190b6e370285d9747fdd8a941acdaeb66a2225b7ec0adf6163d5f8fa5979d12b2f0c5de6ec82aba702854ae8d53d0ef0b9a87256d73d
+EBUILD seafile-8.0.9.ebuild 1431 BLAKE2B 03afc43ac78c426a697ff55a361bfca2de02f9939c9a4d18b88b6e020a286dab2b5c3e7f14455874c8493bcef4da3c9934a400aa6d2700b2a657773a24bc3a9d SHA512 58bc9821ba6cbb488d3057ab3f6dda2c7e7ca3592d8d93387b6c1d8fedce1dfef3c36b6093ab46e92a2be3dc03a2920188631ce1b5c6824c9f549e7c1f4bc28c
 MISC metadata.xml 478 BLAKE2B 2c1506537c1d19f3aa9f731cecf2f53181bdfb92c33d3100e8338e778e222b396ebfd5c7f5745e133583615ca61be625787792d39d3772cede50f8b923ab1a4f SHA512 20620dd548eec869bb219011b157d821cc3fd939602d2662c26e1148582c2a593375b36085fae939880e01d76a251e91f35b9ad657cbad0a1e27bdfdc46b932c
diff --git a/net-misc/seafile/seafile-8.0.9.ebuild b/net-misc/seafile/seafile-8.0.9.ebuild
index a121bb8879e4..f680a1d1fcb4 100644
--- a/net-misc/seafile/seafile-8.0.9.ebuild
+++ b/net-misc/seafile/seafile-8.0.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 88da50d02158..4f42e2fa44e4 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -5,6 +5,6 @@ DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338f
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.4.3.ebuild 1846 BLAKE2B 51b7d2f01afd4efec5338d1d38aa53dc287f8493424206b0d1a60ad86b0e250c209a82b61164a6b3d2768c5619d94b9b216ae8cec55541f3a276795d2f523201 SHA512 3958922ef28097cdca8ee392c1e45e7947603e6bbd3fa397055145f00fb94728b762c59fab722d7b25b33298f073d08f05bdc82f3634c6c2cc56c687fda3e320
-EBUILD socat-1.7.4.4.ebuild 1518 BLAKE2B de5f1bd1cc11a80b448eda53a56f90b0aad64f40c27fbd23e64d3ab25ec489547eaba9aa0b193eb371a364550437eba9d370b3f309701f5f5af70333d0added8 SHA512 af25a46252d07d3d30f57060fecf725b297c93ae69646443ff5ae74cf4a7f3b02d309dc9e303187cab16887ce3c8e576f983dc6d5783b2b7201475a1ca0f1b17
+EBUILD socat-1.7.4.4.ebuild 1516 BLAKE2B d2a2be258287e57b9b8b62db14870a2b3871e5498d6a15b835d183888c088e12265d4602912cdc3408121df9fec1de1226e3812f45dfee6d21c4d153ec4b9ed6 SHA512 4de4667635deb2d4d139e5a3dcf9e7fc324a2bdffb277bdb303af659202a73cb45275dc1ecdbba6deedb9368c5a4be63c651453c0347942c244c217040e70edc
 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.7.4.4.ebuild b/net-misc/socat/socat-1.7.4.4.ebuild
index 3f54f0cc5825..26efc8a7d17f 100644
--- a/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/net-misc/socat/socat-1.7.4.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index f8ee6fd2c8ac..3519910c2010 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,4 +1,6 @@
 DIST yt-dlp-2023.03.03.tar.gz 5113424 BLAKE2B f20e255e32de15c3d25be2b2d73b526281f84dc2cc92667fa2d8887002559873c74aab98ce6f102705391e6621c8423d0e13f8fe2d01f47cbffa061b2fa74aa2 SHA512 179b96697d44d6bde6ca4f99ef90c70ce4b45d25c919e93355bc479765ee9ccaf37d19768b273b05d8018e1d19cd795acd735de8f62e5f160c446fd0feb4e7de
+DIST yt-dlp-2023.03.04.tar.gz 5125843 BLAKE2B 8c2a610b98e83b6aa4b4daaaaaaf805a2e780a38af21168a90f305196f14716df5830235a600278158a7e3a758e3a5daf56e88cbaa38f4675b52a7bfbfdb1dd2 SHA512 3220ad0d7445351e5786b5ff1634b633a601f64216813129056d0c8470ce8afa2e6df6d402a9381980df6611e9341039cb7f576dfd444b05fbb1417ba1aced52
 EBUILD yt-dlp-2023.03.03.ebuild 1910 BLAKE2B fa2ac85fa66dde95dd6805902940cfafcf154c3983f34de502601bf6412068cf039d099a185a6c18ef8957ed3b889b38acecc6b95afa3151fd576bb101bc763b SHA512 779cdaa34655c191515e0e0ec6b5ae6441b87fb6dbc66f6a25b05d9920e54531f6e8dfd1d9272ba014aa613bc8632b88a4f91a42535eecaf9920d53842c4dd09
+EBUILD yt-dlp-2023.03.04.ebuild 1910 BLAKE2B fa2ac85fa66dde95dd6805902940cfafcf154c3983f34de502601bf6412068cf039d099a185a6c18ef8957ed3b889b38acecc6b95afa3151fd576bb101bc763b SHA512 779cdaa34655c191515e0e0ec6b5ae6441b87fb6dbc66f6a25b05d9920e54531f6e8dfd1d9272ba014aa613bc8632b88a4f91a42535eecaf9920d53842c4dd09
 EBUILD yt-dlp-9999.ebuild 2032 BLAKE2B f621518216ab8ac6cac20a2083cce0f6f16133507fd09a2384d38504fa8bde43a7dc56903da889a87c477a4991204b266b02f5488ccc325819fde84c4a188ff6 SHA512 c623116051f3c327ebe130807b91aebf0de62f3593f70d41d7e2b7e4f60112223f8951645b860ce7817fe37acd0612c600a1020b1754cf7d15626927f65aa03f
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2023.03.04.ebuild b/net-misc/yt-dlp/yt-dlp-2023.03.04.ebuild
new file mode 100644
index 000000000000..59b22a558dd2
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2023.03.04.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl[-yt-dlp(-)]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri requirements.txt \
+		-e "s/^(pycryptodome)x/\1/" \
+		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
+}
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ba8cb9e2b797..e3eeeca2ce6d 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 541652ac1ffc..2da622782c6b 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,5 +5,5 @@ DIST cups-filters-1.28.17.tar.xz 1516052 BLAKE2B 87258391901d55d9e59b06d54603d01
 EBUILD cups-filters-1.28.15-r1.ebuild 3287 BLAKE2B bcc2f0b85f735c1a7c10c1e32a9bd3c6fb975c22e00a33bb082188f9136cb77319d461dc40706b61b601376469b4a16be7826f05fe86f6092330fe8c5bf26f2b SHA512 d0d2117ea64feacc1eb3e6683099f8f79dbe47b060de4dce9e31f784db6b9668d1d993c641747c8ce52d03fcf757f7999e1344aeb636ca725a1e342436c008e8
 EBUILD cups-filters-1.28.16-r3.ebuild 3572 BLAKE2B 79f2d5c3416a3e7057babe51899bf91590cda9e860593d9c6cc0b4d3ee60a01451a8198e501df620de9a25c5d6b523a4ac6013905700dbfe55c0ac5c0e7bad39 SHA512 fd03ca153effb3abaa814a9fcefc0d1f53fb9d0f8bb829076bd88452a35b9d968c4c31f9519e4004a3d38d6c8c204d3294ff7aadf10eded3f9932f5ef194aef9
 EBUILD cups-filters-1.28.17-r1.ebuild 3576 BLAKE2B 3982e0a8a5c8eeec28b32d73e6838dfdbcf1065e118c0639e952d24f2e03860f5931c32041086b716497b269a30fd4b3075b536250868f05a817fe893888899c SHA512 d5808dd65a71abf095fc0dd3f5b3d3eb2a2bf1013527af97bedbcdba81b95591826db1d9d3350bf8c9cbf05abba460a45aee8f3a25d7f6402fad1615741089d1
-EBUILD cups-filters-1.28.17.ebuild 3660 BLAKE2B d184248f003fab5d1f0d9b086378e69c8696d555ee7de6cd746cd0137153d47119f2ca7e9f3924788f1b77d9da7e2c69b31bc862e9bc9b08c9fd3ddb42884fdd SHA512 772bc4937e71fc90a4de1efe9cb21e93a0dd000ff741d3a06ad41a8e12618dcd81b6d2993f4b80e4bb1ac2e2014d683501d301f7665285ba8b47e6f0dbcfe6c6
+EBUILD cups-filters-1.28.17.ebuild 3659 BLAKE2B 70dc2fd7391875e03b2285a9c303c78a51225d732f8e5cb25e24e75074b009c50344a11054b26e35138f6f8fd5fccb8273629474fa56d2cdfed6273f5ec454f7 SHA512 5341d72eed53c821ec7399bdcce3864fc6e343df4c6cbd4caa3079feff91026ab20221eadc40b64bf9ec665aad61823e13bf5165483f491d768659b4a517099e
 MISC metadata.xml 513 BLAKE2B b265a1645fe0da46a309086d9495564020ea15b7546237dc040589cba2e5d79540860301f8f72484081b726066414ad0414963b7c7c2ce3f08af898502c32521 SHA512 b9234992f05d59bffafb31f3d035e554389f250d8f3b951bb507e300f7cd3a6806406df60b1cae038ab330b3513934ec1250dcf0c9bfdba1bb033e6545727597
diff --git a/net-print/cups-filters/cups-filters-1.28.17.ebuild b/net-print/cups-filters/cups-filters-1.28.17.ebuild
index b2de28db08c7..7b8e6d1c70c0 100644
--- a/net-print/cups-filters/cups-filters-1.28.17.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="MIT GPL-2"
 SLOT="0"
 IUSE="dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RESTRICT="!test? ( test )"
 
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 06cebd9de75d..b448aba30fe4 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,9 +1,7 @@
 AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027
 AUX epson-inkjet-printer-escpr-1.7.7-fnocommon.patch 309 BLAKE2B 70e10c99dcf8b5d06acd38722f419c09f994253538d88cc9621051ee58b8a9cbe203c35c279c9ef8b5f0f7cd091118a0b2ccf802e09e2996f4e6346e7927f695 SHA512 5cff64797453868d1d0540a22fd72b53d7214d2e9c574cdf635206baf71fc227147babcfe97c73193ca356ad40afa5bb7ea80107576efee138b936e052b9fb2d
 DIST epson-inkjet-printer-escpr-1.7.22-1lsb3.2.tar.gz 5376867 BLAKE2B f512ec20af24fe68a1b2eb5061247743682407eed92345286148d9b7e236d1fb785280f366aad8bbc89e2e473f8e93bcb33f735e05319931a1a6eba46886879b SHA512 2e5ffefff8c5431c584658768e130ef3373a0a008aa6a6c5c3d6bec8760a263442a9180455de5dc38e9d3dafeb9a22944e551e9552f9efb6d4cac71205574e49
-DIST epson-inkjet-printer-escpr-1.7.24-1lsb3.2.tar.gz 5451632 BLAKE2B a6d6855763cc749ce99e89be3f9bf91206725a7db905d61ccfe6e842d317d4b3dc76ee4218f867e32ceabd08bdaa880ee28df6731710bf4087d760dbe4133405 SHA512 b3861c407545887c89745c4dbbe84976938b1f3e5b83a84bd649d1249efb02cada2eaa5ad015abe0c96747a01af3cf801caf5f1252a35b5d6f2edaae78c0a596
 DIST epson-inkjet-printer-escpr-1.7.25-1lsb3.2.tar.gz 5469974 BLAKE2B e33ef049efa230a9b12804cc60c8fff1bd3ae91e895a5b4b6c73e5b6aae0a579d8857bb0d8bbb71043f7a855a0397ab397f4bf0f073f83e2116ebd2b957326a8 SHA512 8d4ff61c33131ab8b2a608399b571afdc502e03efb8c9d0241638101859adab51543f892744af29ef1a86c1616fac82dd6bf5df51a5436fadb667e6194be6570
 EBUILD epson-inkjet-printer-escpr-1.7.22.ebuild 883 BLAKE2B 100ddf1c54751f5b921130aaeee49651038e0f90b01ae6521566b8482d1d5ddfb27012a9b4fa69c7a1a9d5c44a15acff152dc160210b3df1e816f4d6379d72ac SHA512 b48f39f7305509e34268c0769ab4e2989803fe2dc4e62b4884cad8ef2087c7c6efcd9db2886703cf344dda5f2d9eb616b1338fa26d4ddfd91370d98dfc1a0e41
-EBUILD epson-inkjet-printer-escpr-1.7.24.ebuild 885 BLAKE2B 30d532afa68c54b08e46915ab31992667f83f3eacbe7e4b68738aef67cafbec31dad1747b3f5bfa377b42b656097c70b2f0f0a8a744d60f746151581bae55a59 SHA512 52292e0f29a5fece68929cf497ac77483e94455857c321f24b139f1511e69d588c92854713d220391f109e58ccdd7ec7103ddd9bea493679442450c3983efbba
 EBUILD epson-inkjet-printer-escpr-1.7.25.ebuild 885 BLAKE2B 1863db6b09b44fc788a7cdbc6caaf6bb9ef4e0cd862dd194b5e6a56b24a74c719c3d1042b631ba755dca0072dd86cf18c43af7c057462fec0b000006ebb6d8a2 SHA512 7bfee0589b6d04f47fda50468e51a63c391c3f63b324cbb0beb6d6df7c79eb4d41ed2be82864420536d3eb6a753a3db220e616fa670c7bdb99b24efc0634a608
 MISC metadata.xml 264 BLAKE2B 3b2c0ccd6bcc91f31c816e8e781976b3c65f16c7f3cfb73c96d3f5ab6df6d4d035ef385d821062afb81e917fc98adf7e77e96780c84f56da7f3a263824e0a6d0 SHA512 fb5a26534c5a78f4168ce051280353e57b0a48885f41c7ff992a12a6d8c28582d625f645f3ddc1f271a2a72475bd827c3e0385a319b4f3bdaf095fbf205a9ea7
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.24.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.24.ebuild
deleted file mode 100644
index 918a430445f4..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/14/31/90/d2f5b28fcfaa0a1d1753eac5703aa5d88004ce06/${P}-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-	"${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 6c073f80733e..599e5df773b1 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,6 @@
 DIST hplip-3.22.10.tar.gz 29333247 BLAKE2B 484f470cb1ca639f6bbfa380230e94d8d219c2bc65a145e410e0be6c47ac82e7ac177d5d12a1ef9401682da2db6c7eba97424c2b2f9a2435b17f3a9ab4114e83 SHA512 0be9cd48cddebffb2472f36669ba92edbcf9019cb3b561a9630457949a6e6f13eab552582027b02468b4732e376f17321929502ad4d1f6bb4d5ea1262b171ef7
 DIST hplip-3.22.6-patches-1.tar.xz 17948 BLAKE2B ab6f0482dfebba2a1974cf6adb8037846a7e8990f15a74641af4db73d363b02d7c37baf958a8a9e83eebfc8bcccd058959c3cee448a832b26fd8a2097614c4fd SHA512 a6e3921d15ab75386f71a5e4a1aab48a014279cffd5141b152a7c1e985c7685892fd555eeb5578ab5f266ce8763c98d30d4630c3ec69ba1209a9856d6d5b0ead
 DIST hplip-3.22.6.tar.gz 29331408 BLAKE2B 7f2bc09ab2d7950d8e84b4c23d35fd5370ddc51d1d61c674fad0ce1667f8ecf9c25e0b57c155b688d932db583d3c6af528da86348ebe64ce8da9c8d051b2be34 SHA512 cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e
-EBUILD hplip-3.22.10.ebuild 8244 BLAKE2B 5b66c9e9906639c4fb37bcaf4b940463f36d321dec6d367080ad19e6b721974a364f4acf68efbae4ad025b0256cb9bd97bfe33be76148a86eef1369abb4d00fd SHA512 04da6907a35650a0fedf2e31fda7d18e7d98baf36e332721a98ead8921e55c58fe8b6ee3b61b21672d82a244a4fbe160ff6da9961435c43f44794350af2b9af9
+EBUILD hplip-3.22.10.ebuild 8238 BLAKE2B 182e52dcd51fc2ae896db48812e1dc79186dbf50dbf24bf0b3d1727f2b353d60666ca51104b0fd3f77f62a97aaa2a192d53fd1ff4a5ac6bf6248808a816613ef SHA512 a5ff0a6ea75fe57a968aa3a52e06dbb13566c5e11f9565173d74d8d2bd0ba7f2d8d7fe2b3a369c96e1a31e1a52d30ee42e6a15d0af05db2d775aae0b4d008d32
 EBUILD hplip-3.22.6.ebuild 8238 BLAKE2B 182e52dcd51fc2ae896db48812e1dc79186dbf50dbf24bf0b3d1727f2b353d60666ca51104b0fd3f77f62a97aaa2a192d53fd1ff4a5ac6bf6248808a816613ef SHA512 a5ff0a6ea75fe57a968aa3a52e06dbb13566c5e11f9565173d74d8d2bd0ba7f2d8d7fe2b3a369c96e1a31e1a52d30ee42e6a15d0af05db2d775aae0b4d008d32
 MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3
diff --git a/net-print/hplip/hplip-3.22.10.ebuild b/net-print/hplip/hplip-3.22.10.ebuild
index 2de036027cb7..5ea1e6ba436f 100644
--- a/net-print/hplip/hplip-3.22.10.ebuild
+++ b/net-print/hplip/hplip-3.22.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 1f8e28d1a8b4..68c935a07c5d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index ff24841ad22d..27323c01b474 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,10 +1,8 @@
 AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f
-DIST libreswan-4.6.tar.gz 3579760 BLAKE2B 56099e753d9da882ea9e4b7966706f39bac36cd88adcba5fa1c3201cbe0a2ba7a02042cb9eeb8fd52a7b1ba0f3128b854114abc748fe9bf6d9059937a72eb0e4 SHA512 c1c3efd7665dee6caaf08cb5aa50fcd37c299acad4b62648284fdb04edd50ba8fc8d33a9fb210edaf2312697f8cd251f33a6b16587eb2cfefd1269b4482dd499
+DIST libreswan-4.10.tar.gz 3709767 BLAKE2B 0b2ef7c99d77e175425fbd2cfd1a42a2e1f080d0af35833b9bddf9ba26fc3fa1649d8d1c653f58e27b21e869581e861ed27f6c2a81ee0590b7f3866ea8f2403a SHA512 757cf38dcc46541d2f9d35b3368d0fcbd254dd0440718d053ce693f7d4295d7223e4c77166cd353e7c461516b319a921fa961d1c5bbaf49cf249e4167abc7240
 DIST libreswan-4.7.tar.gz 3684167 BLAKE2B bf55be53d1034ab7706b183a7c5c3556f361ffd9453df41b03c0b03ff256ed81541365af7c7fdb2dd3d8740fe594b34b4df5301a704138b43290c601183b45aa SHA512 aea958be5512e08ea809145021695edd4e7df4487a0f3ba94c4d0165113647195c1c1599cd5fbbbfae8f6a2bebf39d7514a694f86297c29c543b1a63646ca44e
-DIST libreswan-4.8.tar.gz 3702351 BLAKE2B e9eeca1c6410621897f5765632d40d103cc1903b9b8195454851a192c520dece42260a02892f0736b14f2257bd56eea8fe280b5e35364cbef8bdab5387fbb01c SHA512 f11e9c9f23871d6c6e8b0761d03c87923c055004cc50a7a4d1c1a4296b940159912294ceea0f9d125e9fd99a6c979399dc70957fdd698617015058d483030cec
 DIST libreswan-4.9.tar.gz 3706966 BLAKE2B 970d546a5840c8f97cda49e9ae78dc86467afe6250ddb17a118688de6301d8fc6a809b7a3b2d78ec0d1ae6cf58aa871388fd8c6853f58b19f80b9a4a0e28886c SHA512 4a43b09b0ef1bacc64ca1b74e7c268df7f024d8b6a9633a489f373ecd9327b173e9508dbc13c4d25ee74f3e2ba569d9d38dfd851fd98cf3cde4a61ef90a1d9d5
-EBUILD libreswan-4.6-r1.ebuild 3449 BLAKE2B b23a90826a32e9453ac56ca73905d61ce216d3e12ca5c96cab2fb0787495065b0540a231c53e6ac46a83b7553496d3a6525aca4556f79716d98e421610a1e4b0 SHA512 dc7c642e0204bd0449323a214a1ae0a5acc46f103d4755b49ccee68c6c64b65bd70ad0917ef85536fece3fe7fca8486a4fea1b226bcfd31e47cfe478d66abbbd
+EBUILD libreswan-4.10.ebuild 3451 BLAKE2B 61805e355bb06e7508ba7422a8b3175b0edc5599402ddbdde8b6bd3002730cf27c740e04fe0591186aa5d7634cecbdbfc0384bca2610bd313d754b8f50b9f909 SHA512 11ddb560747abe531f1a452ebf53b5a1d0b5ce1aec20c17f4f51db74537a6076788a024a557bd35e27e9f9f25687be7dfb796ca7bedfe8510e5dd18f8df9d833
 EBUILD libreswan-4.7.ebuild 3449 BLAKE2B b23a90826a32e9453ac56ca73905d61ce216d3e12ca5c96cab2fb0787495065b0540a231c53e6ac46a83b7553496d3a6525aca4556f79716d98e421610a1e4b0 SHA512 dc7c642e0204bd0449323a214a1ae0a5acc46f103d4755b49ccee68c6c64b65bd70ad0917ef85536fece3fe7fca8486a4fea1b226bcfd31e47cfe478d66abbbd
-EBUILD libreswan-4.8.ebuild 3451 BLAKE2B c0a2a7e846fefec360605416c46fb7788cb3c597cf4d8b171cd8f9e526c0abb6929b0551c19531c7953df117175508d87e708d2f660f4554a805e7b90f8f2812 SHA512 61af4e0f024b08834cb895cd695995b0afa06cbe139a23e7a2ad343fe4f4a2e3fefc7eab50a6bcfe731ab765b02063be9c0b24e0d48587cc526b77b00cc8108b
 EBUILD libreswan-4.9.ebuild 3451 BLAKE2B c0a2a7e846fefec360605416c46fb7788cb3c597cf4d8b171cd8f9e526c0abb6929b0551c19531c7953df117175508d87e708d2f660f4554a805e7b90f8f2812 SHA512 61af4e0f024b08834cb895cd695995b0afa06cbe139a23e7a2ad343fe4f4a2e3fefc7eab50a6bcfe731ab765b02063be9c0b24e0d48587cc526b77b00cc8108b
 MISC metadata.xml 404 BLAKE2B f1ff60cd5478c1733d76593cd0973609ce894c1cdf7d9086259bb1d988a7877a06762da95d872466633353d08b99f9c531ee65708593a8ada551cb96630ce4b7 SHA512 bf2ceacf48e75dec7f9ae83c9442b27a27b62bb89a5533f636f2032fcd765357c9892897145c6a05d6ad14855986a7c4bc15b79f99bdbd23cf9b8f2868a8f394
diff --git a/net-vpn/libreswan/libreswan-4.8.ebuild b/net-vpn/libreswan/libreswan-4.10.ebuild
index 66ad39f4df47..7aa4c707da5a 100644
--- a/net-vpn/libreswan/libreswan-4.8.ebuild
+++ b/net-vpn/libreswan/libreswan-4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-vpn/libreswan/libreswan-4.6-r1.ebuild b/net-vpn/libreswan/libreswan-4.6-r1.ebuild
deleted file mode 100644
index 4c117ce716a9..000000000000
--- a/net-vpn/libreswan/libreswan-4.6-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd flag-o-matic toolchain-funcs tmpfiles
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= )
-	ldap? ( net-nds/openldap:= )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-
-	use elibc_musl && append-cflags -DGLIBC_KERN_FLIP_HEADERS
-
-	export PREFIX=/usr
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=$(usex systemd systemd openrc)
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_AUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process libreswan.conf
-
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bea26c2593f0..892885c85480 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index dbf52e25543f..5c271adccf80 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -52,6 +52,7 @@ app-text/bibletime
 app-text/calibre
 app-text/cb2bib
 app-text/kchmviewer
+app-text/kjots
 app-text/sigil
 dev-lang/typescript
 dev-python/spyder
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 62e00038ac88..e9a9798163e3 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -133,6 +133,9 @@ snapcast
 -video_cards_tegra
 -video_cards_v3d
 -video_cards_vc4
+-video_cards_amdgpu
+-video_cards_radeon
+-video_cards_radeonsi
 
 # James Le Cuirot <chewi@gentoo.org>
 # Unmask as Vivante is available for arm.
@@ -143,13 +146,10 @@ snapcast
 video_cards_glint
 video_cards_mga
 video_cards_r128
-video_cards_radeon
 
 # Matt Turner <mattst88@gentoo.org>
 # Mask more VIDEO_CARDs added with mesa-8.0
-video_cards_amdgpu
 video_cards_r100
 video_cards_r200
 video_cards_r300
 video_cards_r600
-video_cards_radeonsi
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 0c30ba5895fc..334b1af2afcf 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-03-03)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
 # Mask tests, as not all needed deps are available on this arch.
 # See #878933 for progress.
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 2c07ceddd35d..25d78c9f50d6 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# matoro <matoro_gentoo@matoro.tk> (2023-03-03)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2022-05-15)
 # rdma-core is not keyworded mips...
 rdma
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 8861e56847ab..ecd863f4b8f7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Daniel Pielmeier <billie@gentoo.org> (2023-03-04)
+# For docs, app-text/pandoc is required. For details see:
+# Bug #737612
+app-admin/conky doc
+
 # Arsen Arsenović <arsen@gentoo.org> (2023-01-27)
 # Pulls in large amounts of unstable dependencies, blocking
 # stabilization of other packages.
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index 579fd764c80e..9d8ee2e485df 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org> (2023-03-04)
+# The JIT compiler in ruby requires rust
+dev-lang/ruby jit
+
 # Sam James <sam@gentoo.org> (2022-12-26)
 # Needs dev-python/mkdocs-redirects->dev-python/twine which is masked on wd40
 dev-util/gef doc
diff --git a/profiles/package.mask b/profiles/package.mask
index f6851af35e6b..5f3904424b2b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,25 @@
 
 #--- END OF EXAMPLES ---
 
+# Jakov Smolić <jsmolic@gentoo.org> (2023-03-04)
+# Depends on deprecated dev-python/nose, no python3.11
+# support, unmaintained upstream. Bugs #896468, #878685,
+# #865269, #825062
+# Removal on 2023-04-04.
+app-admin/gixy
+
+# Matt Turner <mattst88@gentoo.org> (2023-03-04)
+# Test applications that don't really have any business being packaged.
+# Removal on 2023-04-04.
+x11-apps/xdbedizzy
+x11-apps/xf86dga
+
+# Matt Turner <mattst88@gentoo.org> (2023-03-04)
+# Long deprecated, GNOME 2-era packages.
+# Removal on 2023-04-04. Bug #873841
+gnome-base/gconf
+gnome-extra/gconf-editor
+
 # Matt Turner <mattst88@gentoo.org> (2023-03-03)
 # No commits from maintainer in more than two years. Downloads are broken for
 # 18 months (bug #809551), depends on deprecated gconf (bug #873856)
@@ -298,12 +317,6 @@ dev-python/sphinxcontrib-blockdiag
 # Removal on 2023-03-03.  Bug #892854.
 dev-python/berkeleydb
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2023-02-01)
-# >=5.1 series uses vanilla llvm/clang instead of forked versions.
-# Removal on 2023-03-02
-sys-devel/llvm-roc
-dev-util/rocm-clang-ocl
-
 # Michał Górny <mgorny@gentoo.org> (2023-01-31)
 # No tests, no activity since Aug 2020, no reverse dependencies.
 # Removal on 2023-03-02.  Bug #892744.
diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023
index 52a993b18d12..c71c315dc265 100644
--- a/profiles/updates/1Q-2023
+++ b/profiles/updates/1Q-2023
@@ -16,3 +16,4 @@ move dev-python/prompt_toolkit dev-python/prompt-toolkit
 move sys-apps/uutils sys-apps/uutils-coreutils
 move dev-python/myst_parser dev-python/myst-parser
 move dev-python/setuptools_scm dev-python/setuptools-scm
+move dev-python/netcdf4-python dev-python/netcdf4
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index be1649ed7b7a..a32053242542 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1405,6 +1405,8 @@ dev-embedded/sdcc:ez80-z80 - Add support for EZ80-Z80
 dev-embedded/sdcc:gbz80 - Add support for Gameboy gbz80
 dev-embedded/sdcc:hc08 - Add support for Freescale/Motorola HC08 based
 dev-embedded/sdcc:mcs51 - Add support for Intel mcs51
+dev-embedded/sdcc:mos6502 - Add support for MOS 6502
+dev-embedded/sdcc:mos65c02 - Add support for MOS 65C02
 dev-embedded/sdcc:non-free - Enable non-free runtime library parts
 dev-embedded/sdcc:packihx - Enable Intel HEX files pack utility
 dev-embedded/sdcc:pdk13 - Add support for PDK13
@@ -1420,6 +1422,7 @@ dev-embedded/sdcc:s08 - Add support for Freescale/Motorola S08
 dev-embedded/sdcc:sdbinutils - Enable SDCC library archive utilities sdar, sdranlib, sdnm
 dev-embedded/sdcc:sdcdb - Enable SDCC source level debugger
 dev-embedded/sdcc:sdcpp - Enable SDCC preprocessor based on GCC cpp
+dev-embedded/sdcc:sm83 - Add support for Gameboy SM83
 dev-embedded/sdcc:stm8 - Add support for STMicroelectronics STM8
 dev-embedded/sdcc:tlcs90 - Add support for TLCS-90
 dev-embedded/sdcc:ucsim - Enable software simulator for microcontrollers
@@ -3325,6 +3328,7 @@ gui-apps/wayvnc:gbm - enable GPU-side screencopy (experimental)
 gui-apps/wayvnc:tracing - Trace kernel and memory calls
 gui-apps/wf-recorder:opencl - Enable OpenCL
 gui-libs/gtk:broadway - Enable the GDK Broadway backend.
+gui-libs/gtk:cloudproviders - Enable GtkPlacesSidebar to access cloud services
 gui-libs/gtk:colord - Use x11-misc/colord for color management in printing
 gui-libs/gtk:sysprof - Enable profiling data capture support using dev-util/sysprof-capture
 gui-libs/gtk:vulkan - Enable support for the Vulkan graphics API
@@ -8202,7 +8206,6 @@ sys-devel/llvm:exegesis - Enable performance counter support for llvm-exegesis t
 sys-devel/llvm:ncurses - Support querying terminal properties using ncurses' terminfo
 sys-devel/llvm:xar - Support dumping LLVM bitcode sections in Mach-O files (uses app-arch/xar)
 sys-devel/llvm:z3 - Enable support for sci-mathematics/z3 constraint solver
-sys-devel/llvm-roc:runtime - Builds the compiler runtime libraries.
 sys-devel/llvm-toolchain-symlinks:multilib-symlinks - Install symlinks for all ABI CHOSTs. Note that this can result in gcc being overrode for native builds, as well as conflict with crossdev if used for the same targets.
 sys-devel/llvm-toolchain-symlinks:native-symlinks - Install generic tool symlinks like 'objdump' and 'ranlib', as well as ${CTARGET}-*. These symlinks are installed into slotted LLVM bindir, so they should not take precedence over symlinks installed into /usr/bin by sys-devel/binutils-config but they can be helpful for binutils-free setups.
 sys-devel/parity:vc10_0 - Enable support for Visual Studio 2010
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index a80d6980503e..e9cea67f8293 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index f518221e328a..0322c4d392f5 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -7,5 +7,5 @@ EBUILD qalculate-gtk-3.22.0.ebuild 905 BLAKE2B 94596dcc5b2f64262faaabefd8356bed5
 EBUILD qalculate-gtk-4.1.1-r1.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
 EBUILD qalculate-gtk-4.2.0.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
 EBUILD qalculate-gtk-4.3.0.ebuild 872 BLAKE2B a4e3c9cf72db0a74cb84b81f9ccd8e92aa87050e112a22c476f8fe346d39836b78fca2dfab5edb5f69b2be6a0ee494672706b4076959c65d2b7fa90564645458 SHA512 295b0e288ac75037032af9143f67c905dc0d9f31171e37893d64869636a4a9991d626ea1f9677b1b9732504e293a004f2cf286d590cdf1e1983c83e8d31ef34b
-EBUILD qalculate-gtk-4.5.0.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
+EBUILD qalculate-gtk-4.5.0.ebuild 874 BLAKE2B c358bb8289a390b3f877a252ac8c26cdd48e3abfddd80562f46e8d0e98d065785227c4833cc28f0c03116ca6236cd5828c4224ca0269b0427ca1b68af1e57b7f SHA512 f2f21575031062340245ebc3bcf4b6d5325ca61c94199bde0c16746121e4f2fe12abf8fb483e622f14f62c00d4dc251b989eab4253f0098bbc11cf7361775d37
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild
index 47ce82e13fba..fcee52334311 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 7aeb02e93faf..ebd10d96bcae 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/votca/Manifest b/sci-chemistry/votca/Manifest
index ca88be8b70c8..47dfbae3830a 100644
--- a/sci-chemistry/votca/Manifest
+++ b/sci-chemistry/votca/Manifest
@@ -3,4 +3,4 @@ DIST votca-2022.tar.gz 61688862 BLAKE2B a6a8d1c34e2cd992d032730b2669c9ac5489b988
 EBUILD votca-2022.1.ebuild 1870 BLAKE2B e5d1e62abd6493e209eb90e47e58bc23064d335f8fe2372b5ec8fd91041ad7aa27209234ecf2973aae6d0dd92e766ba3f3784a6db9ce67f9ce791ec7baf75fcc SHA512 4c4b8f94583a61dc47cb155d5da0c3dc4532199bbe2ff7949ffc96ab4ed0e9879ff1b97738ac886ad3e606d4f52b840faf1c0ce8eb4bde0938375e6e3f6319ea
 EBUILD votca-2022.ebuild 1868 BLAKE2B 59e7eeaa1e2736f70d7e94c0a8f05591f256385dc4fa2cebbd245998d0923e84b1d4a459aed134d873b3108d3a3b335f2b037bbab817d588f687c538c1d768a5 SHA512 583df27280745d11e4074dc7ee2ef7118f545114f6dcd307112aab2c9d37a61b11eeac8eceb354d329c87a1823a7a4a5598004406849c3e8fc38ad69016c06ac
 EBUILD votca-9999.ebuild 1870 BLAKE2B e5d1e62abd6493e209eb90e47e58bc23064d335f8fe2372b5ec8fd91041ad7aa27209234ecf2973aae6d0dd92e766ba3f3784a6db9ce67f9ce791ec7baf75fcc SHA512 4c4b8f94583a61dc47cb155d5da0c3dc4532199bbe2ff7949ffc96ab4ed0e9879ff1b97738ac886ad3e606d4f52b840faf1c0ce8eb4bde0938375e6e3f6319ea
-MISC metadata.xml 579 BLAKE2B fc22a14bfa99c926b2c5b2071a10b6dd78baab670551c817c4c4f2e5e6a2e13c5fa216fe7a2aa455f15fbf1c8ae488a06b99960830a2d4fb6a82a6a0a277e233 SHA512 89a2c88dc5dc5e06ccd4e1830caa58e0d74f93e1742f4658ed27b6f41be3bd6924da47dc70cd7fcdce9837ceac4012dfeca39e8bf19d0451f044568d00743539
+MISC metadata.xml 465 BLAKE2B 3fe0aa7dbb87cfe5ec1b5d1500dccb087f2f582982ab7d41687675f7ad38ce3eae1c12141ab8a020d467114cc7017da64ceaa65a10bb37f55ff3aed3e113378b SHA512 b204a6c45aea2fc428a0e421cfc22a218e59ef4f9cb8e352bdf8983272c9f28baf2beec4650ca65e8fb640d713dbdb39d2f43b1ccfce8329b0c3669e6b4562c8
diff --git a/sci-chemistry/votca/metadata.xml b/sci-chemistry/votca/metadata.xml
index 137114c8f259..ed62b17be5cc 100644
--- a/sci-chemistry/votca/metadata.xml
+++ b/sci-chemistry/votca/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f53f658256cf..c1d66ad6bed4 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 49120984f9e6..46a323765bed 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,8 +1,6 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-11.11.tar.gz 5481954 BLAKE2B a562b963c08cd7ffbd2a5e33c984365aad5c48d9dfa7e05ab0e53bc89ec434bd4412a8b220408372f2aaba5c36a27cec596102a5beb308334eee88795dcabd73 SHA512 060599f018b2058e916e4d850656e2d2247fe2dae923590438015ebf816a18446fcc737b7206bfcef945fa61187a5f7aaf19612ac1466cfeb5ffb3b7b70a9620
-DIST gpxsee-11.5.tar.gz 5336855 BLAKE2B 2886def6bcb812d33361b5cf6d77b5da5adc203552449ded38cd01bfb451b055e7a0d8383f44d1db41b5b797f7b8763368a43825b3d016b972b0adfdca8ce48f SHA512 56ea5218178ea2e8504e775ff83d8335b636a04f2f428072883f36159ae83f1f2b0568f55028d696e8055eac0a398086b87d4f31456c07530c5b41d291a760cc
 DIST gpxsee-12.1.tar.gz 5487589 BLAKE2B 181fbc668ff389ac4ab7c26e8d629b8b19c581c53014dda6d4d339b67456ae8b18a1d3feaecb40c775ca1d8e8ca85e4c0da3245a0beb11f2a07a403ccd0dde01 SHA512 25b7788104c7b5f4544ed1fd0429965af82f77e9648b2caeec320addc219ba5e6c3e6d785ce7dd2aa6f5e969525fd7e6eef61b63ab02f9baa506b7b53aed1d50
 EBUILD gpxsee-11.11.ebuild 1196 BLAKE2B 7812242e5ed74fade2cced0b4f65ae427f47547f636f80c86a3214d99b381d440fd01308377100410c120fa02f383ced1f2ea9fc418f24533f152bf9f56b1333 SHA512 42a7ee460d39f9c3307482b79c679a2bdb693a7c77e1609a8158ad1a0138ebab7f0e978edfacbc1200a17a0d39f524f7f3f8ce17e705e118dc6fbf08c8fdd407
-EBUILD gpxsee-11.5.ebuild 1182 BLAKE2B 8f8d250ae55d35edda875649470ba1b8f72fedfa978010a19bc5f0585db6ca51510c19879a0f054d8d875949a4d6313c9bf3350b712ab4ae177d5bc7704a66be SHA512 b4b8e6a319ea48a3c255ffba43c88c433b130d107a1e5b0cec3cbf9fcd7557d2f115e076d5522f556bef03e71dff31125d28339fabe2422cce992216786bf0aa
 EBUILD gpxsee-12.1.ebuild 1217 BLAKE2B ef246596e2373d83ec6285052e9dab105dbfa3147f52c15bb099a8bfa186e4727019dc02dfeac67fd358c1bf7a93a059b45b3e9efd41399af73775e778a88224 SHA512 25378bcd9d5eeb2ecab0f72b06f624b1322c61f5df0d34c8b6ab8b2e0228393daa07ec47f13988b758b3cab095af7fdc5d89a45a437439fa9bb1f53a2b5d0518
 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3
diff --git a/sci-geosciences/gpxsee/gpxsee-11.5.ebuild b/sci-geosciences/gpxsee/gpxsee-11.5.ebuild
deleted file mode 100644
index a01ea5888945..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-11.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh"
-inherit plocale qmake-utils xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtsvg:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale rm_ts
-}
-
-src_compile() {
-	$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.md
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4c43ff33d1d7..7df56b51047f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 0412a4270edf..a9e032704227 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,6 +1,8 @@
 DIST arpack-3.8.0.tar.gz 1014494 BLAKE2B 6daf8a237fdfce527935d777292df150b2f78892d9975f8696a37024fcb78174b29afd300e7abca2684c1907eeda658eb4478f09f580835896c0e10d106cdbbd SHA512 8969c74c4c0459ea2d29ea49d5260f668fd33f73886df0da78a42a94aea93c9f5fb70f5df035266db68807ab09a92c13487a7a4e6ca64922145aade8a148a2de
+DIST arpack-3.9.0.tar.gz 1015328 BLAKE2B fc9960025140a9d6a570ee0359c16055c826482fe1ee58c2dc7727cd0ead04fbb940da0e08a6f11e05205d239b1059c93af0e08bf2b6e0cfee61d73f1d0d9816 SHA512 fbcaa2179dd1aa5a39fc3e7d80f377ec90ddf16ef93184a88e6ecfc464ed97e5659f2cf578294ac3e0b0c0da6408c86acf5bbdce533e1e9d2a3121848340d282
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
 EBUILD arpack-3.8.0.ebuild 1404 BLAKE2B add7a6fcae1a87b9644057f88ab726881b8c1087ba49bac99eac7c00e37d40f6b13790387cb38dbd0e58802eafe6de3cefedcacf0d4ddcb8e81bea5d08bec8d8 SHA512 631cd88e2685f59ce2c0ef0f8b9ddb96ecfa1955993afabbc22c1dfd5a31c49363a3657989345603752203b2044c73b1102c912533b7791c69a99c0ddf3dcd66
+EBUILD arpack-3.9.0.ebuild 1352 BLAKE2B 0626814074221ce405b034263448f92d28471eb19f0b994bb5e3be5fe691df4d5c1090dacf0256e1a8136c9cbf9b2aa748e6186571e6796f7bacd70311c2518b SHA512 bf60a5bdc93a0204db5654c65cab0bf81c64d075abfe3f9a4a65402132c240af7b1a0badb74cee02e20092e987d4e62bd01f11e7f89393ac6528b3f8d335bbab
 EBUILD arpack-9999.ebuild 1352 BLAKE2B e88d3485d420f86dfa7ff505c25c9335661808a6aefd9a4105f07c653c9d1903a0942f8ab2f667670e8f111cf98e3998dfce2bd17c5772172b7660be1661258e SHA512 e0ed1f4e5b6b66f2366bbc99456213aabaef2cec5e103190fb16c9f8c0ae0c1c394a5b0a206bc6733fdae17a0d4c3ff4a46b2d8e413ff344405356f1d09bb3d3
 MISC metadata.xml 975 BLAKE2B c586f5c76637d89b4221fc7bde670e0f32b35e3ef73f212a3ebb87893d6741a65e0c95ca981375a0c17231aeb1655c89f4263d6fac869ee29fe8e4e9b026ad06 SHA512 e296ebe68dd0b8a02bc92fdf43057ee2df61f5ff9d04fbc323be7c7b8aaccbb4fe4627d0f1815efe010a0c6f36367dd48417f092303561b4c8e81ac051bfc0bb
diff --git a/sci-libs/arpack/arpack-3.9.0.ebuild b/sci-libs/arpack/arpack-3.9.0.ebuild
new file mode 100644
index 000000000000..cfd783760a46
--- /dev/null
+++ b/sci-libs/arpack/arpack-3.9.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/opencollab/arpack-ng"
+else
+	SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${PN}-ng-${PV}"
+fi
+
+DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
+HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples mpi"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[fortran] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		$(use_enable mpi)
+}
+
+src_install() {
+	default
+
+	dodoc DOCUMENTS/*.doc
+	newdoc DOCUMENTS/README README.doc
+	if use examples; then
+		dodoc -r EXAMPLES
+		if use mpi; then
+			docinto EXAMPLES/PARPACK
+			dodoc -r PARPACK/EXAMPLES/MPI
+		fi
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index a3e64c48d8b1..7631e18e0332 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,3 +1,3 @@
 DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93
-EBUILD cgnslib-4.3.0.ebuild 1935 BLAKE2B 9f47843ac0ccf97cd550656c41ee848318a313aead4efc17b1798df5fbdc666165c1d2d30b8f78d0ae2559aa43d44648efb7789f9f10fdebcc9fb0a552fc16dd SHA512 d925b640b0989dc5479a482bd4839c6e0608d950e43221457d09570c00f583228d756e4a0510191ae6eaf46f4f8e8d83808acc5dd6fc92f03caa5ba5d5d8559c
+EBUILD cgnslib-4.3.0.ebuild 1934 BLAKE2B 8f917cedc499a64913e6ddb216c5caa2487540a5d3532853753e1da45f087ac5663f38d9e0a4d7fbc6e9762bb279dcf63c909ab66cfbff41c313f1c6ed044d86 SHA512 5d87190074cc9914d8e70bc43b82d385c838aa0fe60faf052ca4c3e96e30a86808bba0b14a3f7e65f3ced4e1a604e5930df07ecf8fea9c66a6e330b5c76ce671
 MISC metadata.xml 1273 BLAKE2B 05b98760182f6ab2586a969e7cd49a56b077f3c0f208460967b5b240cde12c3b62655223947646d48c743cb706b81e59693c693fbcdf703c75642958491d5902 SHA512 af36842f7cefc358474fd6b3646dda0974c0ee443d56babc48955340be64719b1c4548e952c93898265d6950f32bfb7db87472ca196b290ca13a8c20ed2244c2
diff --git a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
index 37dff62ffd7c..039b318c01be 100644
--- a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/CGNS-${PV}"
 
 LICENSE="ZLIB"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
 
 RDEPEND="
diff --git a/sci-libs/h5hut/Manifest b/sci-libs/h5hut/Manifest
index 86795017b301..92e352ab909d 100644
--- a/sci-libs/h5hut/Manifest
+++ b/sci-libs/h5hut/Manifest
@@ -2,4 +2,4 @@ AUX h5hut-1.99.13-autotools.patch 2809 BLAKE2B de8b47ec4dd418cd3c6e5c7670c11fb91
 AUX h5hut-1.99.13-mpio.patch 574 BLAKE2B 063729a01cd992fab481871210e0f6c63f2b93cd8f41e7ee11d84e2572e46945b1934a52514376700c4f4e25b142279591698f53067b9398f1290113be5e3399 SHA512 9335f2d84c4353123e1c1af5f82a729322cacd6f0bfa95ccbe042b76693f035c5b2860d788d31063299e3705addd6160b4b985be88beba341bee56a397387919
 DIST H5hut-1.99.13.tar.gz 3029357 BLAKE2B 555d1f89ff60fbd72763026643ae76d5f68bb9d76bfd2fb29d846e3c777184db3be1bae98763ae683e72566e2624678118eea0da8d0bc1e57b84fd0b4777abe7 SHA512 c2590795c45ecf5e642308f5b36c4e573fdcbb6e985f5867c13fd9e1f0ddd9b48fbc423ad0165b8f047256e42a1eb54d508c9322a593bcfad3a2769547d2887a
 EBUILD h5hut-1.99.13-r1.ebuild 790 BLAKE2B 09575e246784c9824cf00cc85660544a9c6edfe280677bdaae9531491a793e0af2e2dfdfc146dd90417a32d1c7c60dfbea4af05d2c469db8625b7428446dd558 SHA512 5541f0e4b059dfb8e77b0aface99028545b5e89459784186de315fd3b4866c9021ece71f6df28ba83ca1168a6aa8aa9eb23c95f8e24064d02edb528085a469f5
-MISC metadata.xml 368 BLAKE2B 41a4fdcd35d6ab16960378ea85a83bd575875f47efd542967a0385dc259237dc774d0af238546b1a68f105e5181d4d96e441ef6e8a25d0e7c9ba40a0634a7c2f SHA512 728a27ced9c287be3b8647603d958330416cb601eb28c974d1b6ed95a8b611141ff272792cb2a098d931f9743f7a9cade84369017c982fd1a3bbdeeb69c1a02d
+MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-libs/h5hut/metadata.xml b/sci-libs/h5hut/metadata.xml
index 125513d74f67..c0cd18916a93 100644
--- a/sci-libs/h5hut/metadata.xml
+++ b/sci-libs/h5hut/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/h5part/Manifest b/sci-libs/h5part/Manifest
index 463813d4cb73..44ac7f1c58b2 100644
--- a/sci-libs/h5part/Manifest
+++ b/sci-libs/h5part/Manifest
@@ -1,4 +1,4 @@
 AUX h5part-1.6.6-mpio.patch 948 BLAKE2B fb85c4cb0457a7f65212592c26ed1aeb8e917a9ebb4dbc8904c269bef6a8bc91f87e655de4a5f3e728d888bcd2526007de0cb10fab360cd079cd97a2e58e6834 SHA512 41ae0a9b9f2ae84b29133879136b392cf58c68ab75195179c7b95600bc693b3f6d2ab74533285a3727590f5aac61db2d9f4c9c732720fba15164fea8f29e7a34
 DIST H5Part-1.6.6.tar.gz 441755 BLAKE2B bc0027a91cc5f28009dc1b716fe548c670307ca19782158314d3358e66091608cf81149dece1fddf4f279aa920b06930019a26c5f34e4e3ce58df80d003ff5e6 SHA512 0842017bfe1510746e6f9451daaaaff3d9f6eee5209e241bcc8f2d0ce96450b8929f718c41a3434f53c9457adc2547628ad57ac8a0fb1cbfb7c74862aebf996d
 EBUILD h5part-1.6.6.ebuild 624 BLAKE2B 41434dc9f7400c2a5d387d512225c15a52c93fcb4b8ac3e58c37b975ed307d2ea90e16a22e7050e4c10203c652993968f53bc37c580d216b77f3fb36bd330c3d SHA512 a73b65addc9c05989ea4589e5b7ec8a95bf9f61b4789194fc7093bb5e066bb7da68a5f1daca4cf08dece98a325a4090a302f47e1c0ab5f8bb5d0bea946f743e4
-MISC metadata.xml 368 BLAKE2B 41a4fdcd35d6ab16960378ea85a83bd575875f47efd542967a0385dc259237dc774d0af238546b1a68f105e5181d4d96e441ef6e8a25d0e7c9ba40a0634a7c2f SHA512 728a27ced9c287be3b8647603d958330416cb601eb28c974d1b6ed95a8b611141ff272792cb2a098d931f9743f7a9cade84369017c982fd1a3bbdeeb69c1a02d
+MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-libs/h5part/metadata.xml b/sci-libs/h5part/metadata.xml
index 125513d74f67..c0cd18916a93 100644
--- a/sci-libs/h5part/metadata.xml
+++ b/sci-libs/h5part/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index f305cf58313d..8d50f7c38a6a 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -7,5 +7,5 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a
 DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7 SHA512 cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5
 EBUILD hdf5-1.10.5-r1.ebuild 2940 BLAKE2B 45e4cf6004cb70667829844ddf37f2c4f96d6b5c92a8eb9b3c757ea47e6d9f98e28f906c7d2c6a33efd95328bc0b6358d640da36c82fc5408bbb968c38b95115 SHA512 04ac047f56128f41f4cdc8b07caa0d656f31d34200961a1ee525583263dc338abff7860158f9549ddf31bf0563ed963fbd5dff4ee212d85443aff599e5d2c25a
 EBUILD hdf5-1.12.2-r4.ebuild 3209 BLAKE2B eb7b30bee62cbad778b07f089026395d70046e3845b636bdb526e0960e4ae3789f2e5d1c9eac6fc213b755809c42946cf332446582d032d04900cfd80b57b06a SHA512 e6c2c24f9558c381b8ae5da8f0967635c64b02ad5f8288d5a08841c7637f8de7b72229f89d8be2cff5cd0c8c4482b404db3a7d41aeeaa927157c257f91fb62a3
-EBUILD hdf5-1.12.2-r5.ebuild 3291 BLAKE2B 3b0cc073da66f0fd45c3d64c37c99190d59ba3210d968a30da39a087ac01f2b1b113466e6860b8ed14b8a00c69bb52771b10f8acb1134717f7c572fff27e8c66 SHA512 51b6db4214065727dcab0f4b2229486722d4146c1da7853eeffab75c6cddb1e72d678ad90b71cdb0fbfa28913b70def2c6e5e6b7700994773894fd05b9f92768
+EBUILD hdf5-1.12.2-r5.ebuild 3290 BLAKE2B 58b77931c333583d5fe7d2c7a72ce1cecc7eda6198a9eb0968b1c51cefb8a67c99a8039b81c1bd57c684cfccfcae007e2ce8edd7e65010bed5a5eda8946657b1 SHA512 125bf9023b864254f9c102a857b35fb6cc079b508a88687050f42af4d6fe6eda23646425895bc67e25171b897f91c9fdec89639b46738d14f6749b05e07b6cc8
 MISC metadata.xml 826 BLAKE2B fd131bb207e4ab863ef7c05ab95e5c0254fa08230139a2508ab5f0c363809b0735532498ad26cc39621495a063de86ab5bd97447514ff561a63302e8b1d7d26d SHA512 290883ed9bf3de60bf04e2474c4db50e095b1b87974867e58601a5c5c2f98d6b839ed22d9ce2798bc44f484f1a38ee4b6df99aaea7d134629bd441d34b5a29b5
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
index d5f631700b15..3a7ce1c9a8d0 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 REQUIRED_USE="
 	!unsupported? (
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 699b4dad80cf..fd6d1334050d 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,5 +1,5 @@
 DIST lapack-3.10.1.tar.gz 7632257 BLAKE2B f2653239029ed9c136173fc2e54773a785ad3e469d581ca2b7f6a72697e6bb9d22879edaf8327ada510df259c08fe984202d14cb3860c0d2a711eb55a1cc11dd SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb
 DIST lapack-3.11.tar.gz 7723909 BLAKE2B b3f8ec8cd439d790ba5869b8b071fe924a4ac53328bce77d46032602b45353670966ed9223324a0780aabc2e95624f439e03f90a89586f96afbe1374c4261bc5 SHA512 d2f23c5f6ae14fb868312a25235459bd0c04f4b43b82a5ade01314776ade9a75dc518a457eb58595f29f64cb0bb86f1a12ce8beea3ec87ef9caf49493ce29fb3
 EBUILD lapack-3.10.1.ebuild 2973 BLAKE2B 3e2398eff74637e3e1da4f47d361f65951fea3a6eed310ab4ed9f1e4124ff780ef41c8ce455bff3e0b35f32621f0fe6903b812dc6e51f5fc93bc697d9c03e6b8 SHA512 6510c96a2b9cd24f96f59e8e4c97f9558a6d716aa8c22661a8aa1c5d5e589ed026a9564d193e1ce257a7f2c930613066be64474cba4fb824ae58ad217fde8930
-EBUILD lapack-3.11.ebuild 3158 BLAKE2B 7f62816a7fe4ffcd890fed4db4fe38679b7133049cc5965e44b90b83685882b00038c2edf61342590420ec1547fb0524a7c6e9c408380cbb364e8f7a0a9b7bf6 SHA512 4a98ef7409f9eacae5e1e1e117c9a31cd27ccc58ea66f86049941a0f10eede2e719af1fde927a68e395c1ff597938670171093c66b0a23bc51dbf8dd0a276dbc
+EBUILD lapack-3.11.ebuild 3156 BLAKE2B e17092a54b04d82ad9ac9d0304cf70497fbad36e077018ff0d8704e8d4d01da6cc313ca2bd4f44ff37f4fc20fecd03520a1841a30534926529a23c4d158f3bbe SHA512 3281895a61c104199cd74631223fc0f1c955931e61e27847ef7398ef102b5dde6913b3ba57aff7fd609e2cee8dea8a70a62a05e3de92a5244923a1d69c3ae9fc
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/lapack-3.11.ebuild b/sci-libs/lapack/lapack-3.11.ebuild
index 319c0397ca7a..d6b016878d7d 100644
--- a/sci-libs/lapack/lapack-3.11.ebuild
+++ b/sci-libs/lapack/lapack-3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # TODO: static-libs 64bit-index
 IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index f1e21fd0ea1e..bd63a49fb848 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -3,7 +3,9 @@ AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b
 AUX netcdf-4.9.0-fix-musl-execinfo_h.patch 1098 BLAKE2B 3c063fbf452e045b96b411ce1810ea0d535a66f90d421412c9994313303d31b3d4be3377727a0182bac27eb5cb6e675bd3007090d2a94b13dc23a1a1bc252a12 SHA512 aae74f9bef1ec09ac3a488a1305a812b18aeaec6028d57e45f667727f36421676dc20d6f9589284c7b5dbb0957c23ac426ac3ca2f05a10e1b4d6de26851405e4
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
 DIST netcdf-4.9.0.tar.gz 19491744 BLAKE2B b669f7ccb2f7a8def9d5b944a97d101ea7b7307d6e1495a97c0966b4ac9722b404d6039dee192da759d14d52259be2ff4f49be3bfb6cbbfac48732684cbff9c3 SHA512 62cb593b99a6e9c56426175d141907572d3974de8dc39549c85337acf410539f9b7dcd9a375808e271da1d0dc93fce7586b955eddd2bb45901d9cc48a72db705
+DIST netcdf-4.9.1.tar.gz 19525310 BLAKE2B 711083c0e001ec12ec11ecc1d27b373a6e0bc4fd62a3cfe3768f607abcbd465b8485ab0b70f339964694f87f58923a34f66000043b330a6ae03504d176587ae6 SHA512 5ac41c1ce72c730db7864891aca04d9b5f3e3e5bb265801b5972ae21f0039df6b24a96c9999d35b892fb6a7347b9a313ce4fba6c05391483d642abb23a5598e0
 EBUILD netcdf-4.8.1-r1.ebuild 1810 BLAKE2B e73bab3d4748a0e509f5f6bfeae90ac10250744e3cff0bd588b9337a340c177c97cbb424f7880a5285026b997ec378631933979cfe9b4694d41e4244aabf9bb4 SHA512 aae2f847567d803b175ce97a529763f4e1c74e7a5b65fd85ec235b2451ce02c7afabaac2a90bb4904f8068f822ffac5329fefd5108d396788d36bda6968380c3
 EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd
 EBUILD netcdf-4.9.0.ebuild 1851 BLAKE2B d6378eebacee1769d6f99b9702ed9a18b1295fc99554b66d3d61e8b40e1d4a1dd973efea929491f69be3fe4b5cf897220541df78f2c81dd87c5415beb3ce9590 SHA512 c3edd8b82bb64e85c6b649b80c4a0ae7621e9ad05063dbfb5a79cf4c93f4c954b54464840c32a296126857cae521c65d805aa7b65423acefd6b762253c32a75a
+EBUILD netcdf-4.9.1.ebuild 1725 BLAKE2B a33540ff9542919a2e089ed9b141c596d2cf72c2b6ad8ccebe94bd4076e5755b97a70f510e1610d84de3cf96fcb72abea21bef903524f59d965e967bfa6597b6 SHA512 068b82410fd873e543e44bb38db43952737e50a2f2da77355d9fa92f31fe33f5f05d430c5a52aff0270a314fae831e8ecbe424cb3b7388955abfb849b0afe49b
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/netcdf-4.9.1.ebuild b/sci-libs/netcdf/netcdf-4.9.1.ebuild
new file mode 100644
index 000000000000..675b1dc809fc
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.9.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-c-${PV}
+
+LICENSE="UCAR-Unidata"
+# SONAME of libnetcdf.so
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libxml2
+	dap? ( net-misc/curl:= )
+	hdf? (
+		media-libs/libjpeg-turbo:=
+		sci-libs/hdf:=
+		sci-libs/hdf5:=
+	)
+	hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="
+	test? ( tools )
+	szip? ( hdf5 )
+	mpi? ( hdf5 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch
+)
+
+src_configure() {
+	use mpi && export CC=mpicc
+
+	# Temporary workaround for test breakage
+	# https://github.com/Unidata/netcdf-c/issues/1983
+	# bug #827042
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DENABLE_DAP_REMOTE_TESTS=OFF
+		#-DENABLE_HDF4_FILE_TESTS=OFF
+		-DENABLE_LIBXML2=ON
+		-DBUILD_UTILITIES=$(usex tools)
+		-DENABLE_DAP=$(usex dap)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_HDF4=$(usex hdf)
+		-DENABLE_NETCDF_4=$(usex hdf5)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug #827188
+	sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die
+}
diff --git a/sci-libs/nfft/Manifest b/sci-libs/nfft/Manifest
index 85a0f6095455..461d2a65cdc5 100644
--- a/sci-libs/nfft/Manifest
+++ b/sci-libs/nfft/Manifest
@@ -1,3 +1,3 @@
 DIST nfft-3.5.2.tar.gz 5377870 BLAKE2B 5a9b79fd2db781f163f3e694e25096f9abfac67ae9e2f0614444e99160ac6ce150356b72130ba44f82c541120f8876723a06e989a5c125e1da1b85976b7ff500 SHA512 e5437b358f22807de2251527025accf326d77322e029cfc3df6ee733ccca4d020cbd3c045773735de0641618c71e5cc9b8f4df53becea3b7a7e27750f21fa64e
 EBUILD nfft-3.5.2.ebuild 915 BLAKE2B 19b9331a9c96181bad3edaf92bdca7b1526f7b3f4df0018e25a8096bf9a1f6b3e66bc666394e9a1c848e1c4d87f04de42376da83958c79cd19ffc9c4abd61e6c SHA512 0d9e0aee237dad6bac189e0223c6895c091f8cb02e158689f619c93cd0e3f055f5c99c8ad7c652bc1f135d1a0917f2f8477d688068972911aa4b9bbdd1c04a43
-MISC metadata.xml 442 BLAKE2B 8326c9a95fc8c57e5f09c401e93e7d5576795d99b348e0fa51d25ca043912c50605655097ce9dc9ea7bf8c6de06b76df05863d30213923bb62ec20f8d7714ace SHA512 0794e58e77382ff8dd951a663a862190b2a0b8fccf12389b46ae181aefd536402bff7d013e09ddc97d210aefbf8e08603acb8e22677b832474a9f62d6fe593e0
+MISC metadata.xml 328 BLAKE2B 240bbecf26e4844d414232fbe45923c5c711d935bec1bca14310bdc10a052a1776a7bbed30700b6335f3482141aadc29cb241147708a6018c473224e963b7d94 SHA512 9d806457e7cb9d8e1d8b90763341b3920b68004e1fddce937be0b7781b53961c7efbf243136f9282dddfee17d6da30b35e246c89fece0bf65d0e02b1ee3ce305
diff --git a/sci-libs/nfft/metadata.xml b/sci-libs/nfft/metadata.xml
index 4eda0251b43c..e113b5eceba2 100644
--- a/sci-libs/nfft/metadata.xml
+++ b/sci-libs/nfft/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index b94a077e7199..929ac11382d9 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,5 +1,5 @@
 DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702
 DIST scotch-v7.0.1.tar.gz 6838403 BLAKE2B 48cb928bf8586bbbe206dcb4f685e6c392ae078f5493e0384776cf6788137361286adbebceb7ad5c171eced34f5dda3f4852092413e79cbb791bd3ced204784c SHA512 c3267d5c8785a2258af3baf999d2c1eb75ef361062e74962b6e985a75cc4f5ef1f79919759ba1b7cf028f94d06a5ddf3818108a97eca4123a11d7750b5d7093d
 EBUILD scotch-6.1.2.ebuild 4951 BLAKE2B 3d3e5e04719603bb8af5794a7f9b3cf650f142df1a8a30904e2d5791a32e99af5fe75f630aec51bbee425f8b49b0ce7b987c7f25439e5268c906a3eece0ab9bf SHA512 c3371fd91658a459675e945f0a5287967ead597af4d4f83243b1dba01ad84d754558f170cb480cefa65d0a03ddfc541346c2400846408ae486dc19e4f5d0185a
-EBUILD scotch-7.0.1-r1.ebuild 4958 BLAKE2B 89d19e45d6aa9948c6f11590fe5d878adbc83356bc68cf905df54203386c08071eb36182a338f2b7e5c221ecc3def5f2b9b4e18be0758e981b9fe4f0cd500015 SHA512 b06e104909edd2fa3fec89915b3dcde10d8cfbf8b9c1d387c2b70fe197e0d6c4dffffe7b81e6aaa7f3928e8f5f6407c4eef666eaaa535b73fe1997c017b069c0
+EBUILD scotch-7.0.1-r1.ebuild 4957 BLAKE2B 3bff4e87e81989d46b8a940f494a65e43b5e339ea07b8783bd82f4989cec7d9c3ecdd72434ef751185eecd7dcf255db51045274c00427a0b24deb8dd0e885cbf SHA512 92a9438787c430164cc111edd4505321b52642cbbcae65ac8a64654137aa7954f059ef1f6dbce706bd6579fe0541da945fd1e9ec338dc9a6fc7ea8036ea881c8
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-7.0.1-r1.ebuild b/sci-libs/scotch/scotch-7.0.1-r1.ebuild
index 9a90101f74fc..3251df705520 100644
--- a/sci-libs/scotch/scotch-7.0.1-r1.ebuild
+++ b/sci-libs/scotch/scotch-7.0.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools +threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index e37b90164d5c..f6408a030ca9 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -7,5 +7,5 @@ DIST sundials-6.5.0.tar.gz 89142911 BLAKE2B 3605686f813928fe55e5aafd409c478cf782
 EBUILD sundials-5.2.0.ebuild 2173 BLAKE2B c7765f5fbb12395c2474f352a3200225cb2ec75360fa2089bf34ee0ddb313d136b0e66ad1955936bac2bf6f6e63bca055e7077d46fb92a69771417c51b86fb9a SHA512 00d5b62fabe026e5637cd655dc53ba12e4ff8db286b451e79a993b18ef09dcbce58805424c903bfb35ebbfcd2881873f91cfb63faa353f1789bd95fba7f17a17
 EBUILD sundials-5.8.0.ebuild 2759 BLAKE2B 2f2872218e337cda6e067925f4f67ce4021a284d0d4badb31737efd6fc0917808769c24b74df4086aaef08384bd36dd744358b9d797da08c40d34f5b1aa34bdc SHA512 7cdaed08db6eab4713df5477d3051d009881cb1ef38714496618f56f831ab9e3973a0b37092cc716512c5d8dc6ed73cbb7da2fb46d0373b066290c48993cd805
 EBUILD sundials-6.2.0.ebuild 2723 BLAKE2B 3d0bdf7847bb61ff87b78a3fdc806d3edcf9d72422d5c27dc05c69ffbf69a609777e25d9b2931bd11b70c911de76e84dcb06843f39aed05f5c76d56474abf78f SHA512 a3e17643240fbcb9383cccf5b90122f53f19d27213d978aa0315db52e1afa20d8c0afa57a52f6315a7050f8112e0f03d558d3b60448bc661cc4054a328ed6ff8
-EBUILD sundials-6.5.0.ebuild 2666 BLAKE2B d92105ee36fff4071b4be0f3a3c6d2d90fbd552e80d4c269cd8dfd89d3f01dde8e5603b2ae4f5a0232d34e0e044c4a74cc95fe5466b7993ff9ce37c9e07d9489 SHA512 6c556101069f9d55724372aa71e208c5db8f322a168365322a132f8b9e06cd94e1cf6a9d193aebe7b04b13ab4900434209ec03e96cdf9c46e18d69201e0cf13c
+EBUILD sundials-6.5.0.ebuild 2665 BLAKE2B f1c6007a8a6ee04e9ee281c224a9b285291fcd6b1ec16091744f2a16e515d4fc059e2f7a932be4dcfc67b86ecbbbc672259a9c7d7619a3ca3755e6add3628165 SHA512 e09f37403f2762d086ca901982eb960a20c697af573f7753e4b0dae61513d3c6ddc6a7dbfc9bb7623f50d94c1a06d8958cd9da58fcc49b321c4bc87437ee3553
 MISC metadata.xml 1170 BLAKE2B b2ddcc6f5a958ed045bea77fef0c8842f76fd9f3756bd82870bd605b7dcf5ae5be64c0b5a00a248d17518d0411c90f6b9da539aa5b35bf00d532f84867ed46cf SHA512 539f5e1c372b48f0f6d81a444b52c0ab2a80ecf3e7d278ed870d7189c330e8bfa3c296ddc4ea10e09029b7e44860cde62af6a4bda58d4bcd841704f5920ca23d
diff --git a/sci-libs/sundials/sundials-6.5.0.ebuild b/sci-libs/sundials/sundials-6.5.0.ebuild
index ac6b57bf182b..3c5b1fe76979 100644
--- a/sci-libs/sundials/sundials-6.5.0.ebuild
+++ b/sci-libs/sundials/sundials-6.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index c49c7b0caddb..269cf1274a8f 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -36,5 +36,5 @@ DIST vtkDocHtml-9.2.5.tar.gz 158865725 BLAKE2B ccfb6276955bda567e7f2b6fdc5e3e601
 EBUILD vtk-9.0.3-r7.ebuild 14954 BLAKE2B 09b60e3ae85660af76b714772bf71dfe0d2c8d68bf85d7456504fbeaf090fd9c0bf468a1da02110621e5f328d5478fcc88b04f8bd68cc26ec790ef6583928108 SHA512 96b32c0ebd13e7d8bc89a1d14332ce282a73f4a358f9617bfeb5acd066f94abbbee74d120551bd0e866865fda0e866381eb2bf8b0a624b3081085ce5f65fdcdd
 EBUILD vtk-9.1.0-r6.ebuild 17565 BLAKE2B 70a9f39e1d0a13d9c646915fe2788ee1a8bfd3a0d441476d5a9d5236937e5305d3ab13a1d34341c87a22390de38952ad102503e6242d91cfd7e27282a1b41750 SHA512 098b76a6add2cf6a6c355bf9998fc79a5b9f100c5dc6b6ccd80ed912f91752eecfe15d12c7dd4bff61988a3683ba821dbc7ddcc57fb87db3c82b724fd22d2892
 EBUILD vtk-9.2.2-r1.ebuild 22534 BLAKE2B 067856da05db7ad7a18c35c10026f2f52ff85845fb103816f5c77d9ea0133b16d22847ea53e9bc7fd1ccd6262da8731e22b57d101bf227b26f03a8cd135e8bba SHA512 5306fe9b66dfb17a252d26086ca2f29df1249a841756e4aa5a8b646ca87f52d71264b81cd62293e6ab0465f204cf06e454b9af052c0266202ae74013d0aaf45e
-EBUILD vtk-9.2.5.ebuild 22681 BLAKE2B c06f7c7297026d7a8af5027cc1df1cd98b28bb023456d1158f03a28be1feed9e5b2e8b03e46c557217fc9b316a1f84d24edceb160e406a104c4bf061fe60f7c6 SHA512 8265f739764007cb6f3bd6472baeb6c3cebfa82a8c9f45fe02a1eec8bdb3386ddc5a24a686e39622ed53ef7746ac31c5a3db576dd8c1ec1616bb8e7f63002fd6
+EBUILD vtk-9.2.5.ebuild 22680 BLAKE2B bb1e64a206053173269d0d0eeffff00ee9e3a1bf2f84dc5a102364963fabeb6176f402e0cb5ad6a3002d86710e4564426fc599f8ab8257724378be8c3805330a SHA512 bb9021ea45a9f91cec96e9665bca3a48b5c3d8fd8e6d50cb33f04aa60701c241b732953d1e3a2672eed5a0facd136b951c0966b7a05ee38ed280afe7dbeee0a6
 MISC metadata.xml 1953 BLAKE2B 35f57e027a7dd2baa4cc25d72441ea0b3a8e62604f548511da80b3bd5dfbf545020d89f32e3daf0264cb903a1ddfd2d35bd6050ccb106c3ebd1214cb0cf08623 SHA512 1866c59f60ee8637c3238d5faf5c51a3e3a40866a01304d6c325ab46744447ea45acf84e5538cef452fed381679c02e75437459004542f7b978af3741b47db29
diff --git a/sci-libs/vtk/vtk-9.2.5.ebuild b/sci-libs/vtk/vtk-9.2.5.ebuild
index eb117e951095..e4fc6333d5f8 100644
--- a/sci-libs/vtk/vtk-9.2.5.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/VTK-${PV}"
 
 LICENSE="BSD LGPL-2"
 SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 # TODO: Like to simplifiy these. Mostly the flags related to Groups.
 IUSE="all-modules boost cuda debug doc examples ffmpeg freetype gdal imaging
 	java las +logging mpi mysql odbc openmp openvdb pdal postgres python qt5
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 80dd5400f54e..653cc7dd68a6 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/boolector/Manifest b/sci-mathematics/boolector/Manifest
index 1dfe9a3c7da0..c6641a13e4ad 100644
--- a/sci-mathematics/boolector/Manifest
+++ b/sci-mathematics/boolector/Manifest
@@ -1,3 +1,3 @@
 DIST boolector-3.2.2_p20220110.tar.gz 1567668 BLAKE2B 6816f0434d88c790a27b9afe4c3b63c18a55b14f9f13b092f2940309e34842fe4868bf8d378bad130c4561d25e7d79b356fc27d9422bd42ba1b74ff98be36f72 SHA512 b1b964c155c8227e631025cf6bff69cf54728b1d875c2bd44a5a1ddb2857de2ab8fefc96d194faa5f98015e730b417d46a415ea601740e890df07ad5e50ad656
-EBUILD boolector-3.2.2_p20220110.ebuild 1853 BLAKE2B ce6c51881f4eac8391079374e6f755a87aa671a124df494b8d5e8eae8025d58eeba16aacd5024d09b9c5147809aabc7d79e07fe3d7618b3d9af94d6d158b1542 SHA512 75a526a187f6da54f4c7ef3bba4b34e26c29289086df3c939ff52624145daddd1b192cdb3645282c816f0fa466e32c3ad0f92ce5da546062ed7a5a605c400952
+EBUILD boolector-3.2.2_p20220110.ebuild 1900 BLAKE2B 2a99565257a782a5c198ef8661f8c51aa734ef3987213db1c4010ebe5f083a5f9f71525d66217ec32cb1edd4ef34d89bc386a1d21b91c277336493368ffdd3d7 SHA512 c588c5c8e821d6dd62c77c1f9c291761d9c8d30d415e7634a8fb64460e40a2abe9eb03e873c309218fc34e4105c6b597f7e09c77f0faa51afc10b68b9f754d46
 MISC metadata.xml 1245 BLAKE2B a04e1e5a6af857100b8b569f57f4d2610593e9eb741513e4e6405a8fa9828471b92aaa1ad57a3163dc2f251b5664493692f92477b7191621ff8fd76eed9f57e7 SHA512 81257f7be3b21bf10caad654d5747ef2d978c0df5a05049b890420e2d170b7a4fa06151da0604a8b1b6e7daf2fb01344003c9243205a94b4040c580beb414836
diff --git a/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild b/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild
index 90a1a2edac2b..0e4ea8d6d1b5 100644
--- a/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild
+++ b/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-H=13a8a06d561041cafcaf5458e404c1ec354b2841
+[[ ${PV} == *_p20220110 ]] && COMMIT=13a8a06d561041cafcaf5458e404c1ec354b2841
+
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-single-r1 cmake
@@ -12,13 +13,13 @@ DESCRIPTION="Fast SMT solver for bit-vectors, arrays and uninterpreted functions
 HOMEPAGE="https://boolector.github.io/
 	https://github.com/Boolector/boolector/"
 
-if [[ "${PV}" == *9999* ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Boolector/${PN}.git"
 else
-	SRC_URI="https://github.com/Boolector/${PN}/archive/${H}.tar.gz
+	SRC_URI="https://github.com/Boolector/${PN}/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
+	S="${WORKDIR}"/${PN}-${COMMIT}
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -47,7 +48,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DBtor2Tools_LIBRARIES=/usr/$(get_libdir)/libbtor2parser.so
 		-DUSE_PYTHON2=OFF
diff --git a/sci-mathematics/btor2tools/Manifest b/sci-mathematics/btor2tools/Manifest
index e0ed4e1729ea..73dde492fd6c 100644
--- a/sci-mathematics/btor2tools/Manifest
+++ b/sci-mathematics/btor2tools/Manifest
@@ -1,4 +1,4 @@
 AUX btor2tools-1.0.0_pre20220518-cmake-clfags.patch 551 BLAKE2B 8cc8c427a2ec7defc4bd7f251b2a2a6484bc321b0f0d88a7099e8a69963cfbf6b69d13dbce4f54874d8138ec01ae870752a947a01c93c3cf996456c546ce012e SHA512 a6c446440405ab44b9bffb8316d170782241d77334c5837820ee0ea1e6da5ff97121b966a49af9c15e8e0e2a184ae3781166eb9c0ba07c4319dd92fed105ae2d
 DIST btor2tools-1.0.0_pre20220518.tar.gz 87420 BLAKE2B df8ddc8f286c32c580a8feaf0c7e90dff113d2b0303e3da0a378f2906cd34134ea91707cd40c95c38782990bf4d815416b3a566680f4d6668ddca46321ae530a SHA512 96e17327de311b3d16e086031038a8248431d0dda75b83ce137d6526a096b69fc062290f92ec5b58fffb56aa25437835f97a96bd15f0044d4d52263bf386d928
-EBUILD btor2tools-1.0.0_pre20220518-r1.ebuild 738 BLAKE2B 34983b33e56d2fc4494f074b03f7c4ac3ce24d82781e5a0193e8241431f0884e4f4e7bede71e4f26364f009ba0b096fc8f08ea8f9e1295c672d6ade77bbebf88 SHA512 af0b1e3d2b61cefc2006c17f15d722a65b2689bae14a914d50ba62d5f9b234605b5eb82b572732799a96c77d61d6237ec06e1b3ab0010857d8cf47912f938fd3
+EBUILD btor2tools-1.0.0_pre20220518-r1.ebuild 783 BLAKE2B ee38ed21c306323f3876201094b4d27de0133a3bc183ff95876851615428d92c66747db4bacc702641d394dcf1c8b5905726324454a8adde8d7c3ce1fb58b1bf SHA512 10d381a2aabd2d015caaf84b04b892bff00b997bc14fa537b112ae9ce56efc3d8a0670c781a611342a3ef736f5a6a795fc6fa0d3db1d9947789e74b82214d11d
 MISC metadata.xml 437 BLAKE2B 93f1e3a98b8dd3edd95de3bd8f830427a9e05dcfc73690899ed16ec49be25bfd524d86fcaa9735d15c22515b98d13ded8a95c7a39e4970e3035c72e4cbe7d544 SHA512 39b7bd39e597f6d3086358738cb2d668f0317af3a8674eb4c032f59c64de0ceada799900bd193f244f049f51e1a91dcd9bb4474db39ac88967086206f3090a62
diff --git a/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild b/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild
index e967b953fb59..58780bf5c440 100644
--- a/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild
+++ b/sci-mathematics/btor2tools/btor2tools-1.0.0_pre20220518-r1.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=8
 
-H=b8456dda4780789e882f5791eb486f295ade4da4
+[[ ${PV} == *_pre20220518 ]] && COMMIT=b8456dda4780789e882f5791eb486f295ade4da4
 
 inherit cmake
 
 DESCRIPTION="Generic parser and tools for the BTOR2 format"
 HOMEPAGE="https://github.com/Boolector/btor2tools/"
 
-if [[ "${PV}" == *9999* ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Boolector/${PN}.git"
 else
-	SRC_URI="https://github.com/Boolector/${PN}/archive/${H}.tar.gz
+	SRC_URI="https://github.com/Boolector/${PN}/archive/${COMMIT}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${H}
+	S="${WORKDIR}"/${PN}-${COMMIT}
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index c3963c1a7fdf..bba4b26334ef 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1,5 +1,6 @@
+AUX cvc4-1.8-bash-5.2-fix.patch 1092 BLAKE2B 3a637ffb59bcfd6af253d2c7b2964025f66c7bb074e2bfecb21b26399b9582fa3b4cc1c89b7a773bd37f39fcfa79d7cb8f9535fd724538b6cede38c3e964e242 SHA512 a0c51df4013bae3b5990972f39edb9cddbf6f627dec4533b697546e27056b88aa54aa2714e97a6cf8ba8262f86feac0cbce47192527928e652ae7ff2e27dc777
 AUX cvc4-1.8-gentoo.patch 1983 BLAKE2B bd9e7f8b442e151fdc27b45866ed4374ffcbeb5d37edd192cda13ddb3ca547b6e29cfea7641973636a184c14a649bb2131beb4e9c9b90f329dfd0cec8aab0bf0 SHA512 3793c9e318ffb266e505627ac7ea3cbf6a7ba3837a419967b873b72b71bc2bb1a45ae9fd61abaa95af02802267823d8affc1faf077f8ee16eef00ed7715c2187
 AUX cvc4-1.8-toml.patch 1329 BLAKE2B 39def94cd357381b277c5d5e8b39edc5d9e48ea8ecccf190cea13995b4da54a896d9c0f8cf714b8c74425da1c8269fd1cddbef2619a4f59cbc4090bc31ec14a4 SHA512 ca999ee52e8e91259772cb0a4be7ca3149cf46196b599fb8f23301a5b4a4c5154b7419706ba9dd7f279f003692b10fcf406a4159542807baca85683595401479
 DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
-EBUILD cvc4-1.8-r3.ebuild 1385 BLAKE2B bef7dc7aa982a1b123c6ada32443a74fdd967298b1bdb4a09cfde8fa322b8fd748293f9927f103d75ba2172065f95a19909f8d091bc68f0181d7de76e8c6ed34 SHA512 6dc1dcf5e3b9715abf2912f1fc2d61ffeff615a4360f046626b1e4efbbba04d877d32fba5365c8d8209661578d630af48b7d14b4a49adc3ac12c1021ffc9d639
+EBUILD cvc4-1.8-r4.ebuild 1424 BLAKE2B 6987f488b68bd1440f8eac18ccd4b4d7c78fd08c8faa58012a8a63d38567544767be5b49a21724413f5c9dfe07eaf46c1a88415e30deee3dd7986d2c2dded03c SHA512 b4003007c3b5151d39a9d58a6e921e1955e76db37c31bcb45e5eb7d43eebb04fe30c260136dd36c14702b978ba13bae24570bdb414524ac53c3e6d5abeb75988
 MISC metadata.xml 840 BLAKE2B d452e6a81280e47283c6ff9fa8a800d89c39920e95416e6b25a3bd55663b8ada050b6c7d21b65053ed2e94ae6affb570946fe699bc6efebb26dfcd06dcd0c184 SHA512 603da6ccd58f6d90f8738047c9f93d2c32583242711355fa619f8acaf8694f0cc1e22d41592914a154cc4cfa31b0ab7308e8584c8951bc78a3bdf8e5f130cb04
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild
index 276bdf289c12..d62729a94aa8 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN^^}-archived-${PV}
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-toml.patch
+	"${FILESDIR}"/${P}-bash-5.2-fix.patch
 )
 
 python_check_deps() {
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch
new file mode 100644
index 000000000000..54398da72555
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch
@@ -0,0 +1,44 @@
+Description: Fix FTBFS with bash 5.2
+Author: Jerry James <loganjerry@gmail.com>
+Forwarded: no
+Last-Update: 2022-10-17
+Bug: https://bugs.gentoo.org/883273
+See: https://salsa.debian.org/science-team/cvc4/-/merge_requests/2/diffs?commit_id=05ca9eee24e279ddfbaebea7393b4303200141ad
+---
+
+diff --git a/src/expr/mkexpr b/src/expr/mkexpr
+index c5f12f487..642a7ff0d 100755
+--- a/src/expr/mkexpr
++++ b/src/expr/mkexpr
+@@ -16,6 +16,7 @@
+ #
+ 
+ copyright=2010-2014
++shopt -u patsub_replacement
+ 
+ filename=`basename "$1" | sed 's,_template,,'`
+ 
+diff --git a/src/expr/mkkind b/src/expr/mkkind
+index fbf37eff4..77a8fc7e5 100755
+--- a/src/expr/mkkind
++++ b/src/expr/mkkind
+@@ -15,6 +15,7 @@
+ #
+ 
+ copyright=2010-2014
++shopt -u patsub_replacement
+ 
+ filename=`basename "$1" | sed 's,_template,,'`
+ 
+diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind
+index e2a733ec8..935040bed 100755
+--- a/src/expr/mkmetakind
++++ b/src/expr/mkmetakind
+@@ -18,6 +18,7 @@
+ #
+ 
+ copyright=2010-2014
++shopt -u patsub_replacement
+ 
+ cat <<EOF
+ /*********************                                                        */
diff --git a/sci-mathematics/metamath-databases/Manifest b/sci-mathematics/metamath-databases/Manifest
index c43e2ca2ac6b..e52a301d848a 100644
--- a/sci-mathematics/metamath-databases/Manifest
+++ b/sci-mathematics/metamath-databases/Manifest
@@ -1,3 +1,3 @@
 DIST metamath-databases-20220303.tar.gz 20538855 BLAKE2B 8aa3c505a16d1fac08de5d447eb55e4bc64f5fa53905c1147a17b6e65c87403f2baea9d30699da71f16cc34373f2d9c56c02f3b85327aa9db42af7c5c63db8df SHA512 5f2ca7e299ec3e8dda7739de057c69dcbdd4e23d5853826ac9d6ccabcaa0abf292990eb1925762ff2a5611b32628ed508b6fa4949121e090feaa0c986f3f67ac
-EBUILD metamath-databases-20220303.ebuild 853 BLAKE2B 522b476a701ab12125346e94246f25dc99fc5e22e10b9b33753def65e99af65d34b5112ca40d7d5078fc9550f83f6c6b5a597abe37a208d1e6af6d67b767a539 SHA512 d1eb8440eceb7b099ee40ac4cd8e414714088ddcc65b4a94f75535f6242e34dbab803947a7606b826d3bfb9d04ebd0a36ed8e8dccccd31c84c89783b34582e75
+EBUILD metamath-databases-20220303.ebuild 928 BLAKE2B c2494273ef97d0dfd103acd86029078969dab2a42f9faf672e78bc0c9c6b578e5bf36e0322bc4c4945cdd439c494cef45f5d2b803293288d674fd151716866da SHA512 88f6492bec74623231833ea08e675298b06bb945cd4fd54cdef48b16bb8b40cf8053fb508bdbd3f78af8d9bfc7627fb54d9b4540f31e7dd4429d752b29309401
 MISC metadata.xml 633 BLAKE2B ab8c86cc84be54a40ef6210855d1d77abd58f4fc9a8433fb8005a1916ec720201feca35fcd7f9587b720612df8f0d278445661e93632a80194038fd32d85c128 SHA512 b7bdc15f1089359deaf7f323ba21330680977b7a314c796d632fec744bcef5981746a55a5e8663dd7a6b09ba726b4291e1f80b10c03a2a60538ea1b04d229e1b
diff --git a/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild b/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
index 32304b03acd4..cb277918c6f8 100644
--- a/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
+++ b/sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-H=99d707bc3c600a9d6052a46a7c85f05b74c589a2
+[[ ${PV} == 20220303 ]] && COMMIT=99d707bc3c600a9d6052a46a7c85f05b74c589a2
 
 DESCRIPTION="Sample databases for Metamath"
-HOMEPAGE="http://us.metamath.org/mpeuni/mmset.html"
+HOMEPAGE="http://us.metamath.org/mpeuni/mmset.html
+	https://github.com/metamath/set.mm/"
 
-if [[ "${PV}" == *9999* ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/metamath/set.mm.git"
 else
-	SRC_URI="https://github.com/metamath/set.mm/archive/${H}.tar.gz
-				-> ${P}.tar.gz"
+	SRC_URI="https://github.com/metamath/set.mm/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/set.mm-${H}
+	S="${WORKDIR}"/set.mm-${COMMIT}
 fi
 
 LICENSE="CC0-1.0"
diff --git a/sci-mathematics/smtinterpol/Manifest b/sci-mathematics/smtinterpol/Manifest
index d56ef5728808..7abdc5ae56b5 100644
--- a/sci-mathematics/smtinterpol/Manifest
+++ b/sci-mathematics/smtinterpol/Manifest
@@ -1,5 +1,5 @@
 AUX smtinterpol-Version.template-version.patch 468 BLAKE2B 38fb0d6e26949f0e56a13ba41a440018e08409bc7527c4241f7c2d1a1824d727aa79f00dc45a854cbcf457caeceb032ec94ffa026234117073de011c89e94ccc SHA512 035dd014bc899f1694523dca5c59e2e80c510b77d3184ba38ec6c01439a555322e2fa3b9f2c8246656fe981685b49eef6370624cc55646222cb13fadf5569e0d
 AUX smtinterpol-build.xml-basename.patch 527 BLAKE2B 41e72630f9d8502f00fe79261e9a45d812fad310ccd3ae45205dc0245abbaa5113824ec4fae1de814b8a98f6bc154de21bbfeeda76d514224320545b5680d0d8 SHA512 6a327c27aa661468619b0b94eab84ab894bd5a7d96ab5ac8c50d1ea4cf1286397a6a2b662fa7a352c6f61d1dcc7d51fbf4a7c7c083070e3625877b49831b790c
 DIST smtinterpol-2.5_p20211018.tar.gz 10676726 BLAKE2B 27bed1f707241416f71d10ae33c39b7fe638b9650a26f3237409722a8782af3b09890dce9acf30ab2d0412cfbe94f57684850c51e486d3d7f7dddd8025021c8d SHA512 8630ae5f9cf3fdcbceffeeb1f199c2e21e27d0348d3aec5a7062ee5eb942c640661ae58603f273881f30f24630a92b041ea867086ce6d0a2eab5fdd924eb01c3
-EBUILD smtinterpol-2.5_p20211018.ebuild 853 BLAKE2B c5e2a288242b460a622bb838ebe53554e45e57ab5e44cbdf48b9346f341e8c9ac7aa73cc54b4e4d19f99b875d1e728f019fb143fb167f98acfa18b900f1d280a SHA512 bf1d36a47a30d79a1bd5c7fed7b4b8f053fe7f8b3bc35d838584c5408da764d72b995c07312e6997359ccfc36b55501faa1de0f0192f991df6469cee67d346fd
+EBUILD smtinterpol-2.5_p20211018.ebuild 944 BLAKE2B 1941ae5f0b1c35b15d8248fcc1d6dcd953aa3e8426fd8cce299b7eb553e708e83c7a13d9845647c035b42da499477dde6f423e5f3afd0f85df5aefa7dc8aeb3d SHA512 f5bfe96669c19f2b70c7150ad8e1114afe4cc9c52c51e6ac6946ebdccca7492f52fe21631774e857938d798d691265f61ca021406c79673723085c5932eff183
 MISC metadata.xml 443 BLAKE2B a49ab13ae830d7e212d85005e32f535d7a13d60ca39d28a0534b2f3dbd779b0afb39918649c903ad698c02b755e1d80e6dd928cbd6d1c045c0bfd514b7a51eaa SHA512 52ea501a323d32e118edd1e82217a6c92432fef5ccce7fdfa78023e0ef2aa76a8c66a274524be18aa39d26c547c00a5035c3998a74f81e6ba73d1c1458e33e36
diff --git a/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild b/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild
index 30f4b003bd3f..dc297a1f0de8 100644
--- a/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild
+++ b/sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=8
 
-H=32d7fa8751f668f9e9a18e4e96df3337b53d2150
+[[ ${PV} == *_p20211018 ]] && COMMIT=32d7fa8751f668f9e9a18e4e96df3337b53d2150
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Interpolating SMT-solver computing Craig interpolants for various theories"
-HOMEPAGE="http://ultimate.informatik.uni-freiburg.de/smtinterpol/"
-SRC_URI="https://github.com/ultimate-pa/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+HOMEPAGE="http://ultimate.informatik.uni-freiburg.de/smtinterpol/
+	https://github.com/ultimate-pa/smtinterpol/"
+SRC_URI="https://github.com/ultimate-pa/${PN}/archive/${COMMIT}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 
-DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-Version.template-version.patch
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 091b961998ee..1f9718b051fc 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index dc1567ea06f1..219c22b96d21 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,13 +1,13 @@
 DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
-DIST openpgp-keys-apache-tomcat-10.1.6-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
+DIST openpgp-keys-apache-tomcat-10.1.7-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-8.5.85-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
-DIST openpgp-keys-apache-tomcat-8.5.86-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.87-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.71-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.73-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.5.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
-EBUILD openpgp-keys-apache-tomcat-10.1.6.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.7.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.85.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
-EBUILD openpgp-keys-apache-tomcat-8.5.86.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
+EBUILD openpgp-keys-apache-tomcat-8.5.87.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.71.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-9.0.73.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.7.ebuild
index 81b3505e76ec..81b3505e76ec 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.6.ebuild
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.7.ebuild
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.87.ebuild
index f17ae55806f2..f17ae55806f2 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.86.ebuild
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.87.ebuild
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e84f4377fc12..f07262476fd6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 6acf29f132be..ec69356d3663 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -2,5 +2,5 @@ AUX ack-3.3.0-gentoo.patch 315 BLAKE2B 8fb44f3540a3567519f626c954f52c37945a48644
 DIST ack-v3.5.0.tar.gz 249718 BLAKE2B dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb SHA512 f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 DIST ack-v3.6.0.tar.gz 251556 BLAKE2B 6e65633ea9b8b24b03d3ff60c0554eb05009ebbaacbeede8109bdfd36340ac6151f3be9b461349793d6a222d4fb9b21579d44cff3aa541b7bdbc94d16269d2d1 SHA512 1cef0d873be47c8e27d5c3b3b47ea965cf39755d1556c3f653c28d75e1cea9b1ff183297c897d919e220cfcb556e3d5b88eb0b5343d933a05fa2c1fff1234173
 EBUILD ack-3.5.0.ebuild 824 BLAKE2B 37d847da5aa42702402ee167cfe3eb23abacc46531a4797c262cd7dddaaa60c783e302f37876e81384404d63905f445cec5278937ed1463421b00bf9d7f0aebc SHA512 916ab826c95d963cade68077ca0b990c5875e2aea738306b835133225af3c9b31ddd0250c4e21197e512285d82e48857b1e5213333fa20ef682de5102399d61b
-EBUILD ack-3.6.0.ebuild 826 BLAKE2B 008a87fe19fe7f653275585e61f932c68d74d225373298e7088eee1fb4837307828f5c410516544cc46320c3b36af0e3e9586deed19a2b46661672444b5168ad SHA512 fe53c9908278c751b1349d9aba12cd26f9c099a6c4c77ae1357e1f490d8cd4f56893251f232e55b8110dc6e45941a9be01429a27de39ec2f2815a3c2d8653201
+EBUILD ack-3.6.0.ebuild 824 BLAKE2B 52fe08bf8ca7f0de230bb4626bb0d1ccfe1417882c0edcd9b0a06475d303375b223371621911ccfa0c43ec0251056896283d24c05d04723267946c2b76db88c7 SHA512 b63cac119a9e147defe06eafaa5497a7e64d7de505f7a03e5c32d78431696a502b4c01698fc7eb63513dfbb7c548e92fe3485de0ed2ebdb4a84214b951844c0a
 MISC metadata.xml 1805 BLAKE2B 694cff62403cd9b60fb25326146cbc3f02ba68305a9b15e58e49c3ed18ee40ec3167850ed11aac1bcf83d85cf64bfb4ef4d826839e9e822375c35b3bdf2c51a2 SHA512 cefa2668b4e13afba72615bd595cbd335fbf863e639d7742bd19e4f05addde55fbc6d73d8f0d15a9e4a93fb23264f041bd802eaed2d63cd20e7ebe97c0d16257
diff --git a/sys-apps/ack/ack-3.6.0.ebuild b/sys-apps/ack/ack-3.6.0.ebuild
index 316b7d2e3340..8f36190f2ce2 100644
--- a/sys-apps/ack/ack-3.6.0.ebuild
+++ b/sys-apps/ack/ack-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index d8e2722fd420..16d4ad68990d 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -7,6 +7,6 @@ DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c1
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed
 EBUILD diffutils-3.8.ebuild 1686 BLAKE2B bdbf22e16f3791a7a844ac98dc3a64ac56c53e2ba36fee9af0a58314055c324c1a2ecd0cebf005f711483453446b03a9e8313df4050b7819f497d6302b4904f6 SHA512 b3e3b0aa801fc6312416e735111bf73a5aca065f50d054d45eac224bfdd861c26147c540f7e6cfa9755846188805495ca2c10f815c7c80440b13bdc346af072f
-EBUILD diffutils-3.9-r1.ebuild 1908 BLAKE2B 7ba9c3c54bfe812a8c3d099254d9ee42ed0d2f7f8f92d5264f2a3524aa14eabc68aeb95f02db9bf584ff55838e73f355dd5bce1c0114cebcf606a7b58cb6f8ba SHA512 6048c1c9974435cc9721f7fde2a2b472e07e5577529e83e1c35a6de7916a27c427291c3586e5b1eeee17138ec8ce9fc2ae13686b34043fd8618c1ff47f875011
+EBUILD diffutils-3.9-r1.ebuild 1907 BLAKE2B bdd0c6015532f471ce4dac19c2f48acf9dc5e580176cdcc88a61ec74bcf7d3aa9dfba77c8e37805ef9468bdb497919daea6612efe65508ca52cfc45e8e1dab89 SHA512 d3239f9b7e4a2435fb503cd5cee97e17215b210f06ae0995bad8bf483b058e28103372ba39a145e0876f0823776965b588ed97576efd8357c4b0b771149dbb03
 EBUILD diffutils-3.9.ebuild 1748 BLAKE2B 03be07947370fd6ae398de28c9bc46977ff96f0e098f93841b3179e08437db265a46b45e1d4352793cde49e868498d636fb0a5fec925fc2c210596898fbac81c SHA512 133ef5d5dc116dbdfccce754256bfc076710dd1eec1e0c330f945c91e0b53ba23c8df90a34da37ecd73ebf28f28776a8ab8bc7e97409c62c6f89b2fd1f8f92f3
 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25
diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index ec7b79978b3c..7f61222e802c 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index b79c62ce8174..891f96f8dbb2 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -3,5 +3,5 @@ DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff0
 DIST ed-1.19.tar.lz 66448 BLAKE2B 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d SHA512 594d5cf895931783110ee1956078f6a77aee022fb67730cbc6f1d30521c120b97820a5eb349278575f85c4c1e17fea0e16a3bc22592edae53c6fd27941ee3d7e
 DIST ed-1.19.tar.lz.sig 72 BLAKE2B ada611148a6347d8953c65669b61f69eb0ed8d48f6dc4ffaab8975dd7e28f1d87e434493a77e817ca05874f741e243309529e60e95f2a7636148fa71c711f5e3 SHA512 03ff7cf2f337fdc94efaa1374ce95d37c29c556b2a9a13f7216e05e8e9e9efc95bcbb554bd05000b5283d5f20884f3f50b16f220fba8e6ff318b1b975c6a44c9
 EBUILD ed-1.18.ebuild 1183 BLAKE2B 23b5cb591455ad1c1dad946876f8b7b4297bc41ddc0cf7a909c83c8585a0f3144506f25495a043c0ade9f5e0501b4d2c7219b086917953059a92ae9f4f523110 SHA512 75bbec07b179c221e7399f709fca3e430a0c856f9acba11d65c5fe9c740c08526629ae85c3d302f2cedb285a071b54158341d7d63b2d6934fca3fe8bd820d5e2
-EBUILD ed-1.19-r1.ebuild 1323 BLAKE2B 24bfacdd403086cdab410a66dfb3183fac020df3a82e2ca71a7834ea53f615a3faf4820a85c34fe10feaebb1a2ad2791b3df9c61af814ca942d4c8197750c7b5 SHA512 543ddd5c2ce723f82373722182dab10055dd85e21c36639b808fde27ad1a4d36e5caabbb390c7fe12b77b42f7a2ffd3b926b0ec7733103af907532b7fe653e44
+EBUILD ed-1.19-r1.ebuild 1321 BLAKE2B b2dc92117ccd1325e7ec96756872027ec56c8678d30d73fe85074481e874c72453e114b2d88436313ac971262277f275fe1baac25d72de3bdcdb26c18e0c0bb2 SHA512 10ee4e9ed672cac20c201bd0750f14910bedfa2a81c7d46f942b399078811ef2c99cabecc3db52b5ae50c3fac4fd73820a56dca2251fcd0a38949cbc91aec616
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.19-r1.ebuild b/sys-apps/ed/ed-1.19-r1.ebuild
index 2429101b04c7..e225f662b393 100644
--- a/sys-apps/ed/ed-1.19-r1.ebuild
+++ b/sys-apps/ed/ed-1.19-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 BDEPEND="
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index f24204367476..47ccb69087db 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -5,6 +5,6 @@ DIST ethtool-6.1.tar.xz 327644 BLAKE2B 002a4edffda42520d77e8f0c27adf909090823f1a
 DIST ethtool-6.2.tar.xz 332708 BLAKE2B b3fa2571b1efef3b686eb4f20b33e6cc32bdb8cff5f2e642454ca3d41c427b1953df7b07e5ac8ef149f8b4be614210e05e593233655e5fe317c48630b20b68e8 SHA512 ff1f14c7876163bef93ca48e22a3429f09b4bcb3e1d101ef297d9f226e3fc2d3c3f19faf5b85f54cb558479e4a408ef5356a2d12e7ba132cc4cadaf92effccaf
 EBUILD ethtool-5.15.ebuild 590 BLAKE2B 8850ed177a2ac5d814239e4eec4c72a216d562496cda15c1698aee52784a60ef82d245e65fa66f712c66310e2bf33967834e741c7add499ce5f1c69b9f7c0245 SHA512 919c114df09392c26db2c1ecfdc7cedb4ded632c00c4270b6f9405b51559ccb7928d55e65ef5f4cc06d177674016774ee440ea92dad88da86fdf7e3b461d3af1
 EBUILD ethtool-5.19.ebuild 605 BLAKE2B 1f0b0a87665434d31c5dc09d7902c629c118db82a39cbb3d63859bcfe7a60d69ac18e5a35c0244805926d9d044777e4ac6b4474d7526975436ed733970cb06bd SHA512 39862ccb79c301109d774a13e8862cc53654ff08278ac143a4a7b8b62178a47d6b2a341fa19804afd4d8691110c1c60cd4024f99b389bc9365ce82977f4996dc
-EBUILD ethtool-6.1.ebuild 643 BLAKE2B e19a3f14d6eee57556e5f574f7f6e144ad9b0316bdb23a4bb27724a6086f610153fdb6cbec2b4129459688b501c6bb495d737bdb09f1e8576ccfed705b4d6368 SHA512 99c8e7bdb499b3a9927f5b89fa477cf5df7877d074f91fb024f1b9cbeb90b54dc725c647afcca2e80550547bcab89cae44285cfe47b58e6a2a057790069a7d11
+EBUILD ethtool-6.1.ebuild 641 BLAKE2B 30923d70692c4b580e03c17347f104d4b99ee23ebd9664c717d00273bfc22fda66e53800c71c0d2a873a186dc3ccdbef72fe3a4d7d64d5d253963f9138141b08 SHA512 7d313abdedf7c2bbe68d2f676ba85a12914b5fc80e6a132ab2da52c7c25212b06e591a186cb8f9ed949d3ab4bab404d47d357b278a6367f2c5385008a0f1112e
 EBUILD ethtool-6.2.ebuild 605 BLAKE2B 5f3dc535aca5067e234b9a3893c6101f78fc9998351a958be068f8aa16a1bcc5d46df9459f061c801a49a79af7390e3a86281dc5f5c130ad8a9c1d9fb44fe9f3 SHA512 40e6f1d78d664fd8f5b0e15269018ae6973dcb8447cef86a49dd0a78c5d5e5eee1d73005141d49082c5735576197d21bc7bd10241d2359050b1d2d056416223f
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-6.1.ebuild b/sys-apps/ethtool/ethtool-6.1.ebuild
index 34fb737b1f43..108ad5e44c50 100644
--- a/sys-apps/ethtool/ethtool-6.1.ebuild
+++ b/sys-apps/ethtool/ethtool-6.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+netlink"
 
 RDEPEND="netlink? ( net-libs/libmnl )"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 1e0cd9ecbc8a..d1e9f33fdbd4 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -2,6 +2,6 @@ DIST fakeroot_1.27.orig.tar.gz 544301 BLAKE2B 5e887d43c8bedaecbe51eb7f606d6bace3
 DIST fakeroot_1.30.1.orig.tar.gz 551219 BLAKE2B e8f7e69d5be0e8e87a365f59f61a848ade0a10ab926bf10262ffd32f126fa0ade92be66f377ea8aba907f6a1ece85b68544ee52b08c45287853d37ce492cc015 SHA512 a7ed2d86c7adf3e662e79b977c23247bf942fddf98a11c370389f0c43dd51e8e038c8489d0bb583ba90427c832fa36b244880034d25cb475f27ad68a5d7cde0c
 DIST fakeroot_1.31.orig.tar.gz 551366 BLAKE2B f9b766f233f1f731399a814d1936b1dbdd64808a411ba11c4f460fe2eb66d3a5d40fd907d3d6cf6d9f0d062ad24319bee379da0609bbb9b0e1b7f17a889643b0 SHA512 a66a3535c2088ba8c33e3afc18d2ab1a16a502b999a4efbea7542e345181aa172af2e0949989832cda69bf6753c80a4bfc12cc283f5da11de31aa0bee0e8b47b
 EBUILD fakeroot-1.27.ebuild 1873 BLAKE2B 403342870cec943c9293250b47cc0c830c1bb69d5b341cacd3427c81bc9c04b39a16db8aeca88dabcdc670998bf3e2a312ea7520090c738bd450663735fa3e94 SHA512 ac5db48a976bb2ef41e03dc82c8617428ee3f923e5044085b6eac1be22c852227cd4f39d18092a776f99142de1754cb203c22971a45f304c281ce9e8a0981597
-EBUILD fakeroot-1.30.1.ebuild 1880 BLAKE2B f474b7a2c34dcd00ed626cace3e7258b5ed96576a4be2a006dacdb0dff49c70d732e008565f64c49e11f26a6911e83e67c54f3d0c89007a1ebdb3a4d2bcf84c4 SHA512 32eb715f29ebb8586d90ff59665b2b9c19ed6df9990b84e313ea9da56487508d333ed22cd841bde6be3d7a21e58da0bd23c8ad7725898b455291506b2c0b9f31
+EBUILD fakeroot-1.30.1.ebuild 1879 BLAKE2B db5d65f07a9a29b5709154dcf2c01a424c5102a74775120b3a9abfe68e4d3a6f5f92a02d27a58d96293530529cb0d3c54ff8011d87912dad9067d200b300b8ce SHA512 1cf76cfd45a77a07f79854b43f25027264cc09be7387e59482970cb68e969d5c81af0ae44c6d41c6f75cb9efe36561faf42ea13c770e91b22a74e8501edac6d0
 EBUILD fakeroot-1.31.ebuild 1888 BLAKE2B 6ce7031558575afb3b10bc0cf4f5d2c82a833104881f7b69b800038fd2929000bcd0c3db29177057029250a294cde94b583a16098c4dca059dfb09e9e5873385 SHA512 223d0caa9a91edbb2fcd3d936506c808863d42fd20829ae588eed91eab99ece4b748fdf608548ae9b67049ac723797624656943ef5b92987aba0340f52eac587
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/sys-apps/fakeroot/fakeroot-1.30.1.ebuild b/sys-apps/fakeroot/fakeroot-1.30.1.ebuild
index ab51c4ebb6c3..f8c6bb31044a 100644
--- a/sys-apps/fakeroot/fakeroot-1.30.1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.30.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index b3dd4263a45f..4cf5d83b63f1 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,5 +2,5 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
 DIST help2man-1.49.3.tar.xz 228472 BLAKE2B a5ed9ea3ff78b5287fa5bc02302da6a3657fee8fefd4fc43289e209bbe128d58da633c38aa4039c93a761c4842d3549a73cc14e77ee2859ed256613a8fba6e23 SHA512 5f19fad1e38b0572b63ed8bfd146b717fc22dff3a26641e8b5c8431df13da9574679d9a3407da62790db8a29286694ea1bfd751cba168f475302ad31cce845cf
 EBUILD help2man-1.48.5.ebuild 1091 BLAKE2B 0b0b08f043d26dada150219e5f327a8c8265a7b07fdb49da5b7ae9270ffabc99531b775c17a0d78ff64b2a21df185462cc5cad8e7f7653a758700322b87d4b8a SHA512 f4eaf60a9961c6c4b1e9bc58577bbd9a91002c2c39075389e86183890adf5ff7839d5c80281c9c188122d3c12d609b12fee934b8082e3de17641573619dd4f95
-EBUILD help2man-1.49.3.ebuild 1143 BLAKE2B e8e61ca37ee38c6bb4708aec6841ba46811690141f825e89ce7a2c7bf137436d57287fa1ea11a2a976e2d6c03583af334470598d315aa390959d2ebb55a5e387 SHA512 9507dbf2d89869840735511182e586d3b1785f1b6b1715fd32ca8ef872733a602996416e52da2e71cda20a2bbb74127c2e625eb29ecec49c4fca05581f906703
+EBUILD help2man-1.49.3.ebuild 1142 BLAKE2B 8ce9b64f1f33726d5c07ed0a90f5efed482113a2691329fdd21bdff0bc7887638d5598e56d539d2d40fda6ac67f88f0ff6012b0917001e42037c78111fb49e8f SHA512 9ca2a3ac502787bed77d081da4662b402747a4bdca7d4baabdd2914031f3809062442417b62f42b492424ae394e7bb7cac53849b1e0a1109f64c84488cc52be6
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/help2man/help2man-1.49.3.ebuild b/sys-apps/help2man/help2man-1.49.3.ebuild
index 2e0430e89075..bed909f22d1f 100644
--- a/sys-apps/help2man/help2man-1.49.3.ebuild
+++ b/sys-apps/help2man/help2man-1.49.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 # nls/FSFAP for bindtextdomain.c
 LICENSE="GPL-3+ nls? ( FSFAP )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 707b0bf60189..196bb00607e7 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,6 +11,6 @@ DIST iproute2-6.2.0.tar.xz 911588 BLAKE2B d3bfaecf33ffc7861e983e8db0d6a63f4767b6
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-6.0.0.ebuild 5943 BLAKE2B d85a48405ed9359c187e770afdd7583f54c3905ee5b58488a604369957333a79c9d0f3c3964436116e5799ad9d8e7ade1ad51c02d89cb10983b9d5f11d015297 SHA512 6df97340ce887a0f9a1319c5a4458872cf8157c3131cb8dd27027fd18867571a6b80267974c1c0009996e4fd8fa6431434d5ae61ab2fc0b0c988ba3668c7f84e
 EBUILD iproute2-6.1.0-r1.ebuild 6000 BLAKE2B 49f03ac76621e34f65217bfbed93815d72914a081dda6598b1ce789dff8cf3f19697b199dde9a9e235738ef35b0cfcbdef04ba4652d3022dee49cd32b7f11a66 SHA512 d8a3fadd4a4ac3a1539f1b6c0e74320b321114ea3ddba75111606362f49412e04b6ca578cfc0f07d2fbc460d2639a1bbe8727c08e65cf103f29c552dc93b3bc5
-EBUILD iproute2-6.2.0.ebuild 6009 BLAKE2B cac720cb126973e77e923f37a0754aac6eb80f559688a77af9ea6ffbc876ba73bcd3773fe695c32c54781b4f464d9919ccc30cc9672f35cb98d268acc5fc7e6e SHA512 94668c0d636bfe43dafc14470cb9f6f04ececc3d9178ca5cae905d236263e2ab7c0a3eedd5702a02086d49cd8382f778f80c54c9469131ec42d39f73e6116ff3
+EBUILD iproute2-6.2.0.ebuild 6002 BLAKE2B 5ee43a3c026cc496b79c315b1128f2269c51b68d8031040568e35af49375859d3a5299dfdda46d09d140c2fed40a619702a86e562c26e56a4b61252d67420515 SHA512 3ff48558c04a523103cce65cdaff940cb9062310977971c7590f6de544eb8d53c8d0d0b94454452546362a48e0b48c67ca46d555eb3add767f50281735bca66c
 EBUILD iproute2-9999.ebuild 6009 BLAKE2B cac720cb126973e77e923f37a0754aac6eb80f559688a77af9ea6ffbc876ba73bcd3773fe695c32c54781b4f464d9919ccc30cc9672f35cb98d268acc5fc7e6e SHA512 94668c0d636bfe43dafc14470cb9f6f04ececc3d9178ca5cae905d236263e2ab7c0a3eedd5702a02086d49cd8382f778f80c54c9469131ec42d39f73e6116ff3
 MISC metadata.xml 973 BLAKE2B e505f65ebcc30561fe249ede546cbad6289a0be929be6105379c25674e1dbade56fc62fa75839b0485099f13bc175daa55ad8b86f0a346e52907cfa00c4bb3f1 SHA512 a7e201275dd562c097d66083225e74221f81d89a7efac98b7c05cc7c508100a94b9e928854796cfbfbfeb679acfe34fb79026f7d04df8e07f57132ffc64be525
diff --git a/sys-apps/iproute2/iproute2-6.2.0.ebuild b/sys-apps/iproute2/iproute2-6.2.0.ebuild
index 831b5a3fbf14..3ab5ef70a410 100644
--- a/sys-apps/iproute2/iproute2-6.2.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 8d4968e0c95e..720bf1cbbfc8 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,7 +1,7 @@
 AUX kmod-30-configure-clang16.patch 948 BLAKE2B 35403640d79e60d1600abd676be818331ea975f139136bd60cd06df183768d78e11427505e7eda56d501a964420bff07eebff61e414655a7b043076e082ab143 SHA512 5f1b765ba51e224d464814247aa343649d1677f619dcca99d0a00ca244580443cc7615bf5291773062aa03cdeb42c7475d40da749c39d79907ae4ba0c9ed9c29
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
-EBUILD kmod-30-r1.ebuild 6138 BLAKE2B 9c4ff04c20c027b5ef347c6b470c6d0c56ee9a9191d53b383991230b1e4a085884cad7d4793eddb5a0761e975495bc9f83fccc4ea6266e81df7076d0970774c2 SHA512 3429beac32347536dc6422c77ede29f6416d312a79ac3de7c2a1daa16a8742883c8b0d5a959c0dfd58acca4cdb8253674e01b1720b5b7e8303fe6923c090a8b4
+EBUILD kmod-30-r1.ebuild 6134 BLAKE2B b9cfdbd59469cebc6193015b61b127a30c65cb013f46cb8fd14bde0dd979338b6f934f7013ff5e539424dc63ea4cabc11140abace5e9df68bb2c31accab7abda SHA512 424dcfef85350f160e15f3ae3a846962a2c931812b7a9fd7b38b80c681f8d17d6fcab508b774b9f447f195cbf3f25b4bc663b428be02accec7d787591b487ebe
 EBUILD kmod-30.ebuild 5286 BLAKE2B abb956a6d6b60f47941bc754c7b4b902776b85b85a9d447994991fc8cb72b3bad2e6ce9ab50f8d4effc51500a340bac62200415110725fb40f40c3df2f176d3c SHA512 859b05e77b9c2acd45810442de38cceb244b4fd23b9410de890b544a39478db2b3ecc9c113d05bad2b742f5110af44966f898e921bd6f54cdea484b74ed1d7a1
 EBUILD kmod-9999.ebuild 5970 BLAKE2B 85950b5aba18c4050c8db2f63e8d513f9490d886541523e007890aff8cce52819a76506b8332a84dc052519095237b29de0b2ecbe193cb6e969d2326e184496c SHA512 149e16f86841f272f700633b39eafbe179d35efc4db7b06a51fe06562b210ecdb1e2fc0fac8fc5c644335a07f22dca03f8ae312eadc0c5d394da44a89b2e1cae
 MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3
diff --git a/sys-apps/kmod/kmod-30-r1.ebuild b/sys-apps/kmod/kmod-30-r1.ebuild
index 50e92c96e55c..b6d5169ca966 100644
--- a/sys-apps/kmod/kmod-30-r1.ebuild
+++ b/sys-apps/kmod/kmod-30-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="library and tools for managing linux kernel modules"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 4ef159b59d47..4b0a0b192a99 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -5,6 +5,6 @@ DIST man-db-2.11.1.tar.xz 1948788 BLAKE2B 60c3895a6326222e0a3f40902caa18991b5f76
 DIST man-db-2.11.2.tar.xz 1953276 BLAKE2B 80ac565cdb69736c0f922b9cbfddcae753d176329781deaf9434d87d7718f9b6ce0b6d4642a03f22a04c7f042dda7f8986b5bce0038f0748461ca55d66964ccc SHA512 edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391
 EBUILD man-db-2.10.2-r1.ebuild 5128 BLAKE2B 532d907a06f95b28f8b6705fe58d9d62797ae5ac2633b25981cae36ed16678e44a7026c19d7449244b7fcbdc5187d08a898753af1c7c2c3d2e718ab4c450032b SHA512 a80d67860f7ebc8b029fb5b83adbbef32ab1714102351cee8c2605228e00caf87627dfc08e129d255c80f04a232e0b30eeaee196bb7da969c3cad1021153751d
 EBUILD man-db-2.11.1.ebuild 5118 BLAKE2B 6ecaf35f62b4bae1939956384c57fc00792db0aa84d9b5945c9ea67f2f8cb799e1182df47248c1a66fe80e48c99df9c56c89c25ea73b8f73e2af86536acfd4ca SHA512 6adb3bc7adf22ea2f6ab51bf823be5834b88b2f15bd2d4293d078ef06942fa69c5757903f7ce71df234d68f89c39ef5c36f3cbeeb0221f7a36bbb6a689938e35
-EBUILD man-db-2.11.2.ebuild 5119 BLAKE2B 8d5e4249093da0b2b856cd8b237df24aa22a7982163baddc2ae079961000053535618dd68fcd1e4e96f74304b125e8c5e325383119b3037551596babc9828b0c SHA512 8e9836f7e645280587b0854eaf737e4289cdd3ebab09e2cc3843f2c1417cadb519fadafcb805e04ca6dc3a72c848f1daa5245edc5d6a55a6e1ff242e075438bd
+EBUILD man-db-2.11.2.ebuild 5118 BLAKE2B 5323cabed743b1f70e163a5b3a16fb6d9d228c87d6caebca4c734222381dd96a44262490e7a623f128c5f302a1e913f047bac137a3a1129e09b1c0f186aa67aa SHA512 3c25671ca6146cfcda0df52978f766a9d0f44c3d12b217adb796326408146c33951c7de0d039bcb7c06715df2c7324d3373f5f92e8cf9bc5e743ea3a0958224f
 EBUILD man-db-9999.ebuild 5126 BLAKE2B d9cdcdd39ed3a813330092d43d1e6c2431669e9b083dde0f1efd99481c8364c4cd7cb01a52b25aeec518a93926a82693a19ed58cf51338c2f74e09347210fb64 SHA512 99a2c0aa6fcb1426887fe320c6dc6368b80b9a0fbe45ca320c831ea27f42dca2abd96b1421b86696bddef90d122225bd6bc97d7372d144fe4cc009d02469d041
 MISC metadata.xml 428 BLAKE2B 6d0c1067a27f4ba0467b268fefcab6a208d3367592284349e15eb2ed967f29e9505eb786bbd0236b1fb41d58c2788d8f5e61ce34b97cc7a5702ff3dbe32a1f36 SHA512 2542a4c5c15ad471d143fb713617d6868e9dba49ef14840f44ae3c9d05e74041a845b3a820c4dfb9a819a72eae763f9f8883e933e4012318043baada11fc85b4
diff --git a/sys-apps/man-db/man-db-2.11.2.ebuild b/sys-apps/man-db/man-db-2.11.2.ebuild
index e3c2aab9d8ae..13a2d858290e 100644
--- a/sys-apps/man-db/man-db-2.11.2.ebuild
+++ b/sys-apps/man-db/man-db-2.11.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index b9540b9271a7..cf62fceaaec7 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1,3 +1,3 @@
 DIST nawk-20220122.tar.gz 1832761 BLAKE2B f704ff9cf5012545ec3adc1887c0d43625d7e38e19589cba91fe31f664e72ccce20dee3f2484067a31af793be16439c1389603fbdb33c119efeafb18559a0d97 SHA512 46ab7936705288c9cd22867ad9f5b080ade67c4b05d674304e0e5cae8ea329420a9a46e3578bf3a014b7066a1185b7506b0f74445bb52aafb1090e7a82a5bf28
 EBUILD nawk-20220122-r1.ebuild 1223 BLAKE2B 085fb2b121a121d20152056dce2a244c25d380d90d61da7e62028f2d607155dbd050f98417e0c6d2824c3ddf2d9a8c5197c7091159f8baf035a0e73e90d725ec SHA512 bc40324399e6be4ef25b011e264861b88bf776c10cba6538d644ddd46034efc5ab5b7e148187cb1f391e023203b7796503121a7d906817ff569473c40f57aaea
-MISC metadata.xml 417 BLAKE2B 85317627ae503b37bb2355d4142e2af954870cce4b495daa56d7c6df2bb1d249b4ae824daa23ac8e6013926501827cb39891b184354a4757073e055e43d3601a SHA512 004179548b6f06aa73b658add57f0f2c9755b67ebd3d7e0956c5856090a662d58c8bca35a1de7cebcd3eceeb84e0f0efb0402db9fd743d5152bcf3c74b185b9c
+MISC metadata.xml 337 BLAKE2B 39b318d3780c5249fbf02ea024166015bb8d7798da072dbaf95318ce222f9722cf86d04e9a7c8c92c27377f5b6e09e2d8c11906c9d4e1977102ff6611f1ee6fa SHA512 8dd91d8652fa219ac793b361e5ee2bdc5337c4c098a851a1d19bf03cf2eb9a0c5ef7087f2b4ab7f51a0492ee03a7ea471f990a717e20f492dd9a57c1111237f6
diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
index 88ceca8bd811..c47852def826 100644
--- a/sys-apps/nawk/metadata.xml
+++ b/sys-apps/nawk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 3199a4d87d5d..a9a2544dd9a1 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -2,5 +2,5 @@ AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f
 DIST pcsc-tools-1.6.0.tar.bz2 304960 BLAKE2B a60d280d39689d7eaa407aa5857c63af0acda3791e5d9f5c2f62048260178dc728fb179aed3c369340e192ba9b3d5db04bacbe5cc6ef1519c7cde55e10ca6b45 SHA512 951014510dcfd011fc08c92a927ed8a39751c15cd9278e9bd61693a2743a82d4b88907e01e013738f6b5afb569cb4d9e9802ee575c731b83da33e92f96eb5d50
 DIST pcsc-tools-1.6.1.tar.bz2 313105 BLAKE2B 62169f4bab81cfe137098b863ae572df283498f7fcb6b6ecaef9122ccc530d6201805b13903826887c70363443d02e43d0d0fb88e15d5f634fc0e1e775c3ecaf SHA512 fc1a6bdea55ee1194d08998f229870b7fb65f53b3b5ddb209540980d95dab8dfb62d4bc865716d0120bb843d5095b0ad9286c42ad352e52c1cfe48ef28b5adaf
 EBUILD pcsc-tools-1.6.0.ebuild 1390 BLAKE2B 7faab3fc2f66bcff8f46fa4a892eac268bd3dfc9acd1e5c655bd2fd242b025dde9d0af58d4798f756515279377da1a59db7ca975fb2b6d3639249bae5188b6bd SHA512 1381dae367689c8bafa9867b1eea875ad8e623a12ac4aa0bb1950d7a9cb2d118d0f92fb4988680bb1a718f07af50b19a05849eb6470b4551533bf86890bcde3c
-EBUILD pcsc-tools-1.6.1.ebuild 1392 BLAKE2B 70d4f58d057d70700f9eac5a305f26823037c9b07ebb3638c4ac28becb8bbaa48dbabd3ef2f0792a7073b76289c48dbf43b3c797cf5023d87e04325ac41e391f SHA512 f2f582550c71fd5cfd17f0ab93b9cc2967a07fe3fb79ba00c6875fcd1ffc69b355fe338e220783c1a4236c6777a886226d86bede655bc02b52b51b0365e57366
+EBUILD pcsc-tools-1.6.1.ebuild 1390 BLAKE2B fe8027aed9f82d103ee67f3192f402d2fd5b02dd91032f3f26c7f61a1f8c16b9c19ddb132d87477b59bd83da3742feb53a8f1a640a1ddcdb527beb0ec58548fc SHA512 58eb4058aa8a91e8fab0816471c054df666eae8cb62db10e71a16cb8eeee6ca230c17f7cdfd8d042eabd314d8ef700541d77612372a7b75980d6fe8c47cdd10b
 MISC metadata.xml 448 BLAKE2B f642f8f9a269fe6e3b082d4c17e2ab2c8aeb67ddcfd7a5bdaf66a95aedd6ffcfe0bcc936ad2c5e24904dd15814d61e609afc055ca5b6613cc854bc802cddb239 SHA512 feb5f0c59a283bd5f42b48cbd7fd148cd0716566438dd76c254732a9fea6e886c5e1d5416dff3c419a5fb77a03e240b3c399b0d7d81ee41ee09c02b590205d86
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.6.1.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.6.1.ebuild
index 0ace64a2fa7c..42ae1acd88cc 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.6.1.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="gui network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index fada9738054b..3d3983a52a44 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,5 +1,5 @@
 AUX sg3_utils-1.47-musl.patch 1238 BLAKE2B 557c29249c23afe8ee807e0cd168d3a502095e3eae0aeea006b37f8b2e8c2dd3530c37517e9dd4ec1aed2bf14707cbc2e1dc6f607f091130dbafa61ca2470b69 SHA512 5eeae68fbca737e127f43c83177adda5c4ad41d49ad6e4ebdb780d25f9eb1a516456e2f91ef20f95cb5dde63505c385b3bf514dcc56235369689f0736df0deef
 DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163
-EBUILD sg3_utils-1.47-r1.ebuild 1069 BLAKE2B 723f35d93878083057123c1aa7ca4993093697d4359258a3f6375d7518a50a2b49a365f4a5ef2a70ca5fd8666f38b0096cf9929a45a3aa0de4b4b3d5ee981c78 SHA512 3d27510dcb3b10e0c5ad750642d47302b06ceb78ec7d3fd7ad63b29528a16125ed5bf11b42dcdc89b2706ae9ff00b60f1dccd0b0f2960f84481f584f27d84551
+EBUILD sg3_utils-1.47-r1.ebuild 1068 BLAKE2B 43770480753f5eaeae62b22010ed737a60b99c383a210672a31203fde5b035c09dc941fa56df5e071361ad5bb9e582c293b6a11f568dbdf8319d45cc76af71a8 SHA512 2de2022bd78bd70a6b42adc997b572c41891b90cca0f2d4a7a5cbcc83d7a8902efbb19386d853053ed051c3c1be822bf4a34724bdbfe724e7baa8095c160fcbe
 EBUILD sg3_utils-1.47.ebuild 1003 BLAKE2B 37ab8a8a18d80df213402fe43335bf07b1a36056a23cdaff02c8b199e8b7e72af3b094170a9b748072848054382be4efe6d504cbd66260ce1d6ea16a18fbf5a9 SHA512 9bb97a9d684a6ff8cf64b8f1db7c4eaebc2c37ab13c990e26139ce02c30b0a6be0af062d3fbeb05426bcf37b31505519788213bc0ade798110c887407eb9c86b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
index 9dba496e738d..b9d2a4e04e0c 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index a97e7a211c13..486b83fab0e5 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -10,7 +10,7 @@ DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d91
 DIST systemd-stable-251.10.tar.gz 11461671 BLAKE2B a351b6dd9fc307e4bdcf0323b16e7f58c714392cfa466180a81196309c289b54767bfe5d03037eb1bd6b273d7eb8f6f42b927aabaa1310be04266675d1a3dd06 SHA512 49e33dbbc1b2ebe123b2f722070c87524b3126d1e605fb3e24a3f9f328ab67de506dc4588a92caf157428c21b9c73c3884726c4a5b1f67bb997d4a68bb871e5b
 DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
 DIST systemd-stable-252.7.tar.gz 11825226 BLAKE2B 81ef2f6cbe7902014a92702c0eae740d18fc24355c186f51a0467668bb225d358a422fd02eec4c38063a3f65a9f1b1ebf88036c4e5cd0bfc50857d2818a42178 SHA512 691caea30d759afd3a1ad11495f7531c04238b080281617dceb1671ea3e27c7a6a4859961a81d29ecefb94b7a764e40283f39294e34beb63e0862777f5a8d34f
-EBUILD systemd-utils-251.10-r1.ebuild 12671 BLAKE2B 83cdbd9ef84acc8ddc65d7911d74ed1bf7b1bdb26ffdd3e34fcefa234224b43491cf0c0e02562ebd071203a8ff8d335a3e4dc55aa0fb4b82b60d5abab3a54201 SHA512 9488690cb116d521dbe7604333f456f093ff3bb2d7462bc967ddee1d4820fb0d8bbfb8c2590bc059e9d6280f1aeb9e1cd763af067ca7ed5db57d696ec2652142
-EBUILD systemd-utils-252.6.ebuild 11749 BLAKE2B f2133c3dc53e75944b4195a27f9f569d7f9c8d3da71d383649790272e14687b71c2f30024ef3e5c83304d5f661e41771fc39f3c309ca7e74be756efb5c8afc3a SHA512 7088cb7b038d71c65f9508cf481654b5bff0e924d94591b2ce82c7a196f204eb885238ebfd9014e72b8cb98eb0ac49084eaf10c7835f38a492513d6687a3e447
-EBUILD systemd-utils-252.7.ebuild 11749 BLAKE2B f2133c3dc53e75944b4195a27f9f569d7f9c8d3da71d383649790272e14687b71c2f30024ef3e5c83304d5f661e41771fc39f3c309ca7e74be756efb5c8afc3a SHA512 7088cb7b038d71c65f9508cf481654b5bff0e924d94591b2ce82c7a196f204eb885238ebfd9014e72b8cb98eb0ac49084eaf10c7835f38a492513d6687a3e447
+EBUILD systemd-utils-251.10-r1.ebuild 12736 BLAKE2B feea02da15486a055ea054da1b47688e892e2816098376b4dce8f0e01c37e21c232ec3976e7a2865ebc30a325adda7bfae4fad270814042411f0eef9e98aba22 SHA512 5f0f384d87d297619432563be3057179812d668f65c05f5e1424b028198597adb1026e8619f9943ed8b998e00a0ba0200947e826d1f6249a3b361e8bdc412f6b
+EBUILD systemd-utils-252.6.ebuild 11814 BLAKE2B 3435d2fb36430fb2beb867bf12bd41e89c068093b25b60419e55f822a3e82288d4d6c8debcf40d6d1e6220c6379691dff465705a6043ebb8f3a8a0a5aa5c6516 SHA512 f90b4c02fecd64711d123ffeff8021a8af0c6a220ca40eba6ef85ad3b3a408e78f5125c51d59c3fdc411d4cd4abea9aa80b16842201cf71fbf4bd7d6d9d7a9a5
+EBUILD systemd-utils-252.7.ebuild 11814 BLAKE2B 3435d2fb36430fb2beb867bf12bd41e89c068093b25b60419e55f822a3e82288d4d6c8debcf40d6d1e6220c6379691dff465705a6043ebb8f3a8a0a5aa5c6516 SHA512 f90b4c02fecd64711d123ffeff8021a8af0c6a220ca40eba6ef85ad3b3a408e78f5125c51d59c3fdc411d4cd4abea9aa80b16842201cf71fbf4bd7d6d9d7a9a5
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
index 2b52117a1fb0..711bb3bae0b1 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.10-r1.ebuild
@@ -159,6 +159,11 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_use split-usr)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
index 35fbaaa92fd2..f70a496cddc0 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.6.ebuild
@@ -130,6 +130,11 @@ src_prepare() {
 	sed -i -e "/${rpath_pattern}/d" meson.build || die
 }
 
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_use split-usr)
diff --git a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
index 35fbaaa92fd2..f70a496cddc0 100644
--- a/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-252.7.ebuild
@@ -130,6 +130,11 @@ src_prepare() {
 	sed -i -e "/${rpath_pattern}/d" meson.build || die
 }
 
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_use split-usr)
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 64c65dc7fc61..d5aeed867623 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,5 +1,5 @@
 DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
 DIST usbutils-015.tar.xz 167472 BLAKE2B 1074c7159e9e6729f03f98e1f38fa0b3fef3e744b5297e6d97a5fc44ea374e2d5a0c481e14b2a034bca201048b1305c3877dbb15e3c4c04b228b4036048d8904 SHA512 cda0070138400703d7429d39dee49130aedaa704292531e6af57b347cc62422ca609540650926e74335f71d67d7d4655418be4824e1eb8a2b065c7b395feaa87
 EBUILD usbutils-014-r1.ebuild 1349 BLAKE2B 775f7bb70f2b19224f0beaa365c48011b12b9cda3461bfd63f68cc657925fca2af6e85efa10102dc64d1277aaf3e8f33a18b4cb00f0d565712ec403ae6b186b0 SHA512 9742c9c12c73df29cf80c0a332878eaf7a9b6975dccd3d83de9e90e81b531362ff6b76969acfaa38e92ac8e4703a9249163839211333042b3835c779e5949c53
-EBUILD usbutils-015.ebuild 1339 BLAKE2B 64e2e25a8eee3b86ccda793e545e0be6ca3c2127bcf6ac903104d22bf235df9fb61f05e50090550d932a2444927d913e2b0493858bfab4a0e6ad170b0507e0eb SHA512 4ad427f455b76f283c6221445424e151e737ed2f961c8440d2ba38c790f558fca11b6e90241ab81a736827a5ce16c6b81df54139c5b88befa03c12ffdc1dc7cd
+EBUILD usbutils-015.ebuild 1338 BLAKE2B bbf22cf9862b6e631fb0e08fb1c5f6e15051ef14ed6055f070e2da65e5f056af46271740f562ce0439a6f548f4f8149863eee94727446e7b00e3e1898dbe3205 SHA512 34449626fda13996a32db3cef0516c555610332f707f9d69d135f99e896352539d2fdc67919f5a73b6f00ec989c5948832b0c31419c78ebc9cf36150bec1ac06
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/usbutils/usbutils-015.ebuild b/sys-apps/usbutils/usbutils-015.ebuild
index a3a8a3699711..062b46581969 100644
--- a/sys-apps/usbutils/usbutils-015.ebuild
+++ b/sys-apps/usbutils/usbutils-015.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 9e8afced4842..6706d036e9e3 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -3,6 +3,6 @@ AUX watchdog-conf.d 158 BLAKE2B d998b3cd1788d60d5aeec2872f39f748f75fb9bb6e3ef643
 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a
 AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd
 DIST watchdog-5.16.tar.gz 203910 BLAKE2B 517f2f8085829e5c5ff576f1dff920a2667d0e96a71dcbcebf381ccf349e95dfb0b7b598b565eda4cc8ec31f5f34e367dd719eeaf522cdee074c3bc23589dfb2 SHA512 1c9c921570ec7ddc3e4ff88b2029f1c3865277e547fb8970575df4b61fdf1f06f443f49ad09f11c29d913ca7d6ab05c5b19ec049ac218a8bcebd20b1bf5f0bbd
-EBUILD watchdog-5.16-r1.ebuild 980 BLAKE2B a459e1f10239070344ec1a5728993e454b0ea2e0e4d1135caab05b9dc8b58494c83765a92c89d205fae3bf395a316f62615f9c0003111d8fd7692659e43e3095 SHA512 af307c4d8ce9a2d09769cb5cf1531aedae59e6c9af2c5927d6b265d1169db3f2ebb7ddd20aac1e25050b44eb66444578a76df444df256af25a68353af539a5ac
+EBUILD watchdog-5.16-r1.ebuild 979 BLAKE2B b98a0a2367f16e4e0aa09eda9c06e12d37a0a0349fc855281651033ecf0dd558769f11ea3c0b74012ec01309ef1b1d1307c3890d8942c2f865a2c95a026d2ebf SHA512 ee387d0853bb9f95aa39050a3d555bf1ac31cfe53862a7b440e7af013c5da1324908d6fcc07bf8b51e9b910b8a16a67d67f261533785732af8d18e9272106c9d
 EBUILD watchdog-5.16.ebuild 909 BLAKE2B a752b4b31fa65a21a1047e1be00d4cbef44817949e9ca077bdf62bcee34319b5500e10e00f64ac634b7fff0ab3bac88a91c8bd2e6b769964b7b27d43599c8a6f SHA512 d0da86be1ad6c229dc0be3f5f142082388a335a3ec7a8272743768719bc18c96dd8a6b78578a920d0f6ae097b5ce7c6acf769c25a33984b5ea406cb118fe7467
 MISC metadata.xml 406 BLAKE2B 8a6d54669265e43ff308b76436932e8e7697ddf42810862bf2f564bc8ef2858ce205007075d33645165c1fb288a0db3ed43bcc68398fef43a13822615ac08a2a SHA512 039fe377ab47618ee42909c5608eae38c76bcc1df867c8f3097f3c230d465b25bd032bb7e7f49b1528cd57b4e0c4fba65c234eaab79b7cb39fbe152768a90a76
diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
index 6b60318ba93b..2c909e19992d 100644
--- a/sys-apps/watchdog/watchdog-5.16-r1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 2b83bec67924..c739be8fb8a0 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index ac0844d6223c..d5558d81dc71 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -1,5 +1,8 @@
 AUX oath-toolkit-2.6.2-gcc7.patch 3526 BLAKE2B 07966d96b4362cb7c271fa745cf9be843e14db9cade77768a9f31bbb0435c4f1f56c81464630871ad337213cbdc97ed0c1cf9ad9d261e29812984bab767c1eb1 SHA512 4bf9bc8e176861f044c55aab6c6cb48dcd7ac1d887f71f08475cc1e7f2b14cb04edc8417532613433af35687169667b073ea57556c85114e5a763a03443a85b9
 AUX oath-toolkit-2.6.2-glibc228.patch 4786 BLAKE2B 7690a2b5249b7c668be5a516fa0a298d789ac4d259a27ea3b5c9d5a581990ebc2431074f7e7adcc61c03ce2e0979cfbd2220c4335959c3f4f7279e758b954451 SHA512 4d015bc760b9df074441f93cd94342aff595b5ad5215165d64c0557222123b821c791a87afcba15a3ce0acfbe6945d96330468673249f4a2b1dc1700ab9040b2
+AUX oath-toolkit-2.6.7-new-xmlsec-tests.patch 2925 BLAKE2B c3e2e52ef75f99276b449d0520a1546a8b492d1572c4d293b7b876cb64661086d195f79a420dd763d8aab06e286c46a542a345178218a5f82e43f7ac6cb92079 SHA512 b99f6601ea2d1072b815e2975ebf352a3b20a185d96686b4abb96036c983e256d51e171fbf3af9df1783261bf0051779655ac6838d720956220696c06abde108
 DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb
+DIST oath-toolkit-2.6.7.tar.gz 5625279 BLAKE2B 23f377c51eb633bf01d6085d33c7362cd91b6bed1cf4c2bbf32dc9433849e20c53f6896b16e5056b13f420f6a65a3c593fa1dafd7e184ed9e52666d94a7f75d1 SHA512 50edff75c8366887d69cf4740c4cc3bdfc3e43cbd4910ff40f735bca489f0953d7e5a21130f12782ac7a1f2fb00f0db313aff139085f23daba78a69bc7b2eb12
 EBUILD oath-toolkit-2.6.2-r2.ebuild 1951 BLAKE2B 45b7579165914013c2fd0dadf3f351b22dabf903f8874009f3e12b2088617a01e7c8af6714fd0c9ac8a7741dd03dc23f4f4e7c940eb09582dd077d59c20d1b2b SHA512 f92f5cc7b46a90348ba17bf954136ed0d14d1a5969c31db5d3e92ba81fc59da7217231c56b64e72a2bf8564346a53105c64bf9397aee5db16abcf161962d96a6
-MISC metadata.xml 561 BLAKE2B bbb397352031c8bd4114017cbbe3dc4b257ae4c2896dbf570aa87b3483b482c0995611870ca3eb20ada06a4c04f92a12c443ed4acf6ae41b8511552f4fe890d6 SHA512 667ba142904b9da897ab9598db9464c6ed567ab35dd73e631676e8da8bb64bcd27a275becf8361622200bbdb208fd5b8306476f99cf04f6e423591a24ed3865b
+EBUILD oath-toolkit-2.6.7.ebuild 1509 BLAKE2B 831dc61915b1285a660e020786fbf0a9d952fdc50bf0a7f29a816bf0b63008567d20f5809ff05bc42ad2f9b53381201094b4ef482334447ceab68aa9026a5b16 SHA512 eecaecc5d785be3818df9b0c3f58dfd297921c6dc85e896143d165dc37b08216e97ab16506ee538276561c063a2968b87c9cef66308ff5e37406db48bb4a43aa
+MISC metadata.xml 712 BLAKE2B ed16c10de342d5ec86e29f7047dc4a95180f20db76c9b1bc3667ec584b35f02892e8adec80d0d182467d673c2c0daeb10da5eab179bc1267f38802854fef7b7a SHA512 aaadb093d4c1f6f661340ae887e60e6ba9d3b349c76b90d05ba2f524efe294ff097bb314a2bd2caed642271b8d40b15ecb6f46fade693be6f19685795d69a1f2
diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch
new file mode 100644
index 000000000000..a2ad292e19fc
--- /dev/null
+++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.7-new-xmlsec-tests.patch
@@ -0,0 +1,74 @@
+https://gitlab.com/oath-toolkit/oath-toolkit/-/commit/0ae59b9c72f69ee21044e736e292b73051df3272
+
+From 0ae59b9c72f69ee21044e736e292b73051df3272 Mon Sep 17 00:00:00 2001
+From: Simon Josefsson <simon@josefsson.org>
+Date: Sat, 12 Nov 2022 21:42:17 +0100
+Subject: [PATCH] Handle new libxmlsec on ArchLinux.
+
+--- a/libpskc/examples/pskc-hotp-signed.xml
++++ b/libpskc/examples/pskc-hotp-signed.xml
+@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
+ rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
+ CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
+ TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
+-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </Signature></KeyContainer>
+--- a/pskctool/tests/pskc-all-signed.xml
++++ b/pskctool/tests/pskc-all-signed.xml
+@@ -38,7 +38,8 @@ rIXbwqKhnBP943U4Ch31oEbZtbo+XRbiq11wv6dLNsi76TNGDqsjTKgEcSIYI6Vd
+ rMxnil6ChoIBvSSPGHhJuj1bW1EPW92JtIa6byrAj1m4RwSviQy2i65YoIdtrhRt
+ CWekj2zuL/0szv5rZMCCvxioOCA8znqELEPMfs0Aa/cACD2MZcC4gGXehNCvzYJr
+ TmB6lFpxP6f0g6eO7PVcqYN9NCwECxb5Cvx2j2uNlereY35/9oPR6YJx+V7sL+DB
+-n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4</X509Certificate>
++n6F0mN8OUAFxDamepKdGRApU8uZ35624o/I4
++</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </Signature></KeyContainer>
+--- a/pskctool/tests/tst_libexamples.sh
++++ b/pskctool/tests/tst_libexamples.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # tst_libexamples.sh - keep pskctool output in GTK-DOC manual up to date
+-# Copyright (C) 2012-2021 Simon Josefsson
++# Copyright (C) 2012-2022 Simon Josefsson
+ 
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -45,7 +45,8 @@ fi
+ 
+ $PSKCTOOL --sign --sign-key $srcdir/pskc-ee-key.pem \
+     --sign-crt $srcdir/pskc-ee-crt.pem \
+-    $srcdir/../../libpskc/examples/pskc-hotp.xml > foo
++    $srcdir/../../libpskc/examples/pskc-hotp.xml \
++    | sed 's,4</X509Cert,4\n</X509Cert,' > foo
+ if ! diff -ur $srcdir/../../libpskc/examples/pskc-hotp-signed.xml foo; then
+     echo "FAIL: pskctool --sign output change, commit updated file."
+     exit 1
+--- a/pskctool/tests/tst_sign.sh
++++ b/pskctool/tests/tst_sign.sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # tst_sign.sh - test that pskctool can sign and verify
+-# Copyright (C) 2012-2021 Simon Josefsson
++# Copyright (C) 2012-2022 Simon Josefsson
+ 
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -32,7 +32,7 @@ $PSKCTOOL --info --strict --debug $pskc_all > tmp-pre-human.txt
+ $PSKCTOOL --sign \
+     --sign-key $pskc_ee_key \
+     --sign-crt $pskc_ee_crt \
+-    $pskc_all > tmp-signed.xml
++    $pskc_all | sed 's,4</X509Cert,4\n</X509Cert,' > tmp-signed.xml
+ 
+ diff -ur $pskc_all_signed tmp-signed.xml
+ 
+-- 
+GitLab
diff --git a/sys-auth/oath-toolkit/metadata.xml b/sys-auth/oath-toolkit/metadata.xml
index d230c8d03eb7..69b7c5ff26ec 100644
--- a/sys-auth/oath-toolkit/metadata.xml
+++ b/sys-auth/oath-toolkit/metadata.xml
@@ -12,4 +12,8 @@
 		<flag name="pskc">Build tools &amp; library for the Portable Symmetric Key Container (PSKC) format per RFC6030</flag>
 		<flag name="pam">Build PAM module for pluggable login authentication for OATH</flag>
 	</use>
+	<upstream>
+		<remote-id type="gitlab">oath-toolkit/oath-toolkit</remote-id>
+		<remote-id type="savannah-nongnu">oath-toolkit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild
new file mode 100644
index 000000000000..f8cb28b09ce9
--- /dev/null
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam
+
+DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms"
+HOMEPAGE="https://www.nongnu.org/oath-toolkit/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="pam pskc static-libs test"
+REQUIRED_USE="test? ( pskc )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/icu:=
+	pam? ( sys-libs/pam )
+	pskc? (
+		dev-libs/libxml2
+		dev-libs/xmlsec
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	test? ( dev-libs/libxml2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-new-xmlsec-tests.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	MIN # glibc fp
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable test xmltest)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		$(use_enable pskc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Without keep-going, it will bail out after the first testsuite failure,
+	# skipping the other testsuites. as they are mostly independent, this sucks.
+	emake --keep-going check
+
+	# Avoid errant QA notice for no tests run on these
+	rm -f libpskc/gtk-doc/test-suite.log liboath/gtk-doc/test-suite.log || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	if use pam; then
+		newdoc pam_oath/README README.pam
+	fi
+
+	if use pskc; then
+		doman pskctool/pskctool.1
+	fi
+}
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index d70932844a12..fba051221f0b 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -3,5 +3,5 @@ AUX polkit-122-libs-only-postinstall.patch 944 BLAKE2B bfd6dc47e477b80b3fc3b10a3
 DIST polkit-121.tar.gz 743287 BLAKE2B 6ebda8fc866ef960281ef912a3d3c45572da3ba90a84026e386b78ced8eaadc6cfc0e88d6e5a75133bf99e28041f8b29b236bb0e9666dd1ffc43af2227a5cb2d SHA512 f565027b80f32833c558900b612e089ab25027da5bf9a90c421a292467d4db9a291f6dc9850c4bca8f9ee890d476fd064a643a5f7e28497661ba1e31d4227624
 DIST polkit-122.tar.bz2 704972 BLAKE2B 601ed969de816d061a974b07490d64c144940898a75d4e1761462ee1ff0f00686b068298fa6fdc901879d8cd4bea4334c0187aa5bde50acf90728c37e73e21f4 SHA512 a7c0a951bbcdb09899adbc128296c74fc062441e996f4d6a782b214178f0936137e2fdc489eaa86a00599b988711735a5bd9b5c3b93bdb42fb915db9f9b04e26
 EBUILD polkit-121.ebuild 3864 BLAKE2B 9beeb9e1db1f2cf0851fc574579bba2ae03bacdeb0500a3d685e5213af41c63f3cd1ab11469430a44c706fb081f5685fac4c2fd45ce990e11ccf2f3a79c3af4e SHA512 c4adbecfab6b67c15ba3de800eb5952f7f422f231502592770bb31939bacfc58990545edc7e2199ed740798d1f148c40a4e6189814442f5c8236a0750dff9513
-EBUILD polkit-122.ebuild 3952 BLAKE2B 86955502f05e70727612e10d9fba8a98ce70b3353eb3b75d454fd32a0181bd573a5d1a9f8492e0fc7971c4a30faba64babb02d062563a346f721a1b43227455a SHA512 89f1451a449f5563f35cb688bac34d587f937914b4632b1d8d5796980200bf11183d886fba643d26d24cecf398ad480247671a71fe8d2399a625c7dc21d5a26c
+EBUILD polkit-122.ebuild 3949 BLAKE2B 070a7a2952178fdb84b68353421eaa64f72cef4041b01b0ae5c377813dc2987f4db5115b6ae491fbc9c5b05c765bf7cf3501a06f0fefb5c17dfd8aa4b2bb61cc SHA512 9837565a9514b6d2032ebafb500c11e73ac2813b128725f2223cd0ebcfcc80b1abb4cba1838c84a0879d9688690540001da2290727f8490bc41a6f002d763cad
 MISC metadata.xml 688 BLAKE2B 517529c1bf104b638fe33a10b0778ffe048713f9c437b38747eb1d65cf99a0080dfdd56f8c5174f60fec0b1c26f53d967a825760d5a1c8beaf2d048a2d43b7a3 SHA512 7f523ac0693b560e481fe4febeb3b3bc08bb84aa23cbfb99b77baf1399b11b6761493d47d014611ac8e31a4bde472ce536cf5531e9484924117574981f3fd3bb
diff --git a/sys-auth/polkit/polkit-122.ebuild b/sys-auth/polkit/polkit-122.ebuild
index a5fd2d45c05b..65f7240d5df0 100644
--- a/sys-auth/polkit/polkit-122.ebuild
+++ b/sys-auth/polkit/polkit-122.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test"
 # https://gitlab.freedesktop.org/polkit/polkit/-/issues/181 for test restriction
 RESTRICT="!test? ( test ) test"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 14daeaa1fbb1..91bbcef946a4 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/libcircle/Manifest b/sys-cluster/libcircle/Manifest
index c205412d57fa..db320d55f0ce 100644
--- a/sys-cluster/libcircle/Manifest
+++ b/sys-cluster/libcircle/Manifest
@@ -1,3 +1,3 @@
 DIST libcircle-0.3.0.tar.gz 385353 BLAKE2B 2843218e21f272409006980d7a94c580b1b72234e9aec7503418e498c202405a2c941f2030e1468450e9d259837bf0fc427bb60e2deeccbe4af6dde11ccfa8e9 SHA512 7561075a36e3401984d06bff6f7d0c5ba88569f59a0122dd73d52c3e4fb6602482fa0d0fcf19c0761496fb6f8ed27c1e736c411dd93186f8c029b3789e4ab318
 EBUILD libcircle-0.3.0.ebuild 785 BLAKE2B c92267cbae0ae6c3f8037f5859d7ceb66327dc7795c1d123c6e9e80fc451558a617091d5dec398f95a4ddefa965386deb4ea4694d6f289bdcb3c7acb4a80775e SHA512 1c20e6e00c625d037dcaeefb560b507e94ceb95c4227f5e1d710bedfc04a8dd72f70404ae21a334b5098d441ae157bb574dea5c0a692732373645dd07e427c76
-MISC metadata.xml 450 BLAKE2B 20ec966db3142637fd94f9cfcd3f922fadbffc8b55aee9296c75f7e3f46d2153f615e9f8937850bc9fdddf9782859c06b0b5fad39a793d7452c4f1921539473c SHA512 ccd701a2be7c9a933a3392c8db95be745f3ee3e3da1bd4065680eb94ea763becc82608bb5d096366cea2aa3b5ee27b9e4d4c77ef6ba07a5fda9836e5e70b3845
+MISC metadata.xml 336 BLAKE2B 273a700eb8dc7eef0510a2846ead718e7d97301e0bcaa01ed452c8b5f73a62225ecd520239f10ff135b1cea675d96cbe62d65745ed6a48917e9f8d344bcebd71 SHA512 de8db21940e141adfd1318510c35ffc646168618d54d3b6d1bb5d98adf850dea59d58d0c5e40ebccbf2175d85f4345e1223428ac3e391fdb415021005e2b92a3
diff --git a/sys-cluster/libcircle/metadata.xml b/sys-cluster/libcircle/metadata.xml
index 31b8665388a1..9bfb7732ed85 100644
--- a/sys-cluster/libcircle/metadata.xml
+++ b/sys-cluster/libcircle/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 3b1f7da1a4e4..34fb0a00009b 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,4 +1,4 @@
 DIST libquo-1.3.1.tar.gz 1020369 BLAKE2B d7c3906e1211239a1329fd17799b45441bdf45e252ba57d13e4faece8d89b5964c558ab5b71295541d76568fea7530f868f82979998402533506c8eaf6485229 SHA512 02ab71f0c35a143b4be1960cebef23fcfd2ad7cc81edfd917d09482662ba3993045434c623caf19cf2983b3790ebc0e53bba7d9895b089eadaf39589ddff1579
 EBUILD libquo-1.3.1-r2.ebuild 802 BLAKE2B 030bc7a7bc4947a85613ef05309190180efc5da693b48e8ce6143a4d0610c925102cd6f7a5d3128446f32bd15898bf2642cb61d786468af518cbe44d60157834 SHA512 d497586484ae6ab6ee1b3858e069cf1da5707d7975d6731071f82649413825b9c74ae997e1ebfc27a9111a24ed3856d08099c3ff23211881a6f777a215f955a7
 EBUILD libquo-9999.ebuild 802 BLAKE2B 030bc7a7bc4947a85613ef05309190180efc5da693b48e8ce6143a4d0610c925102cd6f7a5d3128446f32bd15898bf2642cb61d786468af518cbe44d60157834 SHA512 d497586484ae6ab6ee1b3858e069cf1da5707d7975d6731071f82649413825b9c74ae997e1ebfc27a9111a24ed3856d08099c3ff23211881a6f777a215f955a7
-MISC metadata.xml 444 BLAKE2B e2536772899462839d65c60a9c7eaae9951f8525abae69ffac59e44b45788ae3731fa86f80d3d113d32bc8f88874eae0ca11f5c27a837fb6825f44f75249f795 SHA512 e2331769bfe639884caf8eea0ce4660fb8ca4b5b6d68332032a63618e403a753421a117a57b65040fd2a11b34d5f1f29dcb5cc9748cc7deb4988db973ec60bbb
+MISC metadata.xml 330 BLAKE2B 52b5e3e606cb79718efe250070a803b2d69dc5b914deeb691b274849d463bf5ce90004c0940b7c2bfd26a13a8ce951d9649a6dfd8c8dee95f6fc1d49b8005476 SHA512 0a80267364a7603d81435146fe208a40bda7af359cccff9017872234d1d9cce1fcaa7efc90e0589deafc0a844d38f2ad8270b37e92ee3d22877cc3a87c80f933
diff --git a/sys-cluster/libquo/metadata.xml b/sys-cluster/libquo/metadata.xml
index 97747862bd39..91bd0e1ac85b 100644
--- a/sys-cluster/libquo/metadata.xml
+++ b/sys-cluster/libquo/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sys-cluster/nullmpi/Manifest b/sys-cluster/nullmpi/Manifest
index b33c72641642..b78f3ddd741a 100644
--- a/sys-cluster/nullmpi/Manifest
+++ b/sys-cluster/nullmpi/Manifest
@@ -1,4 +1,4 @@
 AUX nullmpi-0.7-libtool.patch 1817 BLAKE2B 3ebea7cec7de387dd9ca2fd62641252f38eec7ab7d5585d1e0f38c32870410c20e2ce52647a1bd14627fb0ccffefc7f0d642c0af2ca16c4f8e58f9ec504202f4 SHA512 b6621053616a1b474214e499de2c89ba92b550de58aa168d66464399de963399cec3b59b0de898de2683e93d7ea0d521a6957a48db63b67cd8bc7cfd8ed7c02f
 DIST nullmpi-0.7.tar.gz 148188 BLAKE2B dedb5b9f7a342387074848ba9ef9624508255b8916c4875296ee0bd4940485621737465a402ee50929f7f057ffd75859f0555f1a2fff85fc92549be06134a70c SHA512 8575b019f4ea835f3824dc181a3bea70684ad5c4fa59686ff293ba63dfbf1a90ba7a80dccecc817664d10ea23d131003eed46a5a29cc18cd619176090d8a1ae1
 EBUILD nullmpi-0.7-r1.ebuild 838 BLAKE2B b56ef7be649f39b9dc87a58cc46fdba5656c89342b74cd2d9203d6128d22cee39702c178e91fd5d88defbefa891f4a7a6a72b3b152c577b6181c3b2c41205d75 SHA512 4904e04a706ff6624d306bfc99a1db4a7df4918cbb56d2cc9dea5d8517e675a29492f661dfa5dfdbb56171b6515fb7c60b05281b6153d689fafc6145517afd04
-MISC metadata.xml 382 BLAKE2B dfa3edc080c1daf448e224d9fdd51051d658b7cb9ba30691680ad931dbd343f963aaace1897c3da4bd8095b7e7cde11b0ea1565f5f74fd59806266cdc556600f SHA512 b49702232b3311eac0e5b4717b07ba6ff5e644be65442098b9016f0b8a411ccd3121889dde551a28b4de24413ee785cdad5f90e168a3f9da2e925664b168f3f7
+MISC metadata.xml 264 BLAKE2B 72a8181e4235f4fb310c8d9db3d21082b028cd147a04382ae60a1db2d622fcf13bc56fd944c85684c233673d8705e85690f8e6fa116f177758a83504cc2beb0a SHA512 b560647d04f40bd98c6d95744f963455d52138ca4eed3209a0c7ff6314ed8e297a4784a2462bb1f7a8a4dc9af2addd13a0be3a6f7e9109dfe00f95b5935c40af
diff --git a/sys-cluster/nullmpi/metadata.xml b/sys-cluster/nullmpi/metadata.xml
index a8c5bc27de73..d7006d2555f8 100644
--- a/sys-cluster/nullmpi/metadata.xml
+++ b/sys-cluster/nullmpi/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e8af209dec6e..85eaad079985 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 9459244902cd..5b14c37308dd 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.7-r3.ebuild 4735 BLAKE2B 4c29d23bc621ee4f82056b647147d8bc285f94d3bf26a9e520ff0342d0e46dffb524bb0d0a41142bf9d1c4e17c77afa39c7cef96f2e3934cee1f635c18550f56 SHA512 0077c019648238a8a3a991e07d85ac115f6ee44437a77a25b00d3b91383e2bd5bb7453b2a6d3041a9128bdcc0ea7eaeea0ca04cc952848d354eceb2096fbb4b6
@@ -11,4 +12,5 @@ EBUILD clang-common-16.0.0.9999.ebuild 4712 BLAKE2B 5a0410476f2f74934786b57f9067
 EBUILD clang-common-16.0.0_rc3-r1.ebuild 4718 BLAKE2B b9828aa5db9aab0fa65e35501a733feccee05ac0c244d27305bc798b645c2d9d2d58f5826022a5908d83f46a7aa505cbaa5c66f848531e33cb23a13fc22cdae4 SHA512 8dbf47c513ed0cb781551b61563b5a9b9a0fdcc256590fdf71d1f7f60a87f339a671a8ce5a6b4a46b867e26251cc278d1f9c745d637b17381b124ba1f1328300
 EBUILD clang-common-17.0.0.9999.ebuild 4712 BLAKE2B 5a0410476f2f74934786b57f90676c8ffa15ffc36f6d07ec8e4daf0356b75e19f695d9f1bd33a7470f9e3c348318c07da89b482b3abdac6f096cb91905600cb2 SHA512 c110ddc90ff766fab5a39473c87595c7a2c1fc1dfecef8fb66453ececc57bcc6123912321bac9408d3e1cb4d08839a77d8be7d5003763eba1416a2e94f1b2968
 EBUILD clang-common-17.0.0_pre20230225.ebuild 4712 BLAKE2B 5a0410476f2f74934786b57f90676c8ffa15ffc36f6d07ec8e4daf0356b75e19f695d9f1bd33a7470f9e3c348318c07da89b482b3abdac6f096cb91905600cb2 SHA512 c110ddc90ff766fab5a39473c87595c7a2c1fc1dfecef8fb66453ececc57bcc6123912321bac9408d3e1cb4d08839a77d8be7d5003763eba1416a2e94f1b2968
+EBUILD clang-common-17.0.0_pre20230304.ebuild 4712 BLAKE2B 5a0410476f2f74934786b57f90676c8ffa15ffc36f6d07ec8e4daf0356b75e19f695d9f1bd33a7470f9e3c348318c07da89b482b3abdac6f096cb91905600cb2 SHA512 c110ddc90ff766fab5a39473c87595c7a2c1fc1dfecef8fb66453ececc57bcc6123912321bac9408d3e1cb4d08839a77d8be7d5003763eba1416a2e94f1b2968
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230304.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..3165f42a329f
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-17.0.0_pre20230304.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+	default-compiler-rt default-libcxx default-lld llvm-libunwind
+	hardened stricter
+"
+
+PDEPEND="
+	sys-devel/clang:*
+	default-compiler-rt? (
+		sys-devel/clang-runtime[compiler-rt]
+		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( sys-devel/lld )
+	!default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on sys-devel/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  sys-devel/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
+	fi
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by sys-devel/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-fstack-clash-protection
+		-fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	dodir /usr/include/gentoo
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+		#ifndef _FORTIFY_SOURCE
+			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+				#define _FORTIFY_SOURCE ${fortify_level}
+			#endif
+		#endif
+	EOF
+
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			-D_LIBCPP_ENABLE_ASSERTIONS=1
+		EOF
+	fi
+
+	if use stricter; then
+		newins - gentoo-stricter.cfg <<-EOF
+			# This file increases the strictness of older clang versions
+			# to match the newest upstream version.
+
+			# clang-16 defaults
+			-Werror=implicit-function-declaration
+			-Werror=implicit-int
+			-Werror=incompatible-function-pointer-types
+
+			# constructs banned by C2x
+			-Werror=deprecated-non-prototype
+
+			# deprecated but large blast radius
+			#-Werror=strict-prototypes
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			@gentoo-stricter.cfg
+		EOF
+	fi
+
+	local tool
+	for tool in clang{,++,-cpp}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+		EOF
+	done
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 9b7850ed7b0f..44aa6860963a 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -4,4 +4,5 @@ EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339a
 EBUILD clang-runtime-16.0.0_rc3.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6
 EBUILD clang-runtime-17.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0_pre20230225.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
+EBUILD clang-runtime-17.0.0_pre20230304.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230304.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..67b42357665e
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230304.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
+
+pkg_pretend() {
+	if tc-is-clang; then
+		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
+		ewarn "upstream has turned a few warnings that commonly occur during"
+		ewarn "configure script runs into errors by default.  This causes some"
+		ewarn "configure tests to start failing, sometimes resulting in silent"
+		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
+		ewarn "not yet clear whether the change will remain or be reverted."
+		ewarn
+		ewarn "For more information, please see:"
+		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
+	fi
+}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index cb9a4a55d186..dadf89b41847 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -8,6 +8,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
 EBUILD clang-15.0.7-r1.ebuild 12409 BLAKE2B 8f8d642b676f0ad01700fca43d8158e54180010443f5456a3d3d270638dd280e8e399534c97d8fa8f7bcacd132d9f5735154cf4e12fd0fbc9a1e2b7f1e914ba9 SHA512 77139debe5214dd3047b44ab98bfd8a6eec2caa8635ba8cbfc14c94ed4d3d13febe08612e74f33db491cc98c30eadfcfead20a1c13a73466d7e49028222c93db
@@ -15,4 +16,5 @@ EBUILD clang-16.0.0.9999.ebuild 12338 BLAKE2B 9f1989ffd52f28006e256a97836ac9623b
 EBUILD clang-16.0.0_rc3.ebuild 12241 BLAKE2B a42245a7fb9b3bdb26e5f9fba2f671ed88ba24dfe8d105c04ce0bfe94c39116ab0bcc81f1fe05bc370397002a2c14d2b938c9e43060e3374b172abd6abb2b6ae SHA512 ff7dc938a522e6b802f7355cbe3f3b9542cbc51e24f735e46b3937db4fda5ef9543aa8e06ccafc48370b888fa475d0c840cef5fa15aac133dc3c51b305fe31c7
 EBUILD clang-17.0.0.9999.ebuild 12338 BLAKE2B 9f1989ffd52f28006e256a97836ac9623b3efff14516d05dc4c3cd69c97bd5955abc97142ed4b2099283ff2364ee7e4a32bf33282faf700643fee63e7bfc9be7 SHA512 e93e8f87344051c093d28b53fe0184444a2f34d05a1c95257c361ac097687d225cf9d6df218093887cdc07e23490f77a2399ed1e075c582aaa9710504687d31b
 EBUILD clang-17.0.0_pre20230225.ebuild 12235 BLAKE2B 5061b3228d7b0a2513601abab18bfba06f79d351da8b2e0114c4482994d9c69706e21b0072a59b6f8e0d442c440972f2f00bd3e5e3273801771c6044e1eba3e5 SHA512 5b50655e1e5b884b9a4aa1c8fc08b6bec1bc9b132eb404ec6b8ac6ab0516100b64091f82e6355f59991065ba5a94681d34286ca6004190b78efbe2b808884167
+EBUILD clang-17.0.0_pre20230304.ebuild 12338 BLAKE2B 9f1989ffd52f28006e256a97836ac9623b3efff14516d05dc4c3cd69c97bd5955abc97142ed4b2099283ff2364ee7e4a32bf33282faf700643fee63e7bfc9be7 SHA512 e93e8f87344051c093d28b53fe0184444a2f34d05a1c95257c361ac097687d225cf9d6df218093887cdc07e23490f77a2399ed1e075c582aaa9710504687d31b
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-17.0.0_pre20230304.ebuild b/sys-devel/clang/clang-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..4c59778e088a
--- /dev/null
+++ b/sys-devel/clang/clang-17.0.0_pre20230304.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=sys-devel/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing
+	llvm/utils
+	third-party
+)
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+
+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		aarch64-resource-headers
+		arm-common-resource-headers
+		arm-resource-headers
+		core-resource-headers
+		cuda-resource-headers
+		hexagon-resource-headers
+		hip-resource-headers
+		hlsl-resource-headers
+		mips-resource-headers
+		opencl-resource-headers
+		openmp-resource-headers
+		ppc-htm-resource-headers
+		ppc-resource-headers
+		riscv-resource-headers
+		systemz-resource-headers
+		utility-resource-headers
+		ve-resource-headers
+		webassembly-resource-headers
+		windows-resource-headers
+		x86-resource-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-packager
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+			nvptx-arch
+
+			# needed for cross-compiling Clang
+			clang-tblgen
+		)
+
+		if use extra; then
+			out+=(
+				# extra tools
+				clang-apply-replacements
+				clang-change-namespace
+				clang-doc
+				clang-include-cleaner
+				clang-include-fixer
+				clang-move
+				clang-pseudo
+				clang-query
+				clang-reorder-fields
+				clang-tidy
+				clang-tidy-headers
+				clangd
+				find-all-symbols
+				modularize
+				pp-trace
+			)
+		fi
+
+		if llvm_are_manpages_built; then
+			out+=( docs-clang-man )
+			use extra && out+=( docs-clang-tools-man )
+		fi
+
+		if use doc; then
+			out+=( docs-clang-html )
+			use extra && out+=( docs-clang-tools-html )
+		fi
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+	local mycmakeargs=(
+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		-DCLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+		# disable linking to HSA to avoid automagic dep,
+		# load it dynamically instead
+		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
+
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if ! use elibc_musl; then
+		mycmakeargs+=(
+			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+			if use extra; then
+				mycmakeargs+=(
+					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				)
+			fi
+		fi
+		mycmakeargs+=(
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+		)
+	fi
+	if multilib_native_use extra; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
+			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check-clang )
+	if multilib_native_use extra; then
+		test_targets+=(
+			check-clang-tools
+			check-clangd
+		)
+	fi
+	cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	if use extra; then
+		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	fi
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_native_use extra; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+	if use extra; then
+		elog "Some of them are vim integration scripts (with instructions inside)."
+		elog "The run-clang-tidy.py script requires the following additional package:"
+		elog "  dev-python/pyyaml"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 89c62ae40a9c..754ba474e1f5 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -28,6 +28,7 @@ DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a
 DIST gcc-12-20230211.tar.xz 79698020 BLAKE2B 0de8d0b8f8823276fc7b0c70225a1c957455645cafd9c46ab8d3cd80d4e641a0d48df03a9d1d5206fde65e9f0dca09a481311b9b68a7993899e4060d44e08cf6 SHA512 6ae3979cfff1376ba2ea639d9a01428e55a67a2cc6582bc77a476b050bfd3ba00e078907067b74a1f59188014febc3fd1e4c5e98fae00421e0c82c9db54f1028
 DIST gcc-12-20230218.tar.xz 79705112 BLAKE2B 28b230d4e66f773a6ea32a3112f66c81ffb787f16ba1c36d3d4d2498b03031a9dbe3c2aefb40b07aab1eca64a32636c1cff2497eae996565d633fa1d70ac890e SHA512 bf2b109a12a981ae97ca4c6d9a27b11adcf1c7acaf167c532936a027dad4217e75b197fd12b2c5e37f6e89fe39a54f483984023accfb76f7517cc3d35ced416a
 DIST gcc-12-20230225.tar.xz 79694748 BLAKE2B 13684d572c3077740639ea10fed3cabf4473cb1913e9e3d90f4d40dad2e1e5d46b12d66fdf864367c4f4bd6a92009b1a11daf1635ed94c6aa5d8c758c36a79a5 SHA512 25889487fe3a03dc4fcce80c6048ef02453aaa0770662b078e1fd4a3c2aaebb8fdf2b77a0898abdb42b2ea1e3ebc03ac720595ddcc22a64a6bf910cf2ece4e16
+DIST gcc-12-20230304.tar.xz 79683276 BLAKE2B e02622f1193ba17dd1041eae0c2f594b26806b00cfb269e683cc356d6d405ae8a49e60823ed6f814d2aac820ef01d9004f68d628a853be139fa6a70e8601ba2a SHA512 0c23a8845c8f202b0c0e4aceb3104bf76c0aca9171ba65d292057703d160fc4ce0b0d7c8876cf1bb30f998c4a5a0a8f3c4165dd4d8d316019cff0dc19aa62182
 DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
@@ -64,6 +65,7 @@ EBUILD gcc-12.2.1_p20230121-r1.ebuild 1429 BLAKE2B ff9a7a13e5c5fc57defe20f2cb0c0
 EBUILD gcc-12.2.1_p20230211.ebuild 1438 BLAKE2B 7bb9b18ec1d12eee06f28b76b106e29605c19e6026c18d8bd784fc05cb4a7a3443eb1a04a6c04c2bdda96a8dd0e8afa859082aef29aeb49b13f451ab941788fb SHA512 b6b61b818e4ffd1012c860fe413b9d3437a163d2797b7d1d83a9632cd035db8fb2a976db018356f24b0eb82f52de9297ce9d8b642dae3db04a70bfb3eaef1e65
 EBUILD gcc-12.2.1_p20230218.ebuild 1438 BLAKE2B 7bb9b18ec1d12eee06f28b76b106e29605c19e6026c18d8bd784fc05cb4a7a3443eb1a04a6c04c2bdda96a8dd0e8afa859082aef29aeb49b13f451ab941788fb SHA512 b6b61b818e4ffd1012c860fe413b9d3437a163d2797b7d1d83a9632cd035db8fb2a976db018356f24b0eb82f52de9297ce9d8b642dae3db04a70bfb3eaef1e65
 EBUILD gcc-12.2.1_p20230225.ebuild 1438 BLAKE2B 7bb9b18ec1d12eee06f28b76b106e29605c19e6026c18d8bd784fc05cb4a7a3443eb1a04a6c04c2bdda96a8dd0e8afa859082aef29aeb49b13f451ab941788fb SHA512 b6b61b818e4ffd1012c860fe413b9d3437a163d2797b7d1d83a9632cd035db8fb2a976db018356f24b0eb82f52de9297ce9d8b642dae3db04a70bfb3eaef1e65
+EBUILD gcc-12.2.1_p20230304.ebuild 1438 BLAKE2B 7bb9b18ec1d12eee06f28b76b106e29605c19e6026c18d8bd784fc05cb4a7a3443eb1a04a6c04c2bdda96a8dd0e8afa859082aef29aeb49b13f451ab941788fb SHA512 b6b61b818e4ffd1012c860fe413b9d3437a163d2797b7d1d83a9632cd035db8fb2a976db018356f24b0eb82f52de9297ce9d8b642dae3db04a70bfb3eaef1e65
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
 EBUILD gcc-13.0.1.9999.ebuild 1252 BLAKE2B e8feaecedb676e0ddce69ec0e7fc5e944d8df870ba897a2e495781a0a860c972b013667ffc3b83a2e4da97cd1e8ce69b93fb3d212d5cd9af2fc8e5e3d799f3d1 SHA512 ba91dd930efdbd01f57a95f70e5e9e12fa9e7e1254d574239ecdf0b54d20515ede1df6dffa9772ef590c128fe852e378ae7e2c56d2f8f88db344675b7cc7ab45
 EBUILD gcc-13.0.1_pre20230212.ebuild 1299 BLAKE2B 636e7cbe0eb844ad4cd92b20a4e1e7747d4dc05e90aa043a410077c99593cb92cb8d0c6d226cfb3819223954d1ea9344fb50e385142daa790c26ead4de4c1628 SHA512 d1cbd97fe9362c44aa81679a4267bde19030dcea0e0303063c998f8b6e7d7ff4eec3538313dbcb4c4636ce5a577f563f7a2c67141caa02b89d07b17dbce0324a
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
new file mode 100644
index 000000000000..3a7a472a2f2f
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="13"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="7"
+MUSL_GCC_VER="12.2.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 27a9b28ebbe5..a44c9de23671 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
 EBUILD lld-15.0.7.ebuild 2262 BLAKE2B 8882ba45692d54840d8a5933910ade614427733f3da2e344cf4df2806c125a783ff3c6ad4a2f76fd577cb4787fe07495c93e981c03f116fa7f383575d59936f7 SHA512 9b08495f068a01e991d200363549d29e9146e8687b297fa06beda90da1da9a793b1ebf512c3dad9bb985518a8fd9d1d13049a90dd8f06d4bc3de97779ff8e6ed
@@ -11,4 +12,5 @@ EBUILD lld-16.0.0.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e18
 EBUILD lld-16.0.0_rc3.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 EBUILD lld-17.0.0.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 EBUILD lld-17.0.0_pre20230225.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
+EBUILD lld-17.0.0_pre20230304.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-17.0.0_pre20230304.ebuild b/sys-devel/lld/lld-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..d22c1fb13951
--- /dev/null
+++ b/sys-devel/lld/lld-17.0.0_pre20230304.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}[zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+PDEPEND="
+	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 4023c87d2725..ff2e654ea652 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
@@ -11,4 +12,5 @@ EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca
 EBUILD llvm-common-16.0.0_rc3.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0_pre20230225.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
+EBUILD llvm-common-17.0.0_pre20230304.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230304.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..ce5f03ca34a5
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230304.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	!sys-devel/llvm:0
+"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
deleted file mode 100644
index a0c8e29cb162..000000000000
--- a/sys-devel/llvm-roc/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX llvm-roc-4.0.0-remove-isystem-usr-include.patch 1187 BLAKE2B ec9043f7358373822c3f6ce53d267192470dfbf03cf649a0964bd93b8b843db8e0a794fee8bbf292f882a6a908d0fa26a1303e4b13d92233d60b6b41c461ce9f SHA512 c3e9f96cb393f702cebe4da8a18495b492ae7cab7877576f3f2a4e6555f77c499dff6eded623305c6939ccd2cd00307e1b5ee28f2c34c9fd3128568dbe88c887
-AUX llvm-roc-4.2.0-current_pos.patch 1217 BLAKE2B 693e79cb895918f5e1a56be8d6624c049e8aa5640c55c34fc3fe27f053b7642670310ece321548df58f23e73d145f00d5c95b1e462eee008070cf6a2fde1c66c SHA512 fa8f773ba230e01f83526e4ae644fb2e7aceae99720cb5219c1b22baaabc5008f9b0151aee4c44ba9a4415ef421a8bfeb268302ee70e8c56428bf56c08b15903
-AUX llvm-roc-5.0.0-add_GNU-stack.patch 543 BLAKE2B 448b1c932ba9eb5c808277d4aa3caf835c44c5ef2564e0903ef4aa94c20c33dc1e0d4832d1338d0947079a3341eca59b919f1970e93dd878ef24da67fef90118 SHA512 961fd8a13bb9e9661b92ed994024eaff3629429499c40fe74649b0d8533c8e06bc5ae6f7eb5587d6361f253f8beb688e7150e11994244cd79680ad6863829096
-AUX llvm-roc-5.0.0-hip-location.patch 8082 BLAKE2B 3c468dfdf6eac3b85fcaa97bc33091042614f83be926c62b1750026fc131a425ee2b30a4ac285752b74b7120897327120b8825fa16577ab49e4e6fced76272fb SHA512 f0f86a18a5b60b10dee9214ae7504c5cdc1e38e4fd53c7fd8cae68f9181a8622b28a5796203f785199a8fdfc013567df4c8e4d6db767c6f62cc9f444d42a1880
-AUX llvm-roc-5.0.0-linkdl.patch 476 BLAKE2B 4854e08cbd4109eed02fb1154ff9dcf47d78b4a6670fbf65b5ce2dbfa0161a0e7a638299735c4edef4cac5799f1f88d3b781edb9738905ed118fc90f071fe47e SHA512 89097d32d2b5b7ff23192b5750771d2272b8ab34f248aa48f9570e778f94db61baffb6e8d2c3ddf017b745ee31edb03cc2d62439ddba8249d35692f32a4170cb
-DIST llvm-rocm-ocl-5.0.2.tar.gz 150281451 BLAKE2B e4363266e05e13af761dd6f440dbfc30905f219e428fa3b2595800ba0c80c97cd7e2615d68acd9aea4fc66454ee8a3ff7a52a60d3aed4e93af5007050277e5fe SHA512 9be9f1a0ad1a0089aa27858174ce37c7a02902b6dedc338382f42ed0567823cc4bb11b68c130470590c16d4d92ab2735a06c27d248237ffa2d394253328f6705
-EBUILD llvm-roc-5.0.2.ebuild 2455 BLAKE2B c2caa36ec4031e5dea3863838b4b16717c4a396561293aec6730ad688fb4496a33a968ccd853cd971e65550cc923c623ffed454b81fd7b3ed0d36ac70f853f2d SHA512 516a60a237019b48eb261279d7a18b4d66f7a5c11da659e5c139795f298073976796b1333ed0c6490d0c7c33c52e9bab386df55a70cbae4dd92e8052edea2017
-MISC metadata.xml 470 BLAKE2B e3e508a8f3178c63fb93afc93d42ff41f8f6290d763762c1200ecdccef16ce2b2dcb3e810e950ba9c8db2ec37639ffafb47b38bb7e03f6dbbb0496ae96c16d3b SHA512 3764f794532fb58cb944d718e1e59f4abc42270f3fd80c2f8b8537dfefc46f6a495bc126e842a9b4e560cc207902548aef9e2f2641b1a11954db3c2f98246133
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
deleted file mode 100644
index f14ec4ac0db2..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Wilfried (justxi) Holzke
-
-Adopted from https://github.com/justxi/rocm/blob/master/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
-
-Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-===================================================================
---- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -326,11 +326,6 @@ void RocmInstallationDetector::AddHIPInc
-     //
-     // ROCm 3.5 does not fully support the wrapper headers. Therefore it needs
-     // a workaround.
--    SmallString<128> P(D.ResourceDir);
--    if (UsesRuntimeWrapper)
--      llvm::sys::path::append(P, "include", "cuda_wrappers");
--    CC1Args.push_back("-internal-isystem");
--    CC1Args.push_back(DriverArgs.MakeArgString(P));
-   }
- 
-   if (DriverArgs.hasArg(options::OPT_nogpuinc))
-@@ -341,8 +336,6 @@ void RocmInstallationDetector::AddHIPInc
-     return;
-   }
- 
--  CC1Args.push_back("-internal-isystem");
--  CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath()));
-   if (UsesRuntimeWrapper)
-     CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
- }
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-current_pos.patch b/sys-devel/llvm-roc/files/llvm-roc-4.2.0-current_pos.patch
deleted file mode 100644
index 0f3398951b07..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-current_pos.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
---- a/include/llvm/Support/raw_ostream.h	2021-05-22 19:56:44.779955686 +0200
-+++ b/include/llvm/Support/raw_ostream.h	2021-05-22 20:00:49.449954752 +0200
-@@ -610,9 +610,7 @@
-   /// See raw_ostream::write_impl.
-   void write_impl(const char *Ptr, size_t Size) override;
- 
--  /// Return the current position within the stream, not counting the bytes
--  /// currently in the buffer.
--  uint64_t current_pos() const override { return OS.size(); }
-+  uint64_t current_pos() const override;
- 
- public:
-   explicit raw_string_ostream(std::string &O) : OS(O) {
-diff -Naur a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
---- a/lib/Support/raw_ostream.cpp	2021-05-22 19:59:05.651955148 +0200
-+++ b/lib/Support/raw_ostream.cpp	2021-05-22 20:01:22.929954625 +0200
-@@ -938,6 +938,10 @@
- //  raw_string_ostream
- //===----------------------------------------------------------------------===//
- 
-+/// Return the current position within the stream, not counting the bytes
-+/// currently in the buffer.
-+uint64_t raw_string_ostream::current_pos() const { return OS.size(); }
-+
- raw_string_ostream::~raw_string_ostream() {
-   flush();
- }
diff --git a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-add_GNU-stack.patch b/sys-devel/llvm-roc/files/llvm-roc-5.0.0-add_GNU-stack.patch
deleted file mode 100644
index f57989c8c8a3..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-add_GNU-stack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add .note.GNU-stack to mitigate QA notice according to 
-https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
-===================================================================
---- llvm-project-rocm-5.0.0.orig/compiler-rt/lib/orc/elfnix_tls.x86-64.S
-+++ llvm-project-rocm-5.0.0/compiler-rt/lib/orc/elfnix_tls.x86-64.S
-@@ -61,4 +61,8 @@ ___orc_rt_elfnix_tls_get_addr:
-         popq            %rbp
-         ret
- 
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-+
- #endif // defined(__x86_64__)
diff --git a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-5.0.0-hip-location.patch
deleted file mode 100644
index 614a16d1e810..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-hip-location.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-replace hardcoded hip finder with Gentoo paths.
-
-It is not necessary to check HIP runtime each time.
-
-Author: Benda Xu <heroxbd@gentoo.org>
-Author: Yiyang Wu <xgreenlandforwyy@gmail.com>
-
-Index: llvm-project-rocm-5.0.1/clang/lib/Driver/ToolChains/AMDGPU.cpp
-===================================================================
---- llvm-project-rocm-5.0.1.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-5.0.1/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -169,139 +169,8 @@ bool RocmInstallationDetector::parseHIPV
- /// cached and populated only once.
- const SmallVectorImpl<RocmInstallationDetector::Candidate> &
- RocmInstallationDetector::getInstallationPathCandidates() {
--
--  // Return the cached candidate list if it has already been populated.
--  if (!ROCmSearchDirs.empty())
--    return ROCmSearchDirs;
--
--  auto DoPrintROCmSearchDirs = [&]() {
--    if (PrintROCmSearchDirs)
--      for (auto Cand : ROCmSearchDirs) {
--        llvm::errs() << "ROCm installation search path";
--        if (Cand.isSPACK())
--          llvm::errs() << " (Spack " << Cand.SPACKReleaseStr << ")";
--        llvm::errs() << ": " << Cand.Path << '\n';
--      }
--  };
--
--  // For candidate specified by --rocm-path we do not do strict check, i.e.,
--  // checking existence of HIP version file and device library files.
--  if (!RocmPathArg.empty()) {
--    ROCmSearchDirs.emplace_back(RocmPathArg.str());
--    DoPrintROCmSearchDirs();
--    return ROCmSearchDirs;
--  } else if (const char *RocmPathEnv = ::getenv("ROCM_PATH")) {
--    if (!StringRef(RocmPathEnv).empty()) {
--      ROCmSearchDirs.emplace_back(RocmPathEnv);
--      DoPrintROCmSearchDirs();
--      return ROCmSearchDirs;
--    }
--  }
--
--  // Try to find relative to the compiler binary.
--  const char *InstallDir = D.getInstalledDir();
--
--  // Check both a normal Unix prefix position of the clang binary, as well as
--  // the Windows-esque layout the ROCm packages use with the host architecture
--  // subdirectory of bin.
--  auto DeduceROCmPath = [](StringRef ClangPath) {
--    // Strip off directory (usually bin)
--    StringRef ParentDir = llvm::sys::path::parent_path(ClangPath);
--    StringRef ParentName = llvm::sys::path::filename(ParentDir);
--
--    // Some builds use bin/{host arch}, so go up again.
--    if (ParentName == "bin") {
--      ParentDir = llvm::sys::path::parent_path(ParentDir);
--      ParentName = llvm::sys::path::filename(ParentDir);
--    }
--
--    // Detect ROCm packages built with SPACK.
--    // clang is installed at
--    // <rocm_root>/llvm-amdgpu-<rocm_release_string>-<hash>/bin directory.
--    // We only consider the parent directory of llvm-amdgpu package as ROCm
--    // installation candidate for SPACK.
--    if (ParentName.startswith("llvm-amdgpu-")) {
--      auto SPACKPostfix =
--          ParentName.drop_front(strlen("llvm-amdgpu-")).split('-');
--      auto SPACKReleaseStr = SPACKPostfix.first;
--      if (!SPACKReleaseStr.empty()) {
--        ParentDir = llvm::sys::path::parent_path(ParentDir);
--        return Candidate(ParentDir.str(), /*StrictChecking=*/true,
--                         SPACKReleaseStr);
--      }
--    }
--
--    // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin
--    // Some versions of the aomp package install to /opt/rocm/aomp/bin
--    if (ParentName == "llvm" || ParentName.startswith("aomp"))
--      ParentDir = llvm::sys::path::parent_path(ParentDir);
--    // Some versions of the aomp package install to /opt/rocm/aomp/bin
--    // and it seems ParentDir is already pointing to correct place.
--    return Candidate(ParentDir.str(), /*StrictChecking=*/true);
--  };
--
--  // Deduce ROCm path by the path used to invoke clang. Do not resolve symbolic
--  // link of clang itself.
--  ROCmSearchDirs.emplace_back(DeduceROCmPath(InstallDir));
--
--  // Deduce ROCm path by the real path of the invoked clang, resolving symbolic
--  // link of clang itself.
--  llvm::SmallString<256> RealClangPath;
--  llvm::sys::fs::real_path(D.getClangProgramPath(), RealClangPath);
--  auto ParentPath = llvm::sys::path::parent_path(RealClangPath);
--  if (ParentPath != InstallDir)
--    ROCmSearchDirs.emplace_back(DeduceROCmPath(ParentPath));
--
--  // Device library may be installed in clang or resource directory.
--  auto ClangRoot = llvm::sys::path::parent_path(InstallDir);
--  auto RealClangRoot = llvm::sys::path::parent_path(ParentPath);
--  ROCmSearchDirs.emplace_back(ClangRoot.str(), /*StrictChecking=*/true);
--  if (RealClangRoot != ClangRoot)
--    ROCmSearchDirs.emplace_back(RealClangRoot.str(), /*StrictChecking=*/true);
--  ROCmSearchDirs.emplace_back(D.ResourceDir,
--                              /*StrictChecking=*/true);
--
--  ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/rocm",
--                              /*StrictChecking=*/true);
--
--  // Find the latest /opt/rocm-{release} directory.
--  std::error_code EC;
--  std::string LatestROCm;
--  llvm::VersionTuple LatestVer;
--  // Get ROCm version from ROCm directory name.
--  auto GetROCmVersion = [](StringRef DirName) {
--    llvm::VersionTuple V;
--    std::string VerStr = DirName.drop_front(strlen("rocm-")).str();
--    // The ROCm directory name follows the format of
--    // rocm-{major}.{minor}.{subMinor}[-{build}]
--    std::replace(VerStr.begin(), VerStr.end(), '-', '.');
--    V.tryParse(VerStr);
--    return V;
--  };
--  for (llvm::vfs::directory_iterator
--           File = D.getVFS().dir_begin(D.SysRoot + "/opt", EC),
--           FileEnd;
--       File != FileEnd && !EC; File.increment(EC)) {
--    llvm::StringRef FileName = llvm::sys::path::filename(File->path());
--    if (!FileName.startswith("rocm-"))
--      continue;
--    if (LatestROCm.empty()) {
--      LatestROCm = FileName.str();
--      LatestVer = GetROCmVersion(LatestROCm);
--      continue;
--    }
--    auto Ver = GetROCmVersion(FileName);
--    if (LatestVer < Ver) {
--      LatestROCm = FileName.str();
--      LatestVer = Ver;
--    }
--  }
--  if (!LatestROCm.empty())
--    ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
--                                /*StrictChecking=*/true);
--
--  DoPrintROCmSearchDirs();
--  return ROCmSearchDirs;
-+	ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", /*StrictChecking=*/true);
-+	return ROCmSearchDirs;
- }
- 
- RocmInstallationDetector::RocmInstallationDetector(
-@@ -410,7 +279,7 @@ void RocmInstallationDetector::detectDev
-     // - ${ROCM_ROOT}/lib/bitcode/*
-     // so try to detect these layouts.
-     static constexpr std::array<const char *, 2> SubDirsList[] = {
--        {"amdgcn", "bitcode"},
-+        {"lib/amdgcn", "bitcode"},
-         {"lib", ""},
-         {"lib", "bitcode"},
-     };
-@@ -433,42 +302,7 @@ void RocmInstallationDetector::detectDev
- }
- 
- void RocmInstallationDetector::detectHIPRuntime() {
--  SmallVector<Candidate, 4> HIPSearchDirs;
--  if (!HIPPathArg.empty())
--    HIPSearchDirs.emplace_back(HIPPathArg.str(), /*StrictChecking=*/true);
--  else
--    HIPSearchDirs.append(getInstallationPathCandidates());
--  auto &FS = D.getVFS();
--
--  for (const auto &Candidate : HIPSearchDirs) {
--    InstallPath = Candidate.Path;
--    if (InstallPath.empty() || !FS.exists(InstallPath))
--      continue;
--    // HIP runtime built by SPACK is installed to
--    // <rocm_root>/hip-<rocm_release_string>-<hash> directory.
--    auto SPACKPath = findSPACKPackage(Candidate, "hip");
--    InstallPath = SPACKPath.empty() ? InstallPath : SPACKPath;
--
--    BinPath = InstallPath;
--    llvm::sys::path::append(BinPath, "bin");
--    IncludePath = InstallPath;
--    llvm::sys::path::append(IncludePath, "include");
--    LibPath = InstallPath;
--    llvm::sys::path::append(LibPath, "lib");
--
--    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> VersionFile =
--        FS.getBufferForFile(BinPath + "/.hipVersion");
--    if (!VersionFile && Candidate.StrictChecking)
--      continue;
--
--    if (HIPVersionArg.empty() && VersionFile)
--      if (parseHIPVersionFile((*VersionFile)->getBuffer()))
--        continue;
--
--    HasHIPRuntime = true;
--    return;
--  }
--  HasHIPRuntime = false;
-+  HasHIPRuntime = true;
- }
- 
- void RocmInstallationDetector::print(raw_ostream &OS) const {
diff --git a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch b/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch
deleted file mode 100644
index 80598c6f990d..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-LLVMOffloadArch should link libdl to fix undefined symbol 'dlsym' when linking
---- llvm.orig/lib/OffloadArch/offload-arch/CMakeLists.txt
-+++ llvm/lib/OffloadArch/offload-arch/CMakeLists.txt
-@@ -3,6 +3,7 @@ add_llvm_tool(offload-arch
-   ${CMAKE_CURRENT_SOURCE_DIR}/offload-arch.cpp
-   DEPENDS generated-table LLVMOffloadArch
- )
-+target_link_libraries(LLVMOffloadArch PRIVATE ${CMAKE_DL_LIBS})
- target_link_libraries(offload-arch PRIVATE LLVMOffloadArch)
- 
- if(CMAKE_HOST_UNIX)
diff --git a/sys-devel/llvm-roc/llvm-roc-5.0.2.ebuild b/sys-devel/llvm-roc/llvm-roc-5.0.2.ebuild
deleted file mode 100644
index 6dc4f6a23e2c..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-5.0.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-current_pos.patch"
-	"${FILESDIR}/${PN}-5.0.0-linkdl.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	pushd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-5.0.0-hip-location.patch"
-	eapply "${FILESDIR}/${PN}-5.0.0-add_GNU-stack.patch"
-	popd || die
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt || die
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp || die
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp || die
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp || die
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld;llvm"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_BINDINGS=OFF
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_BUILD_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EPREFIX}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/metadata.xml b/sys-devel/llvm-roc/metadata.xml
deleted file mode 100644
index e9e51b8f323e..000000000000
--- a/sys-devel/llvm-roc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>candrews@gentoo.org</email>
-        <name>Craig Andrews</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">RadeonOpenCompute/llvm-project</remote-id>
-    </upstream>
-    <use>
-        <flag name="runtime">Builds the compiler runtime libraries.</flag>
-    </use>
-</pkgmetadata>
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 37a17c482a71..6251f7c166af 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -8,6 +8,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD llvm-14.0.6-r2.ebuild 12453 BLAKE2B 1abe7ff61d3cb1a3fc9edbf9a2c4250f2ccc39dc65c6ae59deb32a7a7634b27b58da7cfe39c1fb7b85388819809e8400436f12faf698be2b3d4a881622890a23 SHA512 1953f255618368526b8a209e19c61b13892337281d35ee5087719ff02925e5ed697bdce30bb43ca1a35b527c832eb0a58cf09e622e15b902d9b2a7848876a85b
 EBUILD llvm-15.0.7.ebuild 12622 BLAKE2B d454859d5bd3a53803d75c523be949664273df786e2352f148683d95d6c63657017301bf75c80d61f2dad730b5830434d5fbf019acd0bc6062b7575f27ab11e1 SHA512 b70207c89262d7910478c2548cdd530ca29acfe62636b0c1f983e47968725f0dc59cf9fe3a385bda0057c5c0376b681dcb2124093bbfecd717c7b12882bbaa35
@@ -15,4 +16,5 @@ EBUILD llvm-16.0.0.9999.ebuild 12463 BLAKE2B e01d8b5b94314a58c994ddd781555093adc
 EBUILD llvm-16.0.0_rc3.ebuild 12423 BLAKE2B 41cd18c9dbba9ece0f847200ad4f959072e07325fc759a597fac492464bd584cdd8354c8be83c301b9ee762d1c3ab9672fbd192f41e2b2b70590a72a28480464 SHA512 3d1e2ef83a98a0fb47a130824d81f77bc66d9e525d25d71d0387733a771c683fd8bb19aab7677b9825b7201ecb842e83803c6b83213e464a1470c2a47957c413
 EBUILD llvm-17.0.0.9999.ebuild 12463 BLAKE2B e01d8b5b94314a58c994ddd781555093adc63376ef352d130a1142ac77946e61ce6150eb2acf5692bd693e45615b20fe5431f403837c77327b7eb0dcd2a88bb8 SHA512 2631900128b8188a80290c42d0a147f4e187d2df2f357970ec553b831e15849f42320d5aad9c2db80019ca85daf835a4589551711e7d600575ae6e6188eba8af
 EBUILD llvm-17.0.0_pre20230225.ebuild 12417 BLAKE2B c9756a3894cc28309788980a035e768d5d034242878dad72b8a7a01e9c67c9ae712a52b7f55a400a7099c1f0c84d60dcf7da2c0ef6e387a3f766c46e2b211e67 SHA512 b509fdbfcdd09708e0e26372e6dc09b14a94a5daba742032ca3bf71c817ee4ae72d9a95d9d587e70eb9a9683af96b06bb64571c4c02bbe70ac4a79e438a89d0b
+EBUILD llvm-17.0.0_pre20230304.ebuild 12463 BLAKE2B e01d8b5b94314a58c994ddd781555093adc63376ef352d130a1142ac77946e61ce6150eb2acf5692bd693e45615b20fe5431f403837c77327b7eb0dcd2a88bb8 SHA512 2631900128b8188a80290c42d0a147f4e187d2df2f357970ec553b831e15849f42320d5aad9c2db80019ca85daf835a4589551711e7d600575ae6e6188eba8af
 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..d05904f7192f
--- /dev/null
+++ b/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
@@ -0,0 +1,518 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs flag-o-matic
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake )
+LLVM_TEST_COMPONENTS=( third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeNameMappingGenerator
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-remark-size-diff
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZSTD=$(usex zstd)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 8e1f5fd0c8ed..3af6c2731db9 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -5,6 +5,6 @@ AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d466
 DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d
 DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
 DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e
-EBUILD m4-1.4.19-r1.ebuild 2740 BLAKE2B 39a6509c7cc89acdfb1b4dbd7b47d8c7477d542ca7efcbea479e30cd8d9ad9eda0d0e2a034eeedf498ccb39c6265d54446b77e8a7a1fe3b50c71db496db5d7ed SHA512 3f3490e6b4a1c7385db306681082b40dc94648c59a9984c7db045b7513596e2bc5e48d0f71a5b4f6dd5dce5b9bade95ed340df22af8cb50f0d1df077dbf605c6
+EBUILD m4-1.4.19-r1.ebuild 2738 BLAKE2B 19723b0e65ecf35007fa7a7cf12541612977fd0b0fb47f750a9deeffb38e5d991353725c34d8fa3cd751a05285a5466d5059408957715aa57230e2fe1fdf189e SHA512 5291faa6075576939bb76bb61fbc8e1019262dfd693bb809cc253af10641d515ad2390b7edf20bf92c6d8d6c734fa3b82ef0df5c6656cc238ecb3440cedd54d6
 EBUILD m4-1.4.19.ebuild 2689 BLAKE2B e5392911ed0fb30b27fa6412dd6dd5ca66fe8fabd25a30eb8207e8a5d040f71cb91b8b739d4404d209e16b8060f149e34409324ae40b03377d1c8df226f1f783 SHA512 cf2cf5e691dcf02e0eac8bb281ef5de53b9db03f4c51919324d9ea10ae8c9a05d94d20b8aae1a7fc28b0790201394ea307dc3aace54f9590640c646499696193
 MISC metadata.xml 337 BLAKE2B dfc1567438a22dc64fbcd7c88e0840408e11b95e718134a839e1a9b526d6b618a40887c55097c8a36fd1757f9affe6acf07bd761efd59e372b95dd52110146b9 SHA512 066643eb5bc9f637200a19197c3c4825f3e032c568c0bb440b21c0b337a3ef30f69a1a1a4b38929b19ef22f9fd25d0f86079a11b33f7d1832165d216d269538d
diff --git a/sys-devel/m4/m4-1.4.19-r1.ebuild b/sys-devel/m4/m4-1.4.19-r1.ebuild
index 59855d8320f2..1e21816bb42b 100644
--- a/sys-devel/m4/m4-1.4.19-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.19-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index ca893c7704c0..254ce7069792 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,7 +1,7 @@
 DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15 SHA512 b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
 DIST mold-1.8.0.tar.gz 8155820 BLAKE2B cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61 SHA512 923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8
 DIST mold-1.9.0.tar.gz 8163212 BLAKE2B 09ce66e4214c184ea2f36720bc0f839f77ff2a708d56a5767d29758d62310eaf1193394d581c4352404958052c29c0cbc55a4826d10285beda50afb20bd51c80 SHA512 c1c45bced963d4f7c9b67905177157d6f76c518b234fe3eefa2a9ba6c35a08dd6659e64b7939744355ebcd72ae343ef0249ef6a0c80b4d77b1e69e327eb3ba19
-EBUILD mold-1.10.1.ebuild 2162 BLAKE2B 79d8291fbbc5375c36533f89721acce29bdda4c3502ce9fa5202defb1c6134c605995b471014831d7f13824eafcc446f75ee8a50c6a0f161899c08af8e307bc9 SHA512 281278811781fb9342d171a716d14cfdbd84e3b2172563daf126ac8da1bd89dbedd536e4bde9f2801a8656f34ca72147a7be0e0336e23ea1892d137f3452958f
+EBUILD mold-1.10.1.ebuild 2161 BLAKE2B 3ac1e9728556c58694e7ff460a49f5a6c3eaaf792c03aee0e4daa85ab74e4680550fa1c3253634c254a31e76a77792e0be7c1c4910533825f06bc719a1b9bbda SHA512 4d88a364d1e4c78bdb875861b1bdea5a848370199af5ecf05e2f8474433ee72d3f75e16f10445f5d17b994a45efd9e3a7860d5bda96ae5f938d575be0faec60d
 EBUILD mold-1.8.0-r1.ebuild 2154 BLAKE2B ac12a67360e593048accf196631d268fe808f46689e5dda5f27d9caefa6f28f35db45c41283bbdf40b2ef1becac6fe0e9102a2dd70c1208e5a45ab573d75f5f3 SHA512 5ade48864229c969e4eaf7362dc18ae69284031f88a4ddf8dbd63c7230ec0274e0ad07d55df281c71c25f3329ba438ca2b51c10fee7680511e7685343e81594e
 EBUILD mold-1.9.0.ebuild 2155 BLAKE2B 9f586543589a88bfb8d865cba4b05e439936208f728f81da755adffa292190680f1a7e4a13f18cc73c161f70c3854b944796778c21109ca9231f1ad06edbff69 SHA512 0fd9723aa2a0e01881d2a8bc91c3d771ac973f1a2aa7f13689450a6ade2f352f5c79791e8d4456aa637f7c4afa1620b60d03f76bd3fafeaee418aceb86f66d72
 EBUILD mold-9999.ebuild 2162 BLAKE2B 79d8291fbbc5375c36533f89721acce29bdda4c3502ce9fa5202defb1c6134c605995b471014831d7f13824eafcc446f75ee8a50c6a0f161899c08af8e307bc9 SHA512 281278811781fb9342d171a716d14cfdbd84e3b2172563daf126ac8da1bd89dbedd536e4bde9f2801a8656f34ca72147a7be0e0336e23ea1892d137f3452958f
diff --git a/sys-devel/mold/mold-1.10.1.ebuild b/sys-devel/mold/mold-1.10.1.ebuild
index ea88934048d6..a574dbeb3b3a 100644
--- a/sys-devel/mold/mold-1.10.1.ebuild
+++ b/sys-devel/mold/mold-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9873204a332f..f3258705698f 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index f56a4382b515..189b8296247e 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -8,7 +8,7 @@ DIST btrfs-progs-v6.1.3.tar.xz 2333984 BLAKE2B 71543f5be282a289fbc92f78b89b25e41
 EBUILD btrfs-progs-5.15.1.ebuild 3167 BLAKE2B a879f998fffa1ba80c42f8423416ff05cc23a7cf2bc797d450d2379bb61360ce2333c41d7035dad1219365194b3dd33aa1988b06de845c9d7bef1334a4618d32 SHA512 ef12dacb70e2986e3d974ad150f9d9b2b450f1fffaddb303967195c7a0f95199225fecd74f729b98adca19cffc51ed261c88dbc88ed0bfdfafe4e8b0597078b9
 EBUILD btrfs-progs-6.0.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
 EBUILD btrfs-progs-6.1.1-r1.ebuild 3371 BLAKE2B 6d1dec5724837eed26ba50d9a4c0bf7f97d4783a07fd6f2ad51e8d83790acd4fce210daa846336d52bf459dfc7485ec90feff9e7005e9f46235c2faebcfcf8bd SHA512 455bc0717e4720ae7b99add5bbdf961258b8d0bd43585f8c68003bad8ee6fbcb9df666a999194c530a3c3d40abe33c39c449449874b32adaf85c69f562c00a30
-EBUILD btrfs-progs-6.1.2.ebuild 3318 BLAKE2B 81ff7b6d3b71f399b87f91d7fcbc2fe88916e6b3c4bc77fa7401d1350814d2f3db9a53b1699737668bbe4968b51eab9fef71725bf85b7066060e1ada065d9e17 SHA512 1a0e1b5572c6cd3ee6278c105dc0185c476795b127201ea074a60a1bcf7ccdab2f0872e4eb4e8b8974d566123a7571d759de6340a52ce7a022fe1969efd7d675
+EBUILD btrfs-progs-6.1.2.ebuild 3316 BLAKE2B 04f3a7b2f5e79948c5b87e8faa9f6046d8727580c7fa4a55657e831a3b4d5160a958e348ee31e4d141bdce8893e9f383b2ffda3300232979a75b5d9a34aaaccc SHA512 dfc4566c398687b0bbbbe2896303ab4fba5fb142ffd40362f5fa11da4f54b450d82168c904ef5fc7e22176c17d856874214ca09cf4ae0d10a85c54b0a62fec59
 EBUILD btrfs-progs-6.1.3.ebuild 3528 BLAKE2B f8cc1b0065bb23eb24227577593c0546a842a6c46b91b69d4c9b7a0aa80bce6fd4f48d9a353996be4ce2d0a7cbef9c4fac161107b4c0f7475a3f8956db865859 SHA512 5a7bbfc026045c6b0de1bfbd2dc10d4fa690d2fad85d3cb1a1927576944ee8283a776e748b82cb362587fcf418e9c135fa7fb044e6676e51b2280ce81f3f57a1
 EBUILD btrfs-progs-9999.ebuild 3528 BLAKE2B f8cc1b0065bb23eb24227577593c0546a842a6c46b91b69d4c9b7a0aa80bce6fd4f48d9a353996be4ce2d0a7cbef9c4fac161107b4c0f7475a3f8956db865859 SHA512 5a7bbfc026045c6b0de1bfbd2dc10d4fa690d2fad85d3cb1a1927576944ee8283a776e748b82cb362587fcf418e9c135fa7fb044e6676e51b2280ce81f3f57a1
 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
index 00c888531f94..3e995e27b35a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 	fi
 
 	S="${WORKDIR}"/${PN}-${MY_PV}
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index bf46fb39b8cc..cac687909442 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -3,5 +3,5 @@ AUX libeatmydata-131-gnu_source.patch 1941 BLAKE2B abf46ff6eb4dc0547e1dc758384df
 DIST libeatmydata-130.tar.gz 375627 BLAKE2B a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd SHA512 80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18
 DIST libeatmydata-131.tar.gz 368469 BLAKE2B 1b59f80ba72caeafa40272c5996e0fb03774c69c35d7a2194d312e53c48212caca84abed56ec63a9fba2b4142efbee4aa371c3869a76f8c5674936ffe0daea5d SHA512 064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d888853055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42
 EBUILD libeatmydata-130.ebuild 943 BLAKE2B ad8fe9386fe35838aba815f8b24d22e631612750d0f9b14ec0bfbabe9dce4a027b28ae38a817f33810687f731f4bb12e3128a85efbdeced97e2156e4e0634386 SHA512 46f166d40c734e48c09f87f2126ad9d9d4afa74b999785b4e3f6512f2bb494fbff6a8ecbea01db8d29067b88e1546e0505c359e90b9b08300281d2c7b96093a2
-EBUILD libeatmydata-131.ebuild 927 BLAKE2B fe56b4b83dd7d535f59dd3a71120880903f4e6d6cf45cbe2c19f8dec2a9059337ddc96c75f017b6c00bee62d3087f789dcb40a0724c8d5a6c992d0569e5a5846 SHA512 4dfdd1aa72284ee55333e6582b8ea8bd19b55950eef4e340155a21a063e668ad7362f14f243ff84b43b3bf13c6cd4bf242a10d04688f9933aca8697c8317ab01
+EBUILD libeatmydata-131.ebuild 926 BLAKE2B 4c4e92861dae8bb6f9aaeb5e766dc3ab54c57534d8a4b6ac33d97e22aff0a86e585a934e628de8b70be18f5a22e454cf74cd4d1d631df0c94ad088d64b90fa90 SHA512 02f61453065f0301f1b35e59ba269229dd57d65cffebe955cdf2b5be56dd14879c1379c01a230569c79cb654101a3dcf468fdf06ce2e3e2f503fcf0765bbc369
 MISC metadata.xml 511 BLAKE2B 34fcc6f9c449e64c078f8e77d41afed2d5acc2ef4f7eb298f1dd35241520c28452d610b216a5811de0dc6bdc79efef7d8ee31d680547674b5e8fd9f2eb47bb17 SHA512 c58ddfef161abdf2775d9e2f8f7eb4850088bd1a8ddbc2cc6a43c26154b48bb571695f6c439275e66b84af8bff7922aecfeabd8a55839260633de530c4a9205c
diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild b/sys-fs/libeatmydata/libeatmydata-131.ebuild
index 84b579718d1f..503a1de35721 100644
--- a/sys-fs/libeatmydata/libeatmydata-131.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest
index f0ce71a9a626..a6bf2dd127a2 100644
--- a/sys-fs/snapraid/Manifest
+++ b/sys-fs/snapraid/Manifest
@@ -2,4 +2,4 @@ DIST snapraid-11.6.tar.gz 744142 BLAKE2B 300350e355298e972b0f2c83cc0cfdc212c01d6
 DIST snapraid-12.2.tar.gz 745755 BLAKE2B dde099a18eddc5dcec178b46c41e8ef828ad214667c0414891dc9ebdb509567233170df2a6483284e0b44f8b8e71ef6ca8a35f845b501b8d8cf4dff97d080bb6 SHA512 2c19c0e336e6e42c8b44bd3f3ccfdc4dfae901f166b0825deb471919dc22f98e92a6d64557b6fed3648b332d4432735db7998656d60bf173925a91c90b099bad
 EBUILD snapraid-11.6.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
 EBUILD snapraid-12.2.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
-MISC metadata.xml 503 BLAKE2B c812e02a1c4b3b5a7874b8bf46748cd0b33b69339cd43ee6eaf534922c2cef0c9e2ab87c8ba87acf87d5704b13242f713d8ba6e182e3ce2ddf3bbde82d57b4cd SHA512 c4bbbfdfe312004903c868d7f058c8f6363820c1d9ef17e9f0cd4cf7fde1d05ad283e2f702c0b19ee65fab8820c14c0dd2d8e433a23a4675c2eeb30c17acd3d2
+MISC metadata.xml 389 BLAKE2B 7a80a1bef537c39b3cfd38f83540d11252973ebc8cad7cead59653befc67e390dfa9549ec072c99941adf79fc4795b3a230c3925f60fb6df73c56772d4d64646 SHA512 2c971b5741334e598325d795827c085dee6ce5dd32323e000a9757f056793069f3a1a00383aed277e4c05ba91e47b3068b7a6284c226fc847ded9a858c4a5a45
diff --git a/sys-fs/snapraid/metadata.xml b/sys-fs/snapraid/metadata.xml
index 6cb715dfdf3d..eb14d529cbe3 100644
--- a/sys-fs/snapraid/metadata.xml
+++ b/sys-fs/snapraid/metadata.xml
@@ -5,10 +5,6 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">snapraid</remote-id>
 		<remote-id type="github">amadvance/snapraid</remote-id>
diff --git a/sys-fs/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest
index 38efe29b9cb0..b190419e259d 100644
--- a/sys-fs/ubi_reader/Manifest
+++ b/sys-fs/ubi_reader/Manifest
@@ -1,5 +1,3 @@
-DIST ubi_reader-0.8.0.tar.gz 42913 BLAKE2B e802833fcc633739da6cb3cfffb8f398ad27261df55301b6322ea7303aeccbc57f6a685cefa4005ecf80e2a968139d091a8b5c6a9783dd613a5016ba56d55425 SHA512 c22a0b056a2ce74c16683dafd8e2592ba3c73df32ca49cce19fe14f60d254249849769364993cabff5ce03c8049e1758f7bdb77583d745ed21efa0c62be20532
 DIST ubi_reader-0.8.5.tar.gz 43237 BLAKE2B c55bc689af0a32a0e65aa6f860617131654d11ad5e6f7f1e37b4e048718c061f352965f9793595dc16162df0c08ce32d4db2d6bfaee9366110028f7fe61a5c98 SHA512 14e02c8b8c5fe0fe6316f0dabea21dbb6ef6a865ef2b176fc6e26f36bd54a981cb89fccee2ac476b042909cdd5946b1325f792ac159d7e6bd2c5a6f7f4b14062
-EBUILD ubi_reader-0.8.0.ebuild 559 BLAKE2B d7d721d3df73415477b7a4d3c89d0fae6a77bc9cf5076e87f04ad0749b67810054093722a69cf762fbfe87bdf4329888be9f74a430a576b76040061dac4ffba6 SHA512 8016224c5b00111ca9f2280de3123f434d28c742b5ad2d6767f71601410bed5e25688de367870dda1186155af748587ad67898d2fd32eb88c7ef548315703996
-EBUILD ubi_reader-0.8.5.ebuild 559 BLAKE2B d7d721d3df73415477b7a4d3c89d0fae6a77bc9cf5076e87f04ad0749b67810054093722a69cf762fbfe87bdf4329888be9f74a430a576b76040061dac4ffba6 SHA512 8016224c5b00111ca9f2280de3123f434d28c742b5ad2d6767f71601410bed5e25688de367870dda1186155af748587ad67898d2fd32eb88c7ef548315703996
+EBUILD ubi_reader-0.8.5-r1.ebuild 590 BLAKE2B 456601ac88a37cd3295de368bf839f4271064648904ef58fd36d2436b0950e0e1279386d90c173ed54a10332b45cab25c3ed85919d7cbd6652d10b04f2352208 SHA512 093e24056c8d9bfd26b9e1158775b85dfb2ec7d187c13d989e74828b3b9513fbede353501b3dfd3686179a5a14339ed07426367140db04745120cdac5ba53148
 MISC metadata.xml 418 BLAKE2B 42a180fe245386ada906cab96f96962dc2f26517eee70a3f6bd0cfa5fba8cd382dd12c3624ae5bd7a949d030a935467d37a164db4d69dffbff87a4aa2b3521cf SHA512 cf62a833bb427fb8435ca5a02d41f9766d8a482da4a9338cd171a302d5181f452ed23d37039364a4d61c0c57c9f1c9c62df09c519094807efa14ac8b10eb6d03
diff --git a/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild
deleted file mode 100644
index 4c59ae5023d2..000000000000
--- a/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/-}"
-DESCRIPTION="Collection of Python scripts for extracting data from UBI and UBIFS images"
-HOMEPAGE="https://github.com/jrspruitt/ubi_reader"
-SRC_URI="https://github.com/jrspruitt/ubi_reader/archive/refs/tags/v${PV}-master.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}-master"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/python-lzo[${PYTHON_USEDEP}]"
diff --git a/sys-fs/ubi_reader/ubi_reader-0.8.5.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
index 4c59ae5023d2..ea7eb78871bb 100644
--- a/sys-fs/ubi_reader/ubi_reader-0.8.5.ebuild
+++ b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 MY_PN="${PN/_/-}"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index f978ac5b13e2..1208c02a0d56 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -6,5 +6,5 @@ DIST xfsprogs-6.0.0.tar.xz 1320744 BLAKE2B ae1d175e3dc5f0f6819397f8166a419847da0
 DIST xfsprogs-6.1.1.tar.xz 1322528 BLAKE2B f6551356ccc68ee6d0bdc50edcf9717bfc94053e97b408f0fa6b316d51391bd347baa8c6ce09e269d09177eec14befc4235738e92d5e4408bda1113c79b2b18b SHA512 ec11cb9be34502a006f18ebea0a62aa227580753fce57cb7b6394d079fa41aee778382c06116a2fa45b67989a1501bbba2013829d2348b51e1136e668966c5e6
 EBUILD xfsprogs-5.18.0-r1.ebuild 2327 BLAKE2B 58e5d854515fcde4f9315c9c718fa8a370ee21239ff7a010473ebe06e9e8bb7f1a02f17bbae308c5918d41d18e89fc01a3f1cb56067d7e602738cbf746cc7c37 SHA512 4249c3b7cf9893b30b708c572b30b7f7f9e377fbcb7ebb970b89c993dee65892819c11c6d3526415fa795276bc420940e0da9f47749a1080b445cb8d60731ee3
 EBUILD xfsprogs-6.0.0.ebuild 2327 BLAKE2B 58e5d854515fcde4f9315c9c718fa8a370ee21239ff7a010473ebe06e9e8bb7f1a02f17bbae308c5918d41d18e89fc01a3f1cb56067d7e602738cbf746cc7c37 SHA512 4249c3b7cf9893b30b708c572b30b7f7f9e377fbcb7ebb970b89c993dee65892819c11c6d3526415fa795276bc420940e0da9f47749a1080b445cb8d60731ee3
-EBUILD xfsprogs-6.1.1.ebuild 2289 BLAKE2B 7ad5e3c64f279947650ce9ffcbc3ed92fa6d614fbd766cc27dbcccb3d8049d7194e0fd83dd7d80b91e6770c3397af87ef3218f66de4a26ad18d30bb50e49bd51 SHA512 ef20d496941dcfc0a8242e083a9b72e986ae65080717beb44abd5ffd9ece280359470b25cbe18d72c52a0e18da6ee1c5929a9b4b39673a733c0d4a1862f8b823
+EBUILD xfsprogs-6.1.1.ebuild 2285 BLAKE2B a5358a2a3aafa72046a3c90bb7b94795b65fccb16172838207966a4302802a34c7e1edf8dca6af712ed733efb04723331807d33e239d24828835f2e98e7ad69b SHA512 2903a358b2180ca65cf90bc942176d8a19b33f7ff911c3d1a06691503b3ca47d16192ba81f8b963d7472953a386712f49f7924f2613844684a57eb00e02e9900
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
index 9552f06869c5..c0458b718a19 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu libedit nls selinux"
 
 RDEPEND="dev-libs/inih
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 946d3b7855a0..df3621106454 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/cryptodev/Manifest b/sys-kernel/cryptodev/Manifest
index 3a08c3fb95c2..8d652d5c407d 100644
--- a/sys-kernel/cryptodev/Manifest
+++ b/sys-kernel/cryptodev/Manifest
@@ -1,6 +1,4 @@
-DIST cryptodev-linux-1.11.tar.gz 56876 BLAKE2B 97cf09c515c586372b2c5bd450e445afd5f80ed8ab39002545dc550c63480469a5318214f467444618e4e1783b9ab999b550cfb16d8ded6de26671a0727d06c2 SHA512 f7b76e9a154945514e2238cd7106cb50cea8120febc79228d6a8ba2dfaf98d5f0756d970df76fd63bda4755d7e0d78331aea394c3c5c18794b7ef1a8738fddba
 DIST cryptodev-linux-1.12.tar.gz 56922 BLAKE2B ec3d6585cbc15027468c0d009dfad1437286e71f90247b6b07067e1355483d9a3184cb0134ab4cfb406168b1b506fb08d4a0ab6476b71305267769a33e5ed2de SHA512 75f4f20ee7474375fd515cfd4f247f9a61739ac766525cd8fe007adfa44129d90077568d59409f577202a4d8883539b0d533dd5e060a1065b61106f68ea5e4b3
-EBUILD cryptodev-1.11.ebuild 1271 BLAKE2B d29014611d0231df95f8bcf896f351861199846336ebeb44ba849630e7178f1dad00d63de0700a4b00d0c1f44b11219c0565df48052767b79bf8211ad912489b SHA512 eeb9b3a857a11bc96a9a4b655da9f9d74343509926f0336d5d6a0a6e5c82848493b0f9c088e5c028942492412a666b2c2e11d72144c66885948e62c6e79b36cd
-EBUILD cryptodev-1.12.ebuild 1271 BLAKE2B 96d775a5949625fa690923bde0c577cb61dc13eebdefd6890768a76310a533899fe74fd6bcc0e4422d560792de79cd7ca5ec8c17242f8ead70db3b30c4b562f2 SHA512 a68cda892c40bd227dade9beb9f6a77064690ae3fe0219e991dd9c3f0ed0432298de74e51ff311fb37a9b5884ae5b988508ecbc076e67bac5d076a40d0a75935
-EBUILD cryptodev-9999.ebuild 1273 BLAKE2B 15419af1ee675b6479266dc3e1a5a095076f68eb5d4161f88c3592fb88c825294ec23adb1d3650a872ad576cb526f8c1b3a82b08b036898a236abb0cb3c80175 SHA512 771a107d0da0f8dfcd2256f8d9d8c232cf27526e4e5c901c6d3fc3a3abec66e926cb6cda9896abb5582724d9c91802a0225a15e92269d9bfe14c01e6d8e000f0
+EBUILD cryptodev-1.12.ebuild 1243 BLAKE2B 5c48671d23bd85599c7f39b84f84a196c9c84464a9f4864c26a4db400896cfadbeed2f67d6ab7637bb65eba9c4d8994a2f111e5fc73b135de2cd28557326d2b2 SHA512 d2f001ff4f5fdff871ebd73b95bdd6f798df3bdbca63712c98c96ca056a0f9653ac3b6178869a9d2166f1fe7d77b3f53c72ff6aa18128fa9b4e824212109dd9e
+EBUILD cryptodev-9999.ebuild 1245 BLAKE2B 3ed6ebd92782288f38b97031c9ed0007a4447aa3327e9212600f746baac306ced68b00cfde9e320ece21cc070c9b50b8744972f4926e55c9f519c44f70c39580 SHA512 6027e7f8385bc531e3913da053956a207b8c24005e58a253d62274eb758bb2fb63e866e974c65efd2c2f6d24fd767a15007bccb19599fbffcaf719b06fd1ed68
 MISC metadata.xml 248 BLAKE2B 2d106b5e5ce214c551cc1e69c63882e8eb0c2986584f02a89a912ab1bf37e7febee7f32dc6428330c516149d777c181de0699ed51f2278908570b04103163592 SHA512 5f733a87a4b90f9037d013b281384f3df7a2f24c9a445ff729687c1693f4b7ce254966c58c190efa569864bedc5d9933eb960e86aa691d490fb9a4d5c90cf0c1
diff --git a/sys-kernel/cryptodev/cryptodev-1.11.ebuild b/sys-kernel/cryptodev/cryptodev-1.11.ebuild
deleted file mode 100644
index 89714e1aa6bd..000000000000
--- a/sys-kernel/cryptodev/cryptodev-1.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="device that allows access to Linux kernel cryptographic drivers"
-HOMEPAGE="http://cryptodev-linux.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
-	S="${WORKDIR}/${PN}-${PV}"
-else
-	SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${PN}-linux-${PN}-linux-${PV}
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples"
-
-DEPEND="virtual/linux-sources"
-
-#test requires that the module is already loaded
-RESTRICT="test"
-
-MODULE_NAMES="cryptodev(extra:${S})"
-BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\""
-BUILD_TARGETS="build"
-
-pkg_pretend() {
-	use kernel_linux || die "cryptodev ebuild only support linux"
-
-	CONFIG_CHECK="~CRYPTO ~CRYPTO_AEAD"
-	if kernel_is -lt 4 8 0; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_BLKCIPHER"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SKCIPHER"
-	fi
-	check_extra_config
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/include/crypto
-	doins crypto/cryptodev.h
-
-	if use examples ; then
-		docinto examples
-		dodoc example/*
-	fi
-}
diff --git a/sys-kernel/cryptodev/cryptodev-1.12.ebuild b/sys-kernel/cryptodev/cryptodev-1.12.ebuild
index 33410090c5ff..4660f202faa1 100644
--- a/sys-kernel/cryptodev/cryptodev-1.12.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="http://cryptodev-linux.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
-	S="${WORKDIR}/${PN}-${PV}"
 else
 	SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
 	KEYWORDS="amd64 ~arm x86"
diff --git a/sys-kernel/cryptodev/cryptodev-9999.ebuild b/sys-kernel/cryptodev/cryptodev-9999.ebuild
index 08cf07fc623e..ac9bd1eeea15 100644
--- a/sys-kernel/cryptodev/cryptodev-9999.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="http://cryptodev-linux.org/"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
-	S="${WORKDIR}/${PN}-${PV}"
 else
 	SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 4716d92acf4e..a7ab895614e1 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/blocksruntime/Manifest b/sys-libs/blocksruntime/Manifest
index 57142524a541..0c797c28bc7d 100644
--- a/sys-libs/blocksruntime/Manifest
+++ b/sys-libs/blocksruntime/Manifest
@@ -1,4 +1,5 @@
 AUX blocksruntime-0_pre20171027-ldflags-soname.patch 933 BLAKE2B 335a135b321bc57cfd63afa0c40ae91316dc5f446c4c412270ab78f3a2b9ee435900ebcdd8bb57dbd60d6a3d0bc412825a7f344141f3ef8ef6a042f29af34cc8 SHA512 7887727d2005dc70dee37b3dadbe49deeb9de7013e2d49f80248f71211a45f70e9a986991eb9bfc93668d635698f40504072fefdfca88511f8fc39121ba6f8f6
 DIST blocksruntime-0_pre20171027.tar.gz 40571 BLAKE2B 5cb5cee10d482a3028b6ed496f7ed4fba25504c5e188dd21be37f0a65b72750e0ce31f7243e9cd848d10323e43e7d058fd2f7eb5ffed9a64e543d418ac96cfac SHA512 4008730f7ee4173f22c40220c4b87cd3f5cfadd12d5ddbaec244e3c4164111f036d0b859cf4bb5f2425313148f5c6445de30af2d4ccc83e1b97a66895ccc6dc5
 EBUILD blocksruntime-0_pre20171027-r1.ebuild 980 BLAKE2B 51116077a0f71392e579265c407179a361976cd63c5d2d83136c5dbdd58d9965f7b1f6e8ca7f6700a6dcad439d4a5632d9cc17105f25679da8e7499c29b9e5eb SHA512 5ca0ab3e205cd86f37149b50c6c93ae66e5c5d0c31e287e31969bf7c59ec355c86f745f61a8682db2fe30311e504be38fd2f95752975114f466009669944e115
+EBUILD blocksruntime-0_pre20171027-r2.ebuild 1003 BLAKE2B 1c489c3688ff749c4ca3c70318c26b39d61cf0f4bc8e4e19d6c42c8c3e5d2a986e593d0e2ed1bdc521fffda66adc5df89de628c715f2c32a4ad025038d3a4e55 SHA512 cc3f2bc3abc80de7b577a2f54c0aa82f16b10f417fd94d4c372d14673c28a31ebaacf220a07a6aadb7398543fedb528616496c9a4f01515b048d7ed6b7eee8a6
 MISC metadata.xml 332 BLAKE2B a3c555c588394e389edd5c930a13242db36a0dac93d63c994d018f122e81fb91357a9aa7339a496c7818acac13c3934ca48e1131399deafd7f941409b5bc0c9a SHA512 e0b7bc8f099e953f31f15ddfbbde6fc721d0fcf562cfa58dd72006bb0018705de71324906fc9776f1ca89176798908739662686b60d79cedbd315b7539b581b8
diff --git a/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r2.ebuild b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r2.ebuild
new file mode 100644
index 000000000000..1036aca20985
--- /dev/null
+++ b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT=9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81 # 27 Oct 2017
+
+DESCRIPTION="BlocksRuntime library needed for clang's -fblocks support"
+HOMEPAGE="https://github.com/mackyle/blocksruntime"
+SRC_URI="https://github.com/mackyle/blocksruntime/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="!dev-libs/libdispatch"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_pre20171027-ldflags-soname.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC AR RANLIB
+}
+
+src_compile() {
+	./buildlib -shared || die
+}
+
+src_install() {
+	prefix="${EPREFIX}/usr" \
+	includedir="${EPREFIX}/usr/include/blocksruntime" \
+	libdir="${EPREFIX}/usr/$(get_libdir)" \
+	DESTDIR="${D}" \
+		./installlib $(use static-libs || echo -shared) || die
+}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index b8b6cbd00344..89e877c61589 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6526 BLAKE2B 371b7d7bfbcacce1c04cf039b15f49bf5c8fb7de0352c4f477b92d1efe0c70442770ec0c6b60572cf5877b5c14492328cf727b2aa5c1dea761eb909aa1e1df6c SHA512 ee1f054abb9954eedd5b098afb1eb741cd2d7b1b329ef66ed3f25f8ed050227a31925852e3d893b0a9913e2ef2ac34efe89c66c19b562c586f7c0352a10a5814
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6578 BLAKE2B 79b9477f9f426c7e5ffc07fe9e2abc86ee568d8e081ac5e5e3da3e3e169920fe8c0ce34f9a8ac03a4389f27ecb0b0ff7f5cf91622d614e03300f17ea97d20859 SHA512 9d23f6974edbe69e5d9fa53a3885e8e44741b5e5d90b0e72c6d191b70827d1e590a7c5a3373bc4fb4945a50db0eea5e119baeaeea956c6d92bb087410ce919b0
@@ -13,4 +14,5 @@ EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b1
 EBUILD compiler-rt-sanitizers-16.0.0_rc3.ebuild 6254 BLAKE2B cf7575a46a8678ff6ed69bb3e5863b062948af66bee98d60be8e728d30095ee34272b5a89d99bb31ee6ae87e3831cbb8120bc9f62ce0a0662caf42126582aa72 SHA512 da6daf348f285fe8c56d707fe185318647eb08bc6decc614d4b7f690f729fe4ae5580bc9d216aeb2a18881a729ed50cacf2d32a591c768ccc095e43969ac7b6b
 EBUILD compiler-rt-sanitizers-17.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-17.0.0_pre20230225.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
+EBUILD compiler-rt-sanitizers-17.0.0_pre20230304.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230304.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..cc599404c49c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230304.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS=""
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 509a7bd75162..960014b8e0a1 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD compiler-rt-14.0.6-r1.ebuild 4247 BLAKE2B 53a61ea821f52d45691acce10f2aa6155606930796f142a18683b7259357ad770552de88d11115f9a97c77975c4866e2082fcfb770ad6ded5ec6d70393aabbc2 SHA512 bbfdc05c22f3750b0f8c9a84118b70beff97fc360c5c133ad58bdfe78762320cdbb0b170f6154eb5098bc9dc2ecb2643871c8ce85162c47235cf1408d5ef67e9
 EBUILD compiler-rt-15.0.7.ebuild 4259 BLAKE2B 2d7636f409dedb9bc78e77312355ca3859adbd108cb0d6001c2d9cab89b09847003d4148d013332ce93292678743a9b7197791d51048758d351292b8d53c833f SHA512 ebe6fbaaf6ff68d5f12f61f8e9d02608321b3e4db9ccf7be43e7a43de7c6600a1a506e48bf1468ca16b0d3ea894a5603b3f468a9ded7cbfa76145c7c8b8ec20e
@@ -13,4 +14,5 @@ EBUILD compiler-rt-16.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1b
 EBUILD compiler-rt-16.0.0_rc3.ebuild 4170 BLAKE2B 5c863321f73c784ae997fe46377fc6525ece43664cd41c8a8178aa764f820788c6b8072a99f0d79246721cbfdbba99cb06faacf93509246a94242af35f6820b7 SHA512 2eb75d0677db0d1ff130849651dae53c2f180a78e8103f012e4c4dc6d967db533b4457647221aa85a26adbb04c936ccbe18d5ad29a571554773049951e5b8de1
 EBUILD compiler-rt-17.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
 EBUILD compiler-rt-17.0.0_pre20230225.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
+EBUILD compiler-rt-17.0.0_pre20230304.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230304.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..2ed5fc860074
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230304.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS=""
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if ! test_compiler; then
+		local nolib_flags=( -nodefaultlibs -lc )
+
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -emain )
+
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 0cc58dbe84b4..8ece7c06b3c6 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -9,7 +9,7 @@ AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e9
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
 DIST freeipmi-1.6.10.tar.gz 3431062 BLAKE2B e217570d8fcf78ca9d04aad4d5bd46b4120beb21f2dcfb083bc9779a4541856e08ec6e87549651ee3c9b62fe54521585e192c784254dd9482bf9da09935853ae SHA512 90b6b78cdd119c2a1f332f007333aa6df70c6e3de0fd81ab007025392ee7cb7a01ab4a7a174d1f2e760c55d78f21ebbbe9667af661ccdd669e4b54edb1346937
 DIST freeipmi-1.6.9.tar.gz 3429566 BLAKE2B 68ee7bd27d459a25464e17d9c98370252d33961d10e69675505f046db26a95d780c114b4f90eeab43a39d0fca3d98b1f108c6d3ca9550fd9d3c455d2e9a79c6b SHA512 536add8dc01aa4d9df45e3499f8be1318185b19beb579c8f991a11ca973626d7e0aabe1d8760a9addadc418ea5c1e2b5432053e46ba94fd9078fb6dcabf48280
-EBUILD freeipmi-1.6.10-r1.ebuild 2990 BLAKE2B ef3c2d021f3c30347a67ae50f65a70fd3540b4e5198ea61270db0d22968d3718c6f96b0c84823170fab4cc60a71a4c653044deca8462dcfa2db530b1758ea6b0 SHA512 c07723c93e7ba288592c92c44eba1f642947281ac3f7f8f492b3fda444183f08448299532c285c5bd269fc6a2083f6836b7ee4dd3dcf4fe00c085563d21d3688
+EBUILD freeipmi-1.6.10-r1.ebuild 2988 BLAKE2B 93ef70d463f5953d4767d77dc0b5c86608e35467b88d82dc117f9d8c3fc2125e7a50b09af894d9dd05be191e5098f9aad0d55cafda4d674404360b61e1da01c0 SHA512 4ba941a27940b9c595dcc0e254afe4506987626def549610c188b806c2cbdce63820e0c47129c2f1e25862abd3ae6e9e33816560c54347697cbf12cd669bd872
 EBUILD freeipmi-1.6.10.ebuild 2600 BLAKE2B ff5893435ab4ea77d407d608194cee08ae23d3eb478b9f43cdff67a342c9cf79b3fc37a5a6b8e059606e5a39409f83a2e997d9c9e6d360484022839f224afa19 SHA512 f7d4686b8ab6b8a770c2d90e315dfa52b67a9d0acdf9e73e95abee33f5e8f615dbfeb1778b47c512c08cb65a6750a993c1947bbafbdd8457b845f41d10cc23e2
 EBUILD freeipmi-1.6.9.ebuild 2455 BLAKE2B 925c3025b4b87099a9a1c0c3c66504e18adbdddddd828b9c96171f59169c074e6f748961fa961a59aab3285da14a7f6883ee71bc022747ab97e328274602f4d3 SHA512 6086561f0620730d2c09ab4bfe8867bd2dc552891d69abef519da2d5ac8fdb8bea505adbfa85e3f3a369ac3d21b2fb7ea4a0419bcfb9194f6401860bc08602ab
 MISC metadata.xml 569 BLAKE2B 80068547ab42d075842e19f6ca65c9aa4b7c25aeddffc01a179e02fd6364804eefe3b7aa26434756de638f22a19da815d8b930a7d5bc81048e228ee72c81cd3a SHA512 f910ad6c63c49a2f2ddadc82c202cc9cf414eda5babdbe675048c6a5c2df4f093663ff8cf99da69563d4c67fa8bc0c18bfb9a8b8a752f8ce63bd1de8feed52e1
diff --git a/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild b/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild
index cc5e3e0cd78a..6f12a9a5d306 100644
--- a/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc64 x86"
 IUSE="debug nagios without-root"
 
 RDEPEND="dev-libs/libgcrypt:0="
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 70bc4abd7aea..81d2ab64cadd 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B b8f0793a4542a76b789ae6c3cfc392bdba7c8d033a6d41328cd32754af3affb663b87f8811cf53fcc3be9e2bcb9f8691a64bd613b26bfd8b5c99a9c11e9c57ee SHA512 d280604fe14e1488a1b9538ec7da100639024e34ed65c5efe11c7fd563073ded3655d302e61b1b657766ec2b3fc78d2192f905377b3f5d55fcf20ecba58262b3
 EBUILD libcxx-15.0.7-r1.ebuild 5306 BLAKE2B 346390544e06d0fac9c21e341ab97a40b51c6af8c0bfe33771e634a1b4f081fabbbe24a749572f2129adfd26c5e8992442775dd5bfc557cbf50988bacc510137 SHA512 4cc723ca0b09ebedd5c7caed4008c392c3843f93674f0a913c067c147c74b755061bc9cdbfd51037505f0d395353791237275382e6b321f8dc7a83b24a7c5e4d
@@ -14,4 +15,5 @@ EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52f
 EBUILD libcxx-16.0.0_rc3.ebuild 5244 BLAKE2B 293399fe1fc0f91f115697a27d265f422e1c9535e0cfad5087a3faa3a9660e4e4210acf61bb4863d9c3fb4899eb23d74ceb8d6103da405eed47cb9157a413305 SHA512 c7ec13ea1c4a6e867fce9971b6fcfc4ab4c862f36a67c8b0484ebfe7708f0455310b9475c581ac1d635344db2a544eedf5649b0633900b10000f1ee0e9f065b9
 EBUILD libcxx-17.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
 EBUILD libcxx-17.0.0_pre20230225.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
+EBUILD libcxx-17.0.0_pre20230304.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
 MISC metadata.xml 718 BLAKE2B 3cc1e43a6f1ada368cfc0bf8aaf49007f6792062b684ab9299b5180d778b158325b6931169b52dd14e85ae9ad6dc1a03be323b814fb920fe8434ad86425d699c SHA512 c2cef3e481c0c3db7de6de8c0a5aff42a1e7fe81155d99f1f0f0988f6d5ca041f787a27a2dde0073037d59e082e2f6da7eefe1303f1c1837ebc12e8e0d28729f
diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..4eeb65e55e83
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+clang +libcxxabi static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=dev-util/cmake-3.16
+		sys-devel/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index edf9235881f9..17ec31459d9f 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B 71c0a0a1765bdfcc6829d5ac3a1e260f541cb6a4a8b1557db6d6fd17d540dcaa85df21ddae645afd72a620f1b52c42dd8d8d18bb0983b853059f4d598c9ef6ae SHA512 c7a8b74eaf423d166ff5eb8fdd7e7a124c6c0caebdc4f22cd542c7f08e3eb3906e6c3c2a1895cebc74eaef07e90c47721965873888ee4c0a46a8be72bf5fe6ef
 EBUILD libcxxabi-15.0.7.ebuild 2909 BLAKE2B a1aafff6c1499a13f5301819477c822ad16c32442d47d1ca04e343c8a56a7936dc1c4a8e8c75394bf2d77adcd91cefb4264e5ff0e15212a2df703fab0b1631de SHA512 9cfa80c345874e87e0adfa96b2e9382252f8ab989eb651133531e0ab86f29ac759f0485f017703c344dd21cf35f063c410160106dbbed4ccf29562b1621bee20
@@ -11,4 +12,5 @@ EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255
 EBUILD libcxxabi-16.0.0_rc3.ebuild 2872 BLAKE2B 9a0dd0aa38b9e6229d49c96c4a7b97cfba583702c0fcd620cd570a9e2428b59ac0f1aa02153aba54c0a9187f07fd2ff85aec9e4df072d2f64f5af371c54a9b28 SHA512 85ad4be182dee73e514ed4d69ae6ad570c0854a79ed2d5660c86ed12f794ab6107564d6d46ee79933e3690f79a81bc573afa9cd194548dd9c68347bea4c79b17
 EBUILD libcxxabi-17.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
 EBUILD libcxxabi-17.0.0_pre20230225.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
+EBUILD libcxxabi-17.0.0_pre20230304.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230304.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..e5f19fc61a28
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230304.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+clang static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<sys-libs/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index d031ac948e13..f544f78bc182 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.7-r1.ebuild 3479 BLAKE2B 08a639fcea2739d837c5395fc079d1cbeea54fe171a5dd7a93f6f4364d5d69f4666bc7e219a674a89c6a3a5da8edffa51c118e44ed55e57a6330414eb220abae SHA512 49ba0ef8ee1cfe7b8acd56c855d381889dfe43aa701fb0d2dd13580d9497b971c35428fc1da7d4591fcbd179b60eaf0e202fd6f7ea1f9a65aa6d23f9c93a20a5
@@ -13,4 +14,5 @@ EBUILD libomp-16.0.0.9999.ebuild 3824 BLAKE2B a0499c87533e2595b61a93f35e94358465
 EBUILD libomp-16.0.0_rc3.ebuild 3830 BLAKE2B d49ba06265073089e66b4b03581e50db784d0574c8164df6f98603c05bdd85fe553c2e052108e1204b4b3b28f84e9fe6a92e46cae7c37cf2843fd8677abc19f1 SHA512 0b465e8a39fa6d625835d1b7937f39a78cc87c2f064c0c90b85f34525e049f4c5cebb6ac779d51bfd16827c874a22f19d244b43360164ff1c00ad13c0436676f
 EBUILD libomp-17.0.0.9999.ebuild 3824 BLAKE2B a0499c87533e2595b61a93f35e94358465031f90e73f658264ea8c4a2279a037754feea923666bd0837b266d3c29d5b5f0a68de75b04cbedbf24d088357ab6c7 SHA512 9828aafc10e4b4f49e1b793a8bbc9f74a1971c1dfb52985a0a3d231ffdd040a97e11749f41322df3eccea2c221929a354c921cd36e2b9afcca42ba539f07f71f
 EBUILD libomp-17.0.0_pre20230225.ebuild 3824 BLAKE2B a0499c87533e2595b61a93f35e94358465031f90e73f658264ea8c4a2279a037754feea923666bd0837b266d3c29d5b5f0a68de75b04cbedbf24d088357ab6c7 SHA512 9828aafc10e4b4f49e1b793a8bbc9f74a1971c1dfb52985a0a3d231ffdd040a97e11749f41322df3eccea2c221929a354c921cd36e2b9afcca42ba539f07f71f
+EBUILD libomp-17.0.0_pre20230304.ebuild 3824 BLAKE2B a0499c87533e2595b61a93f35e94358465031f90e73f658264ea8c4a2279a037754feea923666bd0837b266d3c29d5b5f0a68de75b04cbedbf24d088357ab6c7 SHA512 9828aafc10e4b4f49e1b793a8bbc9f74a1971c1dfb52985a0a3d231ffdd040a97e11749f41322df3eccea2c221929a354c921cd36e2b9afcca42ba539f07f71f
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild b/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..6bb50cb9edf9
--- /dev/null
+++ b/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="
+	debug gdb-plugin hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
+	)
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	offload? (
+		llvm_targets_AMDGPU? ( sys-devel/clang )
+		llvm_targets_NVPTX? ( sys-devel/clang )
+		virtual/pkgconfig
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		sys-devel/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local build_omptarget=OFF
+	# upstream disallows building libomptarget when sizeof(void*) != 8
+	if use offload &&
+		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
+		<<-EOF &>/dev/null
+			int test[sizeof(void *) == 8 ? 1 : -1];
+		EOF
+	then
+		build_omptarget=ON
+	fi
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	if [[ ${build_omptarget} == ON ]]; then
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
+			)
+		else
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index c735768d959c..54aa38ad41f9 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,6 +4,7 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
@@ -11,4 +12,5 @@ EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c
 EBUILD llvm-libunwind-16.0.0_rc3.ebuild 2984 BLAKE2B 89f6251c89eb54defcddf231cbc4c34005b5d0421e2886b2eebcc1a8f98f88271357e6efac8a46b8d4616912611bf7c935c7cd60b15a6b42f74e3bbedcd629a2 SHA512 d4b223d191f0d0bcd19805050e3e770dc7faf4e68031f329deb085bd1562d278e2eea3f040405526025711d6ac4b390497ecf329f4ab31a00c3edf53186cc2fd
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-17.0.0_pre20230225.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
+EBUILD llvm-libunwind-17.0.0_pre20230304.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230304.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..6ffa6c4f81b8
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230304.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+clang debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index cbaca04bd7bd..a214b6349225 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -2,5 +2,5 @@ AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659
 DIST OpenIPMI-2.0.32.tar.gz 3140147 BLAKE2B 7f5d3f9e4a5a8388413d1cfb7d1b8bb1a46abce8404b408d4e505bb389e6f871b6f6d67560bcba9a5716dfcf95c5d3c27bbaf4a5fd7b924a629aa4546efde0c1 SHA512 e409f32e6bbf26756338ada386fa394d48d734b4d6ba4beca700ce60bc3af3d0f41e972a328c4e076ae014f4fbd8598d05d3f879f9c6d76198e6ae1a2ba03e95
 DIST OpenIPMI-2.0.33.tar.gz 3141439 BLAKE2B 02634ac8e17abf6a95f37e1b6825fe1f493e1990d7a5b0f6e87f7d9527f2a778f9faf0b12566529a3c87ecce893346e5125c51da988b95fbb56145282194ed16 SHA512 615fccd1ffd4af18584c1b0e54667ba2de60b6d42b44e7448f27808114180fa3b31b4834276bdf69c3df1e5210df871fd888deec8186377524838390fe41e641
 EBUILD openipmi-2.0.32.ebuild 2297 BLAKE2B 21720e2b23db1c1f85c411c6ed0a53f07d84dc125d2561b6bbdc126782a52f534c9e973f9e9792161c7ba5a01b6fc14c0c35f684c21beb55268c1c1d7d99d805 SHA512 acab8c5ca72cc7c77112724d4c430212d2b49bb24a499b2d174399d81d45f506364e527c6b95a2d233db33ac5413d35aeffb02e6156e05f528ed0ba01cacfa78
-EBUILD openipmi-2.0.33.ebuild 2066 BLAKE2B 05dbacef4a6fdcccc67c0fa7bc3c411479f06e02dd3b08af2729cad21cad8f94865382cbdad0d3f2c76d2130b0e470a460ea3d0c0e5ec8d5b34a06ea5b8e6c32 SHA512 5eade09a5f6c3b0113754580416a561f87bd2f228bdefe25348660cbf748839ca6fdb5539345bae28f8c48be789e232fdd457b40916c716dd9ecf10971c41134
+EBUILD openipmi-2.0.33.ebuild 2065 BLAKE2B 0429d7edbaa0f4503b89229e512f3bdd508e901b4d36ed6c14d0601af278926c36ff3d3463139438c99fb966ba92fa0728f5e54a66ce540e64f4ba36149ee9ba SHA512 bea14c91cc139f370d86f113d6c697777b65f2247f958a0fef35f2677e422c3d05afb0a3bdd9726bb2946fef148da981882cb8b18edc30272a5a13b801910140
 MISC metadata.xml 348 BLAKE2B 845b9eadd51770ff89268871a3cbb7befb724efeaa28b891e510f34f3bb80b8c72f937505b31646440da9581fa37a38f6272b37f424e78b9ff5c832c255e9bfc SHA512 c13f3458e198f1d4da1cf5be846df5d2cc2ca3ef3fecd5959f7fed0979f10d0eff326da380793dc4471d64e622a415ca60b144b92bb2889a0f870e0c2767f917
diff --git a/sys-libs/openipmi/openipmi-2.0.33.ebuild b/sys-libs/openipmi/openipmi-2.0.33.ebuild
index ce1ff7518fdd..49b80b194dd9 100644
--- a/sys-libs/openipmi/openipmi-2.0.33.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.33.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv x86"
 IUSE="crypt snmp perl python static-libs tcl"
 
 RDEPEND="
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9b3700ab16fe..bc40a8ae1ec2 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 293157e76557..c782a8216010 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -9,5 +9,5 @@ DIST atop-2.7.1.tar.gz 248809 BLAKE2B 2cf1a68a7b24d76340295d9bde03a5602e9049a860
 DIST atop-2.8.1.tar.gz 264182 BLAKE2B 1764090d760cc8d75d193a077776a269eaa4ba997e8e5f064525d23f2005b92bb1b3f0903f2b1476f437db6a0dc698575e95b34e0fc9112d2ff6d06d3133ea78 SHA512 d748f374fb66d7ce33cebc5ce6899c3c0cc79dc394cb835466b21c7a4ec7c17cba255a3b04b36136c8c24c33ced0e5bd68f151ac804f6176547399e457976aaf
 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
 EBUILD atop-2.7.1-r1.ebuild 2410 BLAKE2B c18f5c29c904d586563459d392edbda0f6a67baf3a0b24f827a7b2cef97e2ff031c6ac1ff8070e7dec6ff0e6b490020affed5043cc387eeac34d8f7644649914 SHA512 8f302fa0d71d7e2cf3bb889c4ed1706fa3b66c84837994cf7b1fc7903870c6cb4cefc554b268890fb33ac1caacce1cd0a1d1fe5b50e6cbca6d2b36d0f34ea792
-EBUILD atop-2.8.1.ebuild 2453 BLAKE2B 8cfd8ae78bfa01dd1b76a3665e8fc2821e96c1132f25f6ae0072cd3488252c8ba80f591e5c318a0c3323a209bd927d7348c5de6db15611ac6e1d62fdef72ca3c SHA512 4412f26b4b53263dd8d9fcd81c24383d2b9853bb6e28ecd26c3bbc9c242686eeffeea8df88107378cfc7c8a64b43008c3365cde5a64519d05f6ea70f52adbd13
+EBUILD atop-2.8.1.ebuild 2452 BLAKE2B 9d98839b0195e7b3a2b092c990fc41d7e9e6768d02fbc4071ffa1479207db810fbd49e7110fc35321a94e15b6fa85c427e3fafe8d6c07ce9a7a15be3c221f9ef SHA512 fbf3321a917b84946c6b81849150f84ae8536ecabbb1971576d03d1d1e56fe1377dcb646a61924cbf6eb83e832d3bd5e43ff992285c5e9d6b2ed11a3a57e097b
 MISC metadata.xml 438 BLAKE2B 39c4d236c004f4b9856dd64ee810c64f41ec5097c259d2ee51d2e3c01b75d04aeb49d19f25bbb6aba131d4fc31fae9b2f4d3706cb1358ccdc95a4caca9967ca8 SHA512 7dfb13251330c915a8e8373f4f4a58113a5dac2a036e79d9ec9bc72c76ed7756f6706cb01c65b0f77458818485383199747fde1cd935b855e1c08c6f02e3c274
diff --git a/sys-process/atop/atop-2.8.1.ebuild b/sys-process/atop/atop-2.8.1.ebuild
index 744d07d3b7cc..0d634fd9bea4 100644
--- a/sys-process/atop/atop-2.8.1.ebuild
+++ b/sys-process/atop/atop-2.8.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
 # Module is GPL-2 as well
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-libs/ncurses:=
diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index 5d832477f136..c9995d325770 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -10,6 +10,6 @@ DIST numad-0.5-334278f.tar.bz2 21007 BLAKE2B f226e90e0ad664b0cccd82c060b21cc8b7c
 DIST numad-0.5_p20180531.tar.gz 29797 BLAKE2B 455feba97685b0f0c6dd8ce10227d397b14d51d6fc128805648dd94b627ae61c4889ea4cc17667b9a1953c5122d39972172e05d3e782a313ecedbe7f85bfce41 SHA512 36b0387369b7d23b28ad8b4bd8b27089c304efb8357ad9f6693ff3098c56a3a88e39b30f70d35688e6090f4917250fd40d1aaac084a91310450412a05b8d6746
 EBUILD numad-0.5-r3.ebuild 1135 BLAKE2B 84339d76f976cbe544f05194adebecad561c7a85886f9367d4487140b15e19ce5f1307bb8ab7a6d744f5784fb93a66bd01bdbab0b5d5fdbb348bad43920dbd94 SHA512 4d7827a7c3c051748d527a7e03576f243719ecdf3cd291ca5b1343bdb36c74a5dcd7524a986cf4cff1213277ebb2f1e19132429d9ece41d581d18f3f1b01197c
 EBUILD numad-0.5-r4.ebuild 1176 BLAKE2B 945aed6353b8fcb0b4c0e146295c8ae7fca184159accce1ee421c71b3870c58af3bea59dafa99172ac2dd6ad3e44e75af1200dcde6a492f911ae428e82723f68 SHA512 e865c8dde6b328540b7f2d4ae10ae7897abf5193b57faea37a3afeac188b9f7c360d495ae1fba21f1435316b7312c2bc0871841dfc7c48903cf48a235f7cd42d
-EBUILD numad-0.5_p20180531-r1.ebuild 1524 BLAKE2B 23370bf24c3bf433f52523528e7f4fbc28f85b6edcf7a33da71a231a59422ebc12cefb7db08a417d168afffb5cbdf563d0e0bcd99eab4f4fafa2f9a709808cd1 SHA512 74d61cf5f71aba4e73408da24ad66ddd378c0c99a3a90e921cb07500ada83123d60dc331d6a8437cca94d59236c8cbb5255897cf53dddac52eb2e2a9f2239b07
+EBUILD numad-0.5_p20180531-r1.ebuild 1526 BLAKE2B 9383ff72e18922a6e5b738706442f4a781611f0b0eb5e48c271682a86ab085bb30eece7361387eb4d19aebaa7dcc230599db323659c5954ad3e852ffc6d3fc23 SHA512 3068feb1646537a397ab42811a633223b40e59ae073658b2038ceaf2a1025e11a19fbf8f56ccf63f0a2851789e738a292b7a5c35932a2dff299b310cd89a6b4d
 EBUILD numad-9999.ebuild 1290 BLAKE2B c5a669b3c7f990ecc53c901c41a748c6e77cabd4b284a08fa7692dac20cc608383b8cbec7a7174fe36c79b8ed35d407ed436634ea1be5896aeeafaeeba869a74 SHA512 0b44f8a664bdb5af054e9ff5712884a6905cd4e6b1bc58869e134c551248920e0924fbd5281cbbacd2dd64c22854583daa1e2e6b2b366181786b43d5a3ec1d90
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-process/numad/numad-0.5_p20180531-r1.ebuild b/sys-process/numad/numad-0.5_p20180531-r1.ebuild
index 87bc6f0fdacb..229cae6f6556 100644
--- a/sys-process/numad/numad-0.5_p20180531-r1.ebuild
+++ b/sys-process/numad/numad-0.5_p20180531-r1.ebuild
@@ -14,7 +14,7 @@ else
 	# git archive --format=tar.gz --prefix="${P}/" -o ${P}.tar.gz ${EGIT_COMMIT}
 	EGIT_COMMIT="d696d6c413c5b47b4bbae79e29ea132e52095af3"
 	SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
-	KEYWORDS="~amd64 -arm arm64 ~ppc64 ~s390 x86"
+	KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
 fi
 
 DESCRIPTION="The NUMA daemon that manages application locality"
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index db9b1eb5c171..a5e98bc2fd0e 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -5,5 +5,5 @@ DIST psmisc-23.5.tar.xz 394012 BLAKE2B 258b82c9fff3765f33cdcd4150489b3e585a47b90
 DIST psmisc-23.6.tar.xz 424736 BLAKE2B 468bf4e84695efcedb832f890b6201b7bc4aca7c5aabaf30e67f4471671421897ee7cd67f01d4b3d60c3e1c63752eb7384e627e75fa7db290cd749da08e2f788 SHA512 4daffbd1726e50d9344f8578dd4c10f0b8f7971929ec667490de31122e5f3828747e1bafb3ed3c37ed7e1758ab9ec43b8f4556b676a416a8efbc7c6c88b6985d
 EBUILD psmisc-23.4-r1.ebuild 1889 BLAKE2B 59779553f91f16b8dec506c1309b5480985cd739ae1c0a1d569b52cb3402bb1d94b7869f990fdfd396ac341022461f1043ce383903b95c599397a5343e3f85e1 SHA512 eb829e935c7cb7d5a9ca96cbccd26eb6703d0ea224ffd4713db925078cdc141bc110ad3f21becfa33663c3ef1627ca6550fe7ef4e0e4c723d74f1cc4bcb1eb52
 EBUILD psmisc-23.5.ebuild 1955 BLAKE2B 07f8a1a716c076d8dc58045cbe58969e29c87cfc95222dadc6273a90abd9675a4cfb0fa11d727c9dec1187d85ef2781af07c895175977d9309b1abf581a6d37b SHA512 ef032b48b8f8d82d1d157127b94300a6a8e65d3dfbccaded56fe3b7fe79170d62b3ff3930f4835e4c5abba7cb428d1e21557e69da15816504891318a2b7578da
-EBUILD psmisc-23.6.ebuild 1916 BLAKE2B e8d93d143b6190d68e9c00248408f7b9b591def3a898f6ab193486414784b0501df5a35386e59b4adc7f9abe643de3dfca8e36cc3ceb993298e11915ecce73ce SHA512 9314464fb8216a1eec37221a92f02e8db3fdb217fae9c2d4165f62739509122091e70de89dc75801cdc7746878cb79c2e96549267e820ae6f67af9ac73011604
+EBUILD psmisc-23.6.ebuild 1915 BLAKE2B d313a0455950cc46d84ae0bb33779772b3b01bfb992cc041962565ecdd32d0f0bdada201bfc81fc3fb4f79b3fdb8f32cc4bee5863abfa3408aca984d05f89165 SHA512 f07859a2c022a9dceb607122b8396e9fe5ee0ae73edf58d3b561da2795519cd403141da3bbc3531ce7f2d086c608cc9fbeed9fef0c94e06976f0703fb4e39b75
 MISC metadata.xml 387 BLAKE2B 86be283c90e1b90bd40313187a4caa0ec871807fe1045649f2bff8934ee9537a348ee096a63ed2cfb2991724bf79e8dc7dd65d5cb4812216bbd10ebf5e400a71 SHA512 8594d6e68c03adf48e92947d47a3b477768fd296d8db62cfcae8982dcc872e947780bfdb11a4f3b1658b00928eccd2d7b58b03eea388c51806a45ae47e8c59d5
diff --git a/sys-process/psmisc/psmisc-23.6.ebuild b/sys-process/psmisc/psmisc-23.6.ebuild
index 56a11858313f..82c5fb80f3aa 100644
--- a/sys-process/psmisc/psmisc-23.6.ebuild
+++ b/sys-process/psmisc/psmisc-23.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="apparmor nls selinux test X"
 RESTRICT="!test? ( test )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 97dfd4c02bd0..ef9ec66a8359 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 4c4cc17d6304..60e534862eec 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -2,7 +2,7 @@ AUX qutebrowser-2.5.2-dictcli.patch 589 BLAKE2B 1ad904d36935acc28dc9c6f871d0dab2
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
 DIST qutebrowser-2.5.3.tar.gz 6117665 BLAKE2B 3fc1304e4a4343d9a3bdfbf6ac708305a283da2217938dfe2b0f5e049d3a100bc255e0f06807e98c12e095f25dce4d5ed22705a5ae6674cff2f8ffcb0c5afab8 SHA512 a53db1a842b59613115d0823ce9b7d8ea703c6db8882250a587f4c7042a52b7ba93e9f516cfae1804e2f10ad369b0ab8f9d613092a9ca4be86e113c4ed4be7d9
 EBUILD qutebrowser-2.5.2-r1.ebuild 4441 BLAKE2B c86a459181c039d78ace97598690d6ea373bc33c6964f187bc98de45a12e807d909e17ecc4506258400f155b230d0f225d6519fe79cc524f74d810a8280e0e96 SHA512 2eec0e64b15604e11f1193fa0af5ce576a1f620db6d916f401fd3257993545c436aa4194ca5184027d84515bf02de29c557ade250e69d13b7c13bef9057a5d4d
-EBUILD qutebrowser-2.5.3.ebuild 4630 BLAKE2B 9c67f8771da3a75d497bbc5a4df689f1b964f46dcb2272e768860e5c2ec87ad53b3ddd9eca41f9e51f6da4fea1141fc928638bf83eba5320c20e194056630c05 SHA512 13d47b1a5340c0017a3f1959195efecd2ad96f17593fc74a1e8b73f296f021b70385a5b5bfe14431cec9b93cf9080874f4dd9dd330fff688e5a053d7714eea94
-EBUILD qutebrowser-3.0.0_pre9999.ebuild 6337 BLAKE2B 0e60e5064c85be840e7d0d64472d5781f9ee378a56ebc80d28bfa86be84bc026e6bf8d3dc354008bc5ab013644e394ee9bc73e8f6f81d40f7a973dac4f339eb5 SHA512 beaee232c67e3549094d4b6ca26225e81871a291fceca45f9518217c8435c971bb29298120982f4890aa4a61e712919da771cd11a4a03e4393ad50c2d47565d9
-EBUILD qutebrowser-9999.ebuild 4630 BLAKE2B 9c67f8771da3a75d497bbc5a4df689f1b964f46dcb2272e768860e5c2ec87ad53b3ddd9eca41f9e51f6da4fea1141fc928638bf83eba5320c20e194056630c05 SHA512 13d47b1a5340c0017a3f1959195efecd2ad96f17593fc74a1e8b73f296f021b70385a5b5bfe14431cec9b93cf9080874f4dd9dd330fff688e5a053d7714eea94
+EBUILD qutebrowser-2.5.3.ebuild 4682 BLAKE2B 69af583c7cd166a38596b07c0dcf10d0f08f3c3c91dcc9ddb567fcd59d8ba6565fdd73ed997b930d403082c8fd6cd9077551fe5cf05cdf980dd5974922fd3ee4 SHA512 ef3643aff5e808a5b9dd2162fec22c83d2a4a0abd6eadf86aa6b869b5c0ae3aa86a5842811ade384bec83ebdde74724ffb5ba7dcd06c3f74fa1f5623380f94f6
+EBUILD qutebrowser-3.0.0_pre9999.ebuild 6389 BLAKE2B 29250258b198b33fb66317f313240b8b9d2e93f2ce4a95b1ec706f183d4377bd6ee2da8ae1aa316ebc4b93e2061ac4ca409931c5e5219c928eb6a40c28421956 SHA512 118d68ed62cb1d68c201e858d5a420a0a75b19c7f59aef2094bade2da14739cc25933807a6d4c12211780430d1a5b96be09f8962ae75bc9d25aa668fdec5ecf2
+EBUILD qutebrowser-9999.ebuild 4682 BLAKE2B 69af583c7cd166a38596b07c0dcf10d0f08f3c3c91dcc9ddb567fcd59d8ba6565fdd73ed997b930d403082c8fd6cd9077551fe5cf05cdf980dd5974922fd3ee4 SHA512 ef3643aff5e808a5b9dd2162fec22c83d2a4a0abd6eadf86aa6b869b5c0ae3aa86a5842811ade384bec83ebdde74724ffb5ba7dcd06c3f74fa1f5623380f94f6
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
index 7cb5d6ee3504..6260bb8c6fc8 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -128,6 +128,9 @@ python_install_all() {
 	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
+	insinto /etc/apparmor.d
+	doins -r misc/apparmor/.
+
 	einstalldocs
 }
 
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index 0de37e2649d8..7a65a374061c 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -146,6 +146,9 @@ python_install_all() {
 	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
+	insinto /etc/apparmor.d
+	doins -r misc/apparmor/.
+
 	einstalldocs
 }
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 7cb5d6ee3504..6260bb8c6fc8 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -128,6 +128,9 @@ python_install_all() {
 	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
+	insinto /etc/apparmor.d
+	doins -r misc/apparmor/.
+
 	einstalldocs
 }
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d8cda8725149..42a4e9ea9e36 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e4bcbdb53c52..c357a18787ba 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -11,12 +11,12 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
-DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B debc363395becd96a856a03ffd5846e786c27781318b9c08c428498a010dc77e334e6fd15ffea1545dc15b1c226fdd73f24d15f70361b39d37316c48a0c5e66e SHA512 54df5784fbbe9c29b5569783c836e1490a6c08610ffe3c98123cc8bee8b483fcb73f46a15487dc5a6c9c7926ba63bab79e1794b07c00c22798ea0984e56f12f5
-DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6 SHA512 51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
+DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
+DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
 DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
-DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B b57a203fb2e215f0a07485d5ae70398e0e2d56b37cd7172f33680c8b57faa97929904349ee93b3d975cb24ac2c9e2d15240d59d4a3295d0a7deb96b8069269ef SHA512 fbc57d314fb8885e9986a26515b6536f2bffdb3476af71417eb9dab1623f36ea80da431bc1dc8874aa99dd6575919a0d3a828d84a87404a73ed22de601097e12
-DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235 SHA512 85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
+DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
+DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
@@ -26,9 +26,9 @@ DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
 EBUILD tomcat-10.1.5.ebuild 6535 BLAKE2B 5af622a02ce2b9efcbba0949dd617ae1c2b53155765d164f26a6172097f1b67f9605132804f4370788e4a8ea39f6b9e5e8d03956bc0a14fb4ff263bbb41f333a SHA512 f64bd088116ce2ffe04b3c53f98872ce5cf580b90351272b4751be52658c9995c2be636497e2a54c8f77ac15d2341ce1fcedf245e6a66bf42e323af20bd90f71
-EBUILD tomcat-10.1.6.ebuild 5783 BLAKE2B 5300d363f89d12e35da7b0fffab29e01d92e84998af99fd57f08472002d1bbdc3bd2ce26813c7001d4a32b3fd86f6d9ffaf65a5de90fac364b3fb28e95e39acc SHA512 f09246b33310d1f69040134c231d9be84953060ac6901ae37a1303396b9a803286cadc16fa1fd443c5ff22ecfd0371aa419b65b47b9cb982c14e33c7226acd13
+EBUILD tomcat-10.1.7.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
 EBUILD tomcat-8.5.85.ebuild 5433 BLAKE2B 23d065fe01d845eea65eb05b826d84423e9e90fe9bc19077f0fe84765e3bf37ca0b1996276effdc701a8b7a87f23fadb322eb93d26cd65112128499172d48918 SHA512 d3e1cd656754f5e2bd02fba376c08ad2fdcae4aea6235c973cf525a59fe0436c2e20e47bf10503898ae3e1cd16f1673e310739d40af155ff5393d93cdc36f601
-EBUILD tomcat-8.5.86.ebuild 4646 BLAKE2B 237aebb86a0e312b7532560919cb7f776193006ea2579d56ffa7f0f30227593d24aa612c8024c124dd474e81bc6bd15f5bbd632a6bcfa8d58e0075bcb0cfb65d SHA512 d8bb2566960bcc3bad739170a5d7b70a305bf72a558e657da4dd06a88a08ee6740228dec14f374510bd6b68d4b9e231489c0ca4dffb45334e524c4247b4d1317
+EBUILD tomcat-8.5.87.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
 EBUILD tomcat-9.0.71-r1.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766
-EBUILD tomcat-9.0.73.ebuild 5674 BLAKE2B f761a20ce3dc21024b5ff0df6cf4a4e2cff84ebe6517ac5279a0f15ac98a9178068abc2d6441f5e4e8b2cec28cc111ef070384d8c58a6991c863a9f8556ef0d3 SHA512 798ea957cd803b4c0b0003c5694f92ec1ce4788e1fd620a7891143df3ea967708771098b2be66c2146be0d7724f1279f154cf39c459d52cad8f2ad150abe9515
+EBUILD tomcat-9.0.73.ebuild 5666 BLAKE2B 203fe318dfca6ce7d3d0ef6a5466f42296379ceeed332fe9f0d51c0e89ab118f3004da430d818acd35b10bddcc7b281a7725b072284bbaaeb0b882f32dbec9e6 SHA512 c4f1936a987e8e340c4ff34628cb6c84bffc1ed822a7a9a6f3707d86556e489163a2a6f46d80083aab87eff9cf4b2a88fc11b7e915b228e3f54b82f09becd05b
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.7.ebuild
index 17af3cdb9074..a2d0614c3733 100644
--- a/www-servers/tomcat/tomcat-10.1.6.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.7.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEP}
 BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
 
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
 S=${WORKDIR}/${MY_P}
 
 BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -75,8 +77,6 @@ src_prepare() {
 
 	find -name '*.jar' -type f -delete -print || die
 
-	eapply "${FILESDIR}/${PN}-10.1.6-build.xml.patch"
-
 	local vm_version="$(java-config -g PROVIDES_VERSION)"
 
 	# For use of catalina.sh in netbeans
diff --git a/www-servers/tomcat/tomcat-8.5.86.ebuild b/www-servers/tomcat/tomcat-8.5.87.ebuild
index e1506972d167..6f5f1a7f9687 100644
--- a/www-servers/tomcat/tomcat-8.5.86.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.87.ebuild
@@ -47,6 +47,8 @@ DEPEND="${COMMON_DEP}
 BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
 
+PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -54,8 +56,6 @@ src_prepare() {
 
 	find -name '*.jar' -type f -delete -print || die
 
-	eapply "${FILESDIR}/${PN}-8.5.86-build.xml.patch"
-
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
 		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
diff --git a/www-servers/tomcat/tomcat-9.0.73.ebuild b/www-servers/tomcat/tomcat-9.0.73.ebuild
index 106615a65169..3a87d1e05600 100644
--- a/www-servers/tomcat/tomcat-9.0.73.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.73.ebuild
@@ -57,6 +57,7 @@ S=${WORKDIR}/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
 )
 
 BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -81,8 +82,6 @@ src_prepare() {
 
 	find -name '*.jar' -type f -delete -print || die
 
-	eapply "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
 		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index c63356fa9a0d..940e3e99cc10 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
index cf0ce8a9ef25..ec6a05f3d8a1 100644
--- a/x11-apps/beforelight/Manifest
+++ b/x11-apps/beforelight/Manifest
@@ -1,5 +1,5 @@
 DIST beforelight-1.0.5.tar.bz2 119358 BLAKE2B ff4a0e0a28d3cc668611eaea8b181696986f92eb7236b336218d0392484738788db9c16e0eb6d16a106ba3b30d094be082c12da22c058a5a0afeeb76fcddb76e SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968
 DIST beforelight-1.0.6.tar.xz 117904 BLAKE2B 8a18018f8de72bbd1364ed6eb30dd1dd2f373b8ca644f5b5965a6f296e61ac6d19c8a2d03fcaa8774719cb01d24ed68dc2866ea64dd2377c02d74f84372c417f SHA512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a
 EBUILD beforelight-1.0.5.ebuild 350 BLAKE2B d040ffe429292a2dd3d2a8de80b61fe796d09a712cdb80c6855cfc6465518040ed58f59835b3f7f960ebca883241602d21056ba1da80ab25cf435cb767df81cf SHA512 decfd65ced327c8959eb3fd71bdb9366e2266639cd9413e2c055c148dbaa65d9d37ab70f57979e168b15745712c1c28b18dfac25973232fcd1ec9bb1dc323085
-EBUILD beforelight-1.0.6.ebuild 396 BLAKE2B 90506c8af82574d1b7af17fb97e3cd56550ed80cd3bbf86c38030262c3b6e424b75785a5c0ada9358de7b3f60a9cda421a8d2cc8513c9533da5edd0928dc362d SHA512 3a225ce7d6ebcc933f63fc5b8402079c3ef8367b1d4f833ed2bffd9445dab96e848b1d746dfa42430652d93b90e6af10936f531d77d1b473434914e8188a82ff
+EBUILD beforelight-1.0.6.ebuild 395 BLAKE2B f07875dd389525f963077b91f815fd274ea77764d57d4a64daf4f1ec795b0ea83606d02410753b824dbbc11091a7cbbb61fb7d0227df7b90a1a7e4d1b62fbd1b SHA512 37ea3ba968268cf727b32bcd1fa819eb658a910c0b7dd7d48b87b8bbafdb4bd426c66b050f7cc7f7b7fad0740ab9edf23befde208b6887685af36910e9a5ccd6
 MISC metadata.xml 342 BLAKE2B 966dfb531c687811c5b0ba8fcac966ec9865150c8196b3ea7e88608f5403904bdc1a444b1e40a5bbf4dc31ada5b063d92277c79833a6ab92767101b83897fa3f SHA512 fc1a692b8dfe2ec4fbfe95150b9de582904382ccb72d1cdda536e9611692a7777ba5afab81870e52628111c5d7b1cfa6b2280da44ab79639fa1b54d280211f9e
diff --git a/x11-apps/beforelight/beforelight-1.0.6.ebuild b/x11-apps/beforelight/beforelight-1.0.6.ebuild
index aa47d6e393ae..5815ee4a9044 100644
--- a/x11-apps/beforelight/beforelight-1.0.6.ebuild
+++ b/x11-apps/beforelight/beforelight-1.0.6.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Sample implementation of screen saver"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 11a3a70b6496..90cde2e048f6 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
 DIST xdriinfo-1.0.7.tar.xz 118268 BLAKE2B 94a75f2933d0c402e345bfc7054e0dd240f1dd43f805b9bc1970a00f6a500b110e3988afb7d5a466dfda8dcca504b14d33c4d257afe7df22ed10b1c4b190627e SHA512 a368cf32c606ca78f3a23bc5d88fb57b9c1a3827d0fec3e48cee153703135e47cecd3db8ee0eba93f309d7f03b4306c3f2e7f46f36d0d2970671c5e5b78093ad
 EBUILD xdriinfo-1.0.6-r1.ebuild 480 BLAKE2B 553b81501c2bf928a4837923adbc08c5f2a84dcef96f6f9a669f2926eb9faf6040e7f88fc44713b9822327a542436dddbfe98a116aa863f80bc56c2d0cf1c6fb SHA512 0b889ae57d58545eb64c5394d62bca794d1f0bcab2510e7383b0386ef6b00d261d9c39e9481d1a74d2313fa4d4dd3c092277e2a1f5bb443097c7c3b9ef6d48e5
-EBUILD xdriinfo-1.0.7.ebuild 382 BLAKE2B 4a62147b5bbca20472034fb04a738e853d3bf71ccfdd27ef1212c54fcdd2731acbb737e3b273bd928b4f361fc638a5a1c75aa82a9b3c7a513e3d733f8406b0ab SHA512 29623357e9b7ed82043c03ba0ccc1a7012bf96a038a525b0f11e9dd26acc50c0106305846fdb274f11aaaaf2a51abd78f38315d70e411b0e8499a6198be8687a
+EBUILD xdriinfo-1.0.7.ebuild 381 BLAKE2B aaea4790b8bba2097746a7393476be2cd89f9bf8332e4d8e1d7250a6e30fd59329f9cc5942be094f573104f514174473346cff814c0fa51c2bc27fbc20cb816d SHA512 466bad6cf38775bbb502fdf6f25522f38ebbc979df8089208dc9172567596a11e134b2a6277ec3d56e3942a8b1645bab5af1fbd7b05d408ad95b95bfbaae94e8
 MISC metadata.xml 339 BLAKE2B b50c8b4dbad6bdc10517bda65ceaedb3b7ec28211c3b5143179f3333c7978a7d8c4b7d96b32d94e8210f6bdfdb5b8048b370a84306cb01d115bb18fe341fa07e SHA512 f0ddfb4a422eb889c8acc20c574ce65d8fc67a3f81f263618f4c9423dd226198e8e354dd6cda4dce3b19ac410165290fb080d7b4206b56058a8dcda407534f04
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
index 42354f7d0c52..ad7db01d0ef0 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="query configuration information of DRI drivers"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index d6f86218a70a..bbaef7ed4919 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,5 +1,5 @@
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
 DIST xvidtune-1.0.4.tar.xz 130156 BLAKE2B d75bc940c9dc98769ac162aaa9f6d833952bf7a86166f76e219cfa14127acd7249fd22a4800efb56a7a2cc3e73d413cdaaabbb8250c275d1065780541fe49365 SHA512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80
 EBUILD xvidtune-1.0.3.ebuild 386 BLAKE2B 858f831f8df36b1983727f6993f323f85587eaa90da7cbb350a07deadb1e549a34a587443415564e4d9240a08f06a5c5c013b0779f42c03ac83604002ec6648c SHA512 55a34bcf54a065d8feb59897d11268f23414cc01db104798fa78befaa2464eb01a74a62b70505e7c3182b45a6edb77753339ed3b2b09d522e86ea1445b4e56f0
-EBUILD xvidtune-1.0.4.ebuild 410 BLAKE2B fb196b6ae5db9f2450c4f57c00eca6c0fb36370a95ce70d1c4458dc2484c7531d09b1ff864b425b523ea4db3c0417b71eaf5573654946cad49a3d9ab402a7fb0 SHA512 f22c0e09e624ba96d674ff19738e07522e2baa5ab0544166070db81e7084786f823f90d39ee619aafa199f984d95b3405e4cfe6d2a859096888e96d800d886ea
+EBUILD xvidtune-1.0.4.ebuild 409 BLAKE2B 92c1a8aa56a5aac6d8fdbbe2579e0d9d9aea95bad2bd722358f1f4f2b361a91703546bed704c9d5ad31540a1df8e249adb9f948569b7aa29653d570434fa4f7b SHA512 16c094c4062abbb1bf8af1eca822c5a44e9e0c86a4880a25ae5c50ab3cb577dd87e8373c60980d94625d6d9d61f79ff2e6a33409247cb3d86519f8bbdaabfa43
 MISC metadata.xml 339 BLAKE2B 91660a2ed0a5e6c3d87d3576bb25f94d0b72eb7829bf7ad8e8ae78b58007ddbab064b5d58b3c3a48d6058ea35f52c223a657b475369960c9786d03302a496cfd SHA512 6942dc3d60991039fe66f6004afef10f6d4d314ed8cea9ac51177e4853719821deb6bd75bd3ba1282a87afc4aebfc339a430120ece67b84f5f27865accf4cb77
diff --git a/x11-apps/xvidtune/xvidtune-1.0.4.ebuild b/x11-apps/xvidtune/xvidtune-1.0.4.ebuild
index a25169ba359e..a0be43b09355 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.4.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.4.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="video mode tuner for Xorg"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index a0ad9373bd6c..b7d38d10ad13 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-apps/Manifest b/x11-base/xorg-apps/Manifest
index 6120a67910e6..2a45b63013fa 100644
--- a/x11-base/xorg-apps/Manifest
+++ b/x11-base/xorg-apps/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-apps-1.ebuild 1670 BLAKE2B b7e92f9faa70d788c4f0e23d2c55ec9ef8831fd8a42d6240bb5d7f6e4e1a3ab47d190bebeb83827372040d172afef0acad6532a123ea36521846f50fcae51e9c SHA512 0e4c9c427671310d97f5017336775019c634fd7cc4458f2da5fb391f4234e340a9be69839b2cbcb7ecf88370b1dab18b75167e41d255d0827527474c4ef742d0
+EBUILD xorg-apps-2.ebuild 1632 BLAKE2B d98e352594b6ca6571cce79f86e11ae1a8fc400933683661af07e4554a6659d53958891b9320214ea603e3877d6da8ac77ddfa36fcd493811548ba7e6e539093 SHA512 2feeacde2051735e955c4c2abf0f22cc7332665ccfdc5a0ab917e0c4b7143801fe969c1586a9c4cf7e511ef69aae38fdd2a07f269b82ce84da6fd78d2b3ea063
 MISC metadata.xml 254 BLAKE2B a094e5e3c48db08be99b25c1f6529f16b65b1709d3d0d2b9235443c78fbaa0a66d4cd3d3ceef540c79889768c7743ce296b97ca2b57c1282f6b1e760257342e1 SHA512 8b33da34d0fa3f53d38e43f1e9e4fae36631c0da0c137dbba09e27f7570f975919383065f6bf3e85dee06b21daafbd6d623c39fc5f7fdf2e8816333d170c7bf1
diff --git a/x11-base/xorg-apps/xorg-apps-1.ebuild b/x11-base/xorg-apps/xorg-apps-2.ebuild
index 32c0da10b43c..c39251620ce3 100644
--- a/x11-base/xorg-apps/xorg-apps-1.ebuild
+++ b/x11-base/xorg-apps/xorg-apps-2.ebuild
@@ -44,7 +44,6 @@ RDEPEND="
 	x11-apps/xcmsdb
 	x11-apps/xconsole
 	x11-apps/xcursorgen
-	x11-apps/xdbedizzy
 	x11-apps/xditview
 	x11-apps/xdm
 	x11-apps/xdpyinfo
@@ -52,7 +51,6 @@ RDEPEND="
 	x11-apps/xedit
 	x11-apps/xev
 	x11-apps/xeyes
-	x11-apps/xf86dga
 	x11-apps/xfd
 	x11-apps/xfontsel
 	x11-apps/xgamma
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index fabcb53ff8a1..92fe6f490408 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index ebbee04de0e0..26083086d249 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,6 +1,6 @@
 DIST xf86-video-amdgpu-22.0.0.tar.xz 376956 BLAKE2B 30936b45cce499791272e9194d5180c208e5159d1b3643ce6f261b2e92a30127a55096cdb07391cb4e91b9b47bbc9a4c5673ee66bdca5cd6f86fc74c7e3d6077 SHA512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a
 DIST xf86-video-amdgpu-23.0.0.tar.xz 381268 BLAKE2B f2d6c4e3548d4a5befb3f24d2a73924522ad111d85be4cd8520987d16b24de4ca80a22159f52d1f5cef3812628f14070dd62e013ab07603e053865a5975c8ab4 SHA512 bf26f147629a34e84a0ae8435119e170b9c95edafcab1995b63bb8f55abef32f2efbf4536eb070e64b2ae1460424b1b27a4206cb9836d33ddc6dfbee404f718b
 EBUILD xf86-video-amdgpu-22.0.0.ebuild 593 BLAKE2B 881696e3cf2213c0a9712b9d03a92ef9da03f15bb2610a308a662c3bec991f44650367b2012e63f6b338ceed39a88aebd60f6b9cc7e84b7083da1bc5a2e497ca SHA512 febfb8903f9d5ecdac50496425944c09d3288430c80b58e673bce337ab0a9e903554d070bfb26fcf36dce92d364ad9c8e6214edb8c9040ae60d12e8a987b23e7
-EBUILD xf86-video-amdgpu-23.0.0.ebuild 596 BLAKE2B 9f36f128237c9591fd5fccb59d488130ca77973ed1b3d3f61fe4993d9d92164b11b8acfd073dafe5e14d1718de24a2dfd313ab51e1f6a3c2069c36ee374e292f SHA512 2838f9b8d8147d76f41ea34c6878b45ee93add44d5ba80fe35af38b2baaa99eb8239527a3230ec4fa6a1407b9bebda07455e0f6725db42714caff547925d99b3
-EBUILD xf86-video-amdgpu-9999.ebuild 596 BLAKE2B 9f36f128237c9591fd5fccb59d488130ca77973ed1b3d3f61fe4993d9d92164b11b8acfd073dafe5e14d1718de24a2dfd313ab51e1f6a3c2069c36ee374e292f SHA512 2838f9b8d8147d76f41ea34c6878b45ee93add44d5ba80fe35af38b2baaa99eb8239527a3230ec4fa6a1407b9bebda07455e0f6725db42714caff547925d99b3
+EBUILD xf86-video-amdgpu-23.0.0.ebuild 602 BLAKE2B 95bdec96e3e7a5aaf85f253222c6341b36acf62add1a3c10c6ab1938c84695a5122aa4541d64f81b79978a666a8fb5f2b889224a98f9b264e0d136cd6e4e1a09 SHA512 92311a92b5186d5e9686ca9e2e356135cefdc3c9481285b8b4611b72427dc1ef97b8b8eb01fe3e10a4b5ed6cea751722eac0992f85647ae3acea6540924ebb4a
+EBUILD xf86-video-amdgpu-9999.ebuild 603 BLAKE2B e48c7e29aa1b3d9a54213a3f22c32188e506d5759268578d098590c262e4df71d51e4dd49135c6a5d9ffd4e17acae2b70bccea23a9b7f28c6680eb4f7a635d85 SHA512 1f103b769b094662d2f1176e8945cb73e862b4a5d1a95566ff83757cbd416b122670a7e33b2dc678524e802a818b218b3e14172133f3e7f5a66220c48eb85c64
 MISC metadata.xml 351 BLAKE2B 033ff5bc10c9e94cac69c1861cc07491b59a8d9693b3978ca11d4f7666e6e7655470fbcb73a92558483e07e3595ed6db70b79c95c0b54228af62c5e71413c531 SHA512 c2288ab36d82c2e2db95c4e8ec5c39630ad93d9ca5b06f3413f1c6d87a93a5785b04e1a3bdad07ae43ca821a1df7351221edf5942e8d65117c154ee106a8465b
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
index b7b71ddc8524..2c3c8374a7f2 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index b7b71ddc8524..be87b71005b9 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index d75a949d666e..bbf3ddd7bf5a 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,6 +1,6 @@
 AUX xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch 991 BLAKE2B 30fab6591259a5fa2eeb917543b5ac91c632d9e21bb5271662f36619513582c26a8a4797e2b20491dbe1c384ca81098f3f5ef10ef4a673cc2442b0e4739dc47c SHA512 4022480caca968578ba62ac2a439b21f335b779e326df7d1838b3276e988dd3675bd225921beed08995f0a95df6989588bd673ab11828d0eb3a7132fc9271569
 AUX xf86-video-ati-19.1.0-xserver-21-build-fixes.patch 14203 BLAKE2B 20cbd16568b8e5b32e8cd806db689cc8ce6c18e3749030dc5d107e735f208303583359aec581f4e44cf525b9ff0ae1088466790eb517d12f39b670d137026fc9 SHA512 c0c77c571cfd4a18ca4363fe52c8a188281a7be533a41fbd4265d30b0098442a0626aa5af0e8d8c60c89157b4dff6a60262eb0ba5ff0cee8e79703287ea0aa87
 DIST xf86-video-ati-19.1.0.tar.bz2 904558 BLAKE2B 424e8b3c6fa14fa4f0bc00940bdf1008400f25ce7103b13ecefdbda9e629239c5ab011952d19c305251e9c0008650da3db0eb91055d5585e2b1c3dd108a74d86 SHA512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
-EBUILD xf86-video-ati-19.1.0-r1.ebuild 1039 BLAKE2B fa50fa1a2fe61fb66ea2314f70acf4e7337f022ac9fec2e71b86ead582dea83c53e5ebb0e52b1fc68102d30052da54d048f7b15f35a11162aa92b66414d7991c SHA512 2809e55c9c496dc616a8cbc74d621b3e4675129a56b17a95e22d4b45491c83b9410634d6ad41d29c33bc43951ff47778b982bdec3560ec8d74c87d6cb0e5ee58
-EBUILD xf86-video-ati-9999.ebuild 920 BLAKE2B c06cc4ea53386909fb56a78c0fda7d395fb8b47bb98e490b176691cac9a8bb1f45e3de06668ca4fa671194c22082d7ce979f67a91bba4e8dba0a8b2b68c08616 SHA512 681a6e97265ec898beadd1e2d059dcda7b51d05bb826ef87202d8ac54bf24ad10b3ba69da5adbfbb5db89c0808a5c3ce78e15fd6522df467571cae89679dbbae
+EBUILD xf86-video-ati-19.1.0-r1.ebuild 1045 BLAKE2B 20e78608219b1463b50a29c8d4c2029977f88f0384edc4654fa13b3cf426d91a764a13962564caf8781fd130ce786a61e5183c1d203c80b499d073567768b599 SHA512 2b4ce75a42df2b4834a3757fda81c6574d5f1f96bfb73fc0114730c158b2a83958b386cc88681ed505073c8a2f937f7ed0dfe8542bec8f0b636020270b0dd3f6
+EBUILD xf86-video-ati-9999.ebuild 927 BLAKE2B 8f7a08b1a5611794ee8fbde362d18419194652df60cdc0cb4bf8305452ba8724ef8ec3f09b9da24f893f637b0f8cd1d66d71279a0ee20ab3973d6cef4132047e SHA512 7235cbc467dbe3d4afd8f3ad64f89b22baa21e9e89fbfb6083c9dcad54cd097543b984febd55856c995268133fc7e618d9d088a1b3095ca68eeb0418ca1f8ac5
 MISC metadata.xml 348 BLAKE2B 0ed12610bdc3e8f9c2e7003dd1bf16205d93eadd4cfc351372d4de3c171f73aed35f6c4414dec5b7b4b74f6e76dce856db29444ec87c0107e93f6b371e80b318 SHA512 e7855c0f6284d91f98075c9d33eeb7b783f2a9d94cc1cd4b3218f95ea1202585c5a40cac212f33b927815a90ef29f4ec36cf186529db50da7d076f305effba81
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
index 6927f556abf2..07a7e42694b1 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit linux-info xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index 159d57fa1154..22590fa5482b 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit linux-info xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 464eb7bec8fe..ddf6659de4b2 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 01ae44d42dc8..e8324761803f 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -2,7 +2,7 @@ AUX 1.17.8-tee-Fix-cairo-wrapper-functions.patch 3881 BLAKE2B 3d1d7f000480dceab9
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
 DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
-EBUILD cairo-1.17.6-r1.ebuild 2376 BLAKE2B fd6b60d13fbf25144dc0f1768b11158382ac479b9d3a744f7c1cbb479b3ccaab91c4a1c22a32baa1225723ad6f8128f4f2c26408bfcad5f4e488f21f670cb5cd SHA512 e41cc197e10ce04c0251fed134c38d6a7d33d568525940d9cebb3c98c1764b4d8cc0fea666b78002e09c9ef9aedb99f7291d6e429eec61490245da02793fa7e2
+EBUILD cairo-1.17.6-r1.ebuild 2375 BLAKE2B ac648f13bff7a929d4121ec3095d2bf58b320bf37440bb49ee2d373defb28bc29219de0885f3f6397fa3adfe296f73e8aa74a05aa000e87ac4171478b694771c SHA512 289c1424811ea0d8605a07015e60aa0f71bd2988b6c7581f126dfc6e386bfbc78860fb3ab95a575c632c5783f60da5b8300841f5804a15bfe68eaf94e7030c99
 EBUILD cairo-1.17.6.ebuild 2835 BLAKE2B 6d3239007d7bfa930aef8921756a95f68fafc4e316d48c9e65333313779f8fdb9839505dac7067869511b2f81336dbba254f8c2b366ddcb2f3937c809a3666c8 SHA512 a8195ce1e421200eca17618fcd768697ae78910deae20e97e8644cb1476ca1dd82979d8835902bd5a870855d099e98123fa8318fbf2e0ec819ab539bce9b52ea
 EBUILD cairo-1.17.8.ebuild 2474 BLAKE2B beeddbbc81d1bb0417ecdccfc5b38006f98da053ca32e3d0c9057631a37d043f14caafac72052278825225a71b0133fc9132f0cf711d8be508fc016c90daec0e SHA512 f2df956be6c98db0aced517832e5ba7125bf626295860c4f4c0f69ef381b72c5ad8698a8bd31819c402721f3dc9bc657f35cca7317d2f54ba251284d061ec496
 EBUILD cairo-9999.ebuild 2382 BLAKE2B b8f4df85966a21baa6bb29f18f8f969e2a839b79aa9dd7513a497341e7ae6ad518f297094f3cec4a74bf24af910421ecec23f16be6f4c4ae97e0d923aad4c861 SHA512 1f69ef6585c3e33deef78806fc35fa35fb39e56d7eadc39b6c92e831a8f18ad69eb026e13fe0d313b5e2205e8de2e8ccd39ba509847e32e5a8625fad8e1905b7
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 3b2e47825c19..b5f91f28230d 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 0a56490fcaec..ceb77829fbe8 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -7,5 +7,5 @@ DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901
 EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32
 EBUILD libX11-1.8.1.ebuild 966 BLAKE2B 4ad188c9d7030b656da151da82ecb7cd776deae774c5809e79a7a3f3fbd34ef0d7b54c822b4f7d748fc881293366b1c5e89817ce19e00c701e1d8186c9d40982 SHA512 5f361d9291ad4c0f04d6449efe244196c612bfbb3ba6342ca2da45dab3c169e306302e0e200ecd60d9a1bcc0e94cf9781807d9bf60f6573012b444d0d258800b
 EBUILD libX11-1.8.3-r1.ebuild 1077 BLAKE2B f240ab8a5fff1bea892e6636e780b66ef9ef639399dad44651cac05a86b23bb2fdee75721b40b29116860296e87b8e9fee124c9ed76cc7b82dc90fd0571ce834 SHA512 9ae6a254edb95cbaff3d0de9c7d6966fbc6718d4dfc1a8f3eda427a7e9e6df0816ddf8d1cace87cb25763aa635b65c4ae33639ff9d45d60263a6174322c6b276
-EBUILD libX11-1.8.4.ebuild 968 BLAKE2B 766d6937e978f725b48b869b44742a2465cf266aff396daf94af2d0c3d51280be22ae927180b1b24d74d0cef5874b8d5a125a7a2a91432b110a7ae7e0a4b826e SHA512 55b8a904419c3204acbdb6464b685ce6bd7af20d7e3dfe054bf59738abfb14da17e9bca9665a476e22238d3433192c0574d232bfeca664a0a97de5344b8397d7
+EBUILD libX11-1.8.4.ebuild 967 BLAKE2B 758e030f4f0133b27d2a579a2d3447d1188f5008991287e1c2625292e459d8d965cb63b4c33b991780f9b36a5812c8edccea66e2d9f0eea065f3489465855a9f SHA512 fc8063827e672268c5149d949ab8580abcd333f5f48b07b528d8c362a5ab11260488223f05c39954bd2070005a3003574a9c18055d43d259e36fbbfc13297aad
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-libs/libX11/libX11-1.8.4.ebuild b/x11-libs/libX11/libX11-1.8.4.ebuild
index 6000cbf08f70..ed0fedb4f2b2 100644
--- a/x11-libs/libX11/libX11-1.8.4.ebuild
+++ b/x11-libs/libX11/libX11-1.8.4.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 78a7ddb80aac..8b542b37d946 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.114.tar.xz 471664 BLAKE2B d44d51311d2d33dd77f467c508448ac26e1561720535215eac5f834545eae2dd0a8842465bd78b8441cdf5f0931e9b51e000a4bdddd9b07a099ee6e88c99daee SHA512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644
 DIST libdrm-2.4.115.tar.xz 469952 BLAKE2B d4f794823476ca9c2e0383c0505cd787adad52b6873ba0fee913a861ebc7970a51524902aa0a2685ce2c5939fc6f9a71c5d1ad24d1f93407385b09255f701c06 SHA512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd
 EBUILD libdrm-2.4.114.ebuild 2035 BLAKE2B 14f6a8d2b8a67a539218253e0e4dbc0916bcf4e5505e25321343df4c64dc7c99b87c40dbb7ee6400154fbbd4b8307b18bf4ebd4d1b4e45062a563510e2d7bdad SHA512 653b3a84f9093617a9e931e437f087fdb0582b40edadc3c3b1e791432a88c95d16e50a0ca50ed03f17d14876336e99fe1679b04baa7f218cc3e01a889283ffeb
-EBUILD libdrm-2.4.115.ebuild 2037 BLAKE2B 997cd902cee2fd360691129b67ca4449ec68cfe458760b4ba174ae28bdba7bb3f686d38a23cf10be8791c83e02ed0dbe986fb10746b2cbb0b646f71dc58bef6d SHA512 ed6ff56b0dc25c9b05f6b699fea1ea01dbb9bc7ecc1473d1d92a1328c22ae2ee0f799473f56ed7f1366e44ca6a8e35bf6ad50efaac8147c1b40cb2bf890daa48
+EBUILD libdrm-2.4.115.ebuild 2036 BLAKE2B f70d99b9efa9970124383e308086a9ef08456fb7c266a37d9396b52345f3c42fae10f40b83d14d3b867b31792a890be8523cef20b6a1ec5d0c5d60e1b6720041 SHA512 f7cadeada3f06625346e8132459b8f0673a0022c129ae4be608d499b18b8a7575beeae5a331b558d487665b0b58f31c857c18cd4afe2143e0440ae21dea7bc9f
 EBUILD libdrm-9999.ebuild 2043 BLAKE2B 08c02f826b65ba9642b77144a66becac0ade63135db1a1c5e97a28c18aa61eff4e5b0d4e273c41928b214590f898cc68d247c5adcefcf6adc94f296dbdd2cb64 SHA512 dc5f4d8fb72b7a64735eb05432bb672c679bccbf38eb24cc0f1452d2287cee8904a56d93e0442c773ec0635d16c8bb67a8e1088d9a45349961d307c43007006c
 MISC metadata.xml 413 BLAKE2B ffe1394ed3fb669c1ee0c1c0ebee429a80aac7dd3a3086316703784f991ef3a6e663c3c29a828bc75f53e9a35abd8bf84421dcde0765cb6f9ef7c473c4f2a7b5 SHA512 e5e802e47f115161f521ddaf0fda3196a43454f8d741de176676a1adce61dbf7db001491d79a466ab8b9e67f4b61e3803f0ce1a2c5f14ab84d51f746bee3e6ee
diff --git a/x11-libs/libdrm/libdrm-2.4.115.ebuild b/x11-libs/libdrm/libdrm-2.4.115.ebuild
index 326182ae7388..7473e6ec5cdc 100644
--- a/x11-libs/libdrm/libdrm-2.4.115.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.115.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index a447321a2d3e..d2e55bd18242 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
 DIST libxkbcommon-1.5.0.tar.xz 472700 BLAKE2B 5dcfb514c297f71629f20b444cb29c5d26ce9def1c1173a125fb0c0c259d76194fcef7a407d8efda2d2d87c9b90abac34e2fc1742cfd6053df511a3ef205c8ef SHA512 bbba6665f052c04c7450413cc5e2badd6bfd41326b0e4c60e3ec01d730cae695fd34ce2662b8a91ece7a76b974a0ea330f7462dd5d2db148b0d0da26264ced9c
 EBUILD libxkbcommon-1.4.1.ebuild 1545 BLAKE2B 5e29f0895283950ad58c7bd6b9d709a348d5f22cf782cfb4e73cc1077c085487991b4f5b81bf791b92e6a9ae7bbfb9228ca25394fe740d80475cb62f06d6e4c0 SHA512 8df3fdfea85c722405072e28ff0e7f1c7f1c09b8a955ba8ac02fd492425c8c918fc32fff317f2ec7fb70d022c5b2b634644c82ca1153e91f5145909f35cf9c94
-EBUILD libxkbcommon-1.5.0.ebuild 1691 BLAKE2B a7982b75271c903585b707cade7df5106f3b7630cd0ed69d91cba4f8a613d7f01d2909ace0dc40376bf82e7ffbfe284a5a8e42230843f3f96ebf6bad82359c36 SHA512 334df1e5843e47c47aa93bd19d4dc69a191c05a1528c4e6737544acbf12f3d89cc635c97698aa7f7d71cab00e5efe3ab960c2ff12444e0457a415858d0acf84d
+EBUILD libxkbcommon-1.5.0.ebuild 1690 BLAKE2B 08034eaf8604610f903d68cd2c3a341c7ba0aa9609cb171c4b2d3d016b22b007fe1bbb3e0a8a9bd6aaaf1f658e2c5b882efa884bebc62cac5c43b8f719f8e676 SHA512 f4a0370430c3581ba0977bdc7800ca7bc709a0c80be7d08e4c834813e116a73493176f4ccca6fd4057a1df9fa9d636b023979a2c1b24ab310420a1934050ae41
 MISC metadata.xml 470 BLAKE2B 4edc4923d3888c12474fb659cf1fb1177c600fba9e8fd34fd6be284c979313bb3282d0fa9084c0aee29d9413e68947dd0ee2d241af4e78b2eb06887d2d684f6b SHA512 e19a6e154a79578d5641dfdbef8e963794b14ef0b0f63450dba2d24044e83b517991a72d81598420567978dcecb9d4e4f0eb9e4cf63e0b562d3e41aa80b39a87
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
index 6c92e0eb15c8..ee16ebb31428 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 6e12f91cf422..dceecaf0f178 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index af8fd91b7611..a83f4dc220d0 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.8.3.tar.xz 1811712 BLAKE2B 0adc92c13ba4bdec5d927349ca8c02adbb851eb376f19aa5f39e13caddb36c089be227c1f2dc61b34f882aae794f2b46ae237345c12c8e897be8df01e9fb3ef2 SHA512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325
 DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901c2054c309bce1f1b3eb690704193e18cd470f682c663090210b14a9498b9259b6acc0e902053e7ab0ca9df076 SHA512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e
 EBUILD compose-tables-1.8.3.ebuild 950 BLAKE2B 8f1e0b0e2a697c5afb72e8bee632227d8ea8d72275f42c38063a8e7b72571e62722bb7317deb7d488027cf85e792a34949933b9b47c3fdec1b63f8dd39ed2d40 SHA512 15b24815e8d5aa31e9282807ffa8233d6c4b7eab2bfde298c8c47c22c7adc6d64c46abfbdfc09f06501459eb53313fa911b52082e2fce5c964b356fda6903989
-EBUILD compose-tables-1.8.4.ebuild 929 BLAKE2B ad4a417d064152be63d7e45c03cb5842fc9e981da27ef8c0675ef0357cc1ef0900f847931b47ceaa145b4492171aea19547e6088756884d815f7ff5d683ba4ce SHA512 2508f570d25e81c0b88b794914e7ce90ebde5c04900e4b119ab94533412852cde06a26639b8d9a7a7a860c6b897cb108bbd017b179eb19997f0f0341e4606fa6
+EBUILD compose-tables-1.8.4.ebuild 928 BLAKE2B 6c1248fa2e8bd8a5c24e6f99498b333be6dc9802bea86dd340acf13767e1d30e56ad053c87b747726b0feac51452b84015c8487769382bdd99219f4f6971e21d SHA512 4e2520de6ffa7c7e9251581415f6830bb34dbe103047f666443524ffc3faa224db0e18b04059d718027dffb8a28d427f9f123f0131327db633a612c68a6f35df
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
index 2ddfe90f3568..478b326cd7c4 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index ba109acf4bdf..605f9107601d 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -1,6 +1,6 @@
 DIST screenkey-1.5.tar.gz 87449 BLAKE2B 1ca3a7d643c65e2a82ce51feb4de022ccb0bb35848c0bb63871343b499e4b7a677e7df379ad259c149ba4a93d98cc36a05d9fb58976cc96d20b3fe98b54301db SHA512 bc9457b17c9e2fea3cefc97546dfd89a019a527608ec79960d1a712c1f1bbc97cf37404a1d84ca1c4587ae4d52163e2de30797f75b9a4a1da45ac585b8b650cf
 DIST screenkey-1.5_p20230109.tar.bz2 77229 BLAKE2B 8b6d089bdecbbd0d9057ccad12d72321de5b9c6df60785398e15e9196b21fec2b88e27b2e068c53caf5c699ed7b7dcd3bacfbdf86d14b3c4c4a3b2125dfa66c7 SHA512 b6b5121c2b4f68cd8df409176e32019b0747da637c6baa7f45d6268c1605144d32cb099aa16a91748ae672d6386be2579af1bef167488bcdc5e1b452d39d2eee
 EBUILD screenkey-1.5-r3.ebuild 1145 BLAKE2B 17ccbbb3ec9f77b92a9747f8b5e796f2578b223a3c8150c7abf7f65693cdf02b772a6f2c41ebde538679ca8ebf572d0085bfab78ff4e2e32f0c154cfea9d0a39 SHA512 b345776cc963da579516881a2715f983f7a18874e1fd25c3a3dce6ed9debd8ff447737b95b55e184aae320d3b3f6f074789c7caf8404eafd36670fde6e5ae2a0
-EBUILD screenkey-1.5_p20230109.ebuild 1354 BLAKE2B 269021c918a6243ac4bfc0b213cc9379cf5ac728922d662c7ecff3688c783c7f9d5effa8f497ecd9c41f409c836f51b0440fca907eb5476168468e3c15a3f6f2 SHA512 e11d92b05e5a539df88b1f221e658403537db88d3152a48af7760f8d962bf7a86c7e9485c9ec3668f86360ecc3548d1cd412e66184eaab96157097dceca0c430
+EBUILD screenkey-1.5_p20230109.ebuild 1374 BLAKE2B c31ccf51ec8b3d9763ed8d6d658ae4cf2e8159908afc896cdb582a68ce6a6c7e89dfd5a76af144da6b654fd56fd96bdfb52c011a19f59ba3507cfcffbf3572ac SHA512 3e35d591a208f62e8dc6431731479d64a97bd58ae255aa92102fbdce175a174564d900d6291fdd5020d117337a577ee7844644d3fb70c48a8e11158f2b594a6f
 EBUILD screenkey-9999.ebuild 1135 BLAKE2B b65651d64929280dba1f59bb31a1f2128ca7d4fb52103e8bcfbf001f6eb42fb738a415edc94270336d71c31dcfc7a486f38829734a1bad839de36e631a7805d4 SHA512 b1ebda18b3f28afbaffa0c12e77e4ebd4dba528f126cbf2ab1c129c8b7f59685ad21a3810652bf932ac6b11e5447b733cde36848b203ed4ed2395c8f391c8c76
 MISC metadata.xml 1167 BLAKE2B 1f1ca63024956673f5c59d67e7068371801b667d888203e7c28ecb6c0d5d09fcb94385046cb6daef8fb04abb7b6445fcdd80d01a1a76e814df8bd32c40cbf50c SHA512 eed4308686053b4b093e99abae19c3eb4fe8941b4b098cb589be90dfacaed717e2f81a37769b358afc1c33474591baf1c3506a9d0914f523a855abe400974cc7
diff --git a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
index 065d94897723..d9ae207590c5 100644
--- a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
@@ -16,10 +16,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 else
 	if [[ ${PV} == *_p20230109 ]] ; then
-		H=7bdba66574244061c6e1934c4f204d02d570f182
-		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${H}/${PN}-${H}.tar.bz2
+		COMMIT=7bdba66574244061c6e1934c4f204d02d570f182
+		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2
 			-> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${H}
+		S="${WORKDIR}"/${PN}-${COMMIT}
 	else
 		SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
 			-> ${P}.tar.bz2"
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index 7f27558d32af..03368f453e76 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1,3 +1,4 @@
 DIST 0.5-63.tar.gz 784093 BLAKE2B eef6fe3749137ac44cddb730549ca4eeed240d17bd7c4d0ac5b70f95e16f5eb57590a22a87150fabac31051219837aeeef32869f07d5def37784526181a3dd32 SHA512 ddf303dc873d38c4e5f8b2026f70088d40cb82ea2a10c91bd9c21938467fb797dd6bae3211b82cb2328fa212f880d878f2a799c2688da725ac5a448a11c3244d
 EBUILD sunflower-0.5-r1.ebuild 898 BLAKE2B 916d0b59dda275ee0ce346862df39daf7e0a6a9e46930b89e43df1ffc60b3db0d36cbe7da221c38f15221219a9b36988b8d381a665abd2c376d8cdf02d501c8b SHA512 9606bdfe7bddc62ad7425b67ea239af208b96c0b1c6f227a37d4cf282198c776d5bec8fa50970cf1f2308bc75c26fae9fc9106befef225471c9a27883e518f00
+EBUILD sunflower-0.5-r2.ebuild 932 BLAKE2B c5dca9d46221a203b55f48419450cb2f422ac0f9b4113e3205b42eebd0861f1950018d7c45d278461e57bb05a3f3e20d7606fbcca096ac4f2c70526385ccacdc SHA512 6267fe189c8e470ae4316762ac995643dfc7b2abe13b81ac608ebee8e118ddf0a5ec5a3e37b68fa0ab206d8dffc5c20c30fdb77856137a1dfc987ecabfaa8f4f
 MISC metadata.xml 392 BLAKE2B 498b8cd3367b270a4cbe2df3dba2610f063e5bd3535aca45aa5a629cac2f6d9749b6abbeb07649508b6ebba42febda98741d806f591c40923bd1067ad4f14836 SHA512 42df4158ccd4ca4fe77ebbd6aacd59391363dc4c0cd9a2c379ae582ae9c70e5d65468cbc1e1141dcba16fb55a0859ea8d1f0856573ba51b53001a495cd9e1149
diff --git a/x11-misc/sunflower/sunflower-0.5-r2.ebuild b/x11-misc/sunflower/sunflower-0.5-r2.ebuild
new file mode 100644
index 000000000000..e1ad6bd9575d
--- /dev/null
+++ b/x11-misc/sunflower/sunflower-0.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517="setuptools"
+inherit distutils-r1 xdg
+
+MY_PN="Sunflower"
+MY_PV="${PV}-63"
+
+DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
+HOMEPAGE="https://github.com/MeanEYE/Sunflower
+	https://sunflower-fm.org/"
+SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/vte
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# Upstream's get_version requires a lot of BDEPENDS we do not want.
+	sed 's%version=get_version()%version="0.5"%g' -i setup.py
+}
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index c8a29f1a4595..7a28ec1f9b3a 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -6,5 +6,5 @@ AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd
 AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
 EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B bd09726103477c85a99d17cfcac65a00c0a139869a3fdd1178b8e662750663d329c6bc79c9f9213e59af7f391534faff42a9a7aca320c04798f5d000bd34d529 SHA512 462d5a2667996c6ee532e992d734a9c3d850fabf86be33b6f707daa450277afe42604669395f9c58a8fbe7a558e1303cb92a7014275363025f4b4319022b7484
-EBUILD trayer-1.0-r5.ebuild 1094 BLAKE2B c79d1527ebb8423a3bcb3dd6392ed247d7d9c6678996b78c144b3b45404d3d65de672c44ef3a8eb0e6cf2a3dafb5cb3b368db36bd1b24b444f54a64aba01f335 SHA512 36a4ec9dda1a4e98ac899bc505d3c0be2e98f73a9d66e20fef0accbe4d7b3f67fec19208ad272a6eb808b71e3f1b9610e3a73ad5942acda9fd06f1811ed60343
+EBUILD trayer-1.0-r5.ebuild 1092 BLAKE2B b53467b7b57f60e5ab725916156701e1cbcb86edbcae41e3bc54116cf2cad8a8a9bb96a6a598852e48f0b4fd806dc97067ec96c0174767a646ac8271f0ed67ec SHA512 552353b8f4b61810849232aa4765b077724153f3cf9cd58e08ca88d00e36c131062e0f1ad9aaa522a9cd83446e3178b3fe01fae5f5f78c1db8e434a6b8e72a69
 MISC metadata.xml 221 BLAKE2B 2bdd4cc2d7f7a4fb627addf3608926b0ec64c4e8f5b764c625482fa803b883ccc5a4d89ce3f0190bbd5772ed719455c46ffd6c4674adcff6044642ce50d8592d SHA512 4d656cd01a75b528e757bfda686503d56ec9753562c6c52fedbd1f897285fd6cce36da0beba020875e29b8e240821456a4ebf26ccda72b8aac6456d8aa8b6a8c
diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild
index 502fad6ac538..0eb7ae28ba83 100644
--- a/x11-misc/trayer/trayer-1.0-r5.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gdk-pixbuf:2
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index a04070acdb0b..8df2c5675986 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,5 +1,5 @@
 DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2
 DIST util-macros-1.20.0.tar.xz 83324 BLAKE2B a19784078ff3043d9d54ef88738625a08285bb033e27713c05875135b39e9f5c1a38aa05c3d74c167d974a07611621f57c70e988e5fb024bb475575355c3f380 SHA512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb
 EBUILD util-macros-1.19.3.ebuild 710 BLAKE2B 76fe57383e1f5eb715092ac442c54b38dd038037adcb8a2c2c67be1f53c07deb66341352e56c4b670e9e1ce974d0c883ad8b0e1088a4a99801587155fba43e48 SHA512 52484762335a47dae0561001f8745a6cee5205b348eab602af51acfeb57e4ed8458222eea1853a6ea6651191e8b1282759d8649f3f89f988c160f4c0a8a6739f
-EBUILD util-macros-1.20.0.ebuild 708 BLAKE2B 6fed9f15751b72df5fc27e8d393ea122fc5a58fc91464e4de931b828f80e3193530e038c775e8cb66e876db40bb5c107b3e829a5ab76e970ee3ef2996453ef22 SHA512 c593e9e6242022c3fc2a1e92d35bb2165da0b9ecc96fccb455f120a5e297bf54162147db093a4ab7e5aab8f7e7ae9a5f00fcddd1c0382e3fd9aa905ac899ecc7
+EBUILD util-macros-1.20.0.ebuild 707 BLAKE2B 4315fba5d1e565247d4090cf8dff30317c962a496429720f78081c07667d41ac54d058d63e2130858d17df8725e62ffbf80580e855850f913c02538538a148a0 SHA512 6c90a71c661be2ab5a0d266f201227601b679ce50243f96c63e5e23559e08f75c57c1bf3817147f5c0c31970859e60b92ac20c36232aa97e34997bc69ec01384
 MISC metadata.xml 338 BLAKE2B dcc620ca4e58f9d0464530f7915fb50e995dcae1b334b7d0fb3044cbaee39592ba7d86ed925d9ff3e72f1236ef378887deb41e9102a4c3d543f43aebeaa2e105 SHA512 d3be3477539efb8765b1249e87ed842f7c1db9b10799a9569c68d6ec1bd0386ddd192556265a43eb401aeee30f52c8906c05871877814de9d9cf7c9ef5187c36
diff --git a/x11-misc/util-macros/util-macros-1.20.0.ebuild b/x11-misc/util-macros/util-macros-1.20.0.ebuild
index 8637acc63649..f27b305bc224 100644
--- a/x11-misc/util-macros/util-macros-1.20.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
index d82eb650869f..78522b43433c 100644
--- a/x11-misc/xdaliclock/Manifest
+++ b/x11-misc/xdaliclock/Manifest
@@ -2,5 +2,5 @@ AUX xdaliclock-2.47-DESTDIR.patch 2491 BLAKE2B 344b641ada19f3b1bea8b33763d29abdb
 DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00
 DIST xdaliclock-2.47.tar.gz 3410612 BLAKE2B 64d2e98693f055887959c34021a3e595bd46fb8ba453c58af76d78977a2d7b6a0092c9c9e174c53d65b7af5723e9fb3c434a48e4d39f2986dac8d6b80f3fa9f7 SHA512 d51930240170bad5694cc502251aeb88aed8b78cee086bda704624c2599acf94e30368a971f26eb59a824df3273b6eb58c6fd2017684f8f421d678828e41db7f
 EBUILD xdaliclock-2.44.ebuild 564 BLAKE2B e7172ff53cae7387405df0e28dbefd821f8b1253a4eea40c0e00c5d454d5b4751d35c662ecdc92a75a1e5c40cc1fafd33c60519bb0080ad9588f1f30ca030a45 SHA512 6214287b3dbefe1c573ed1ffa2f667f88d6dc396ee0898e275cf055bff54b1b9e4f042f795ec4f79d0d125f007d8ce9c056623a1125c34cae11440c54acdf3ae
-EBUILD xdaliclock-2.47.ebuild 1103 BLAKE2B 87bc6f604b153be8b9261e66b4264a0f9f1b6f6267af03818851594afd1e8f89af51c77e456cf2300342236fa088c64e9fcaca07d7e10e5a19452f70aa0d8c96 SHA512 71ee73d2c8e652e3796a6b0f496262a052c74c7e3e00c356ca172de42047e7d8bf6860d591365c64eeffb89ed43a58006c5cbcd4b5d0d57726f01a79bf1c7f95
+EBUILD xdaliclock-2.47.ebuild 1102 BLAKE2B 7f0845de239bb1f07dee06a44a4a9a75b425cccbe84c1426785d39193836ee122fdc335b30a548474fa942f529ddb32bd44ec930a5df0ccdb9140c2f9fb8c142 SHA512 c79cd509e2c725025ccd54fe53d9868aac22ccc6c29ac9ea689c8dc3d048d7f69be4d54524b77d46d7b938c5e9b077793648f648036e93e5df5f26b43a5c406b
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
index 52fc4e245729..e7424ed71cb4 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/X11
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4d0dad82c84f..add7e109901a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 4cc6d652c930..4cc4bef8236b 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,3 +1,4 @@
 DIST page-1.9.10.tar.gz 550021 BLAKE2B e42ce482b9f7da70f69fa08557e7327d51a8a02a6e4d76adb9a50787ae20fe0bfe22e25bc9413156c0812f6708fe7e0e1c2e59e6bd9d7a16be8f52caf6a3ab34 SHA512 243d59d66d4a57a2141ebc953a271b9dd0202fd495a5aabb4245cb7d9979b97438a16a5f19c1eecea3596252ee68dd96a1a6fd052e4b706ab2c62678a5d3a9f0
+EBUILD page-1.9.10-r1.ebuild 1289 BLAKE2B 6dde9a63dc77e0a6f8e0a542afe81cba616f1bf655f1d1d00fa9e1c1310401cf766478ec036b1698a4a9976eb833dabd2a8271a5829e74dc81aa98294c803fc8 SHA512 200ced23d9efa8fe22e61df6383ed9bb3fd8f93f24a066dccb8f116b6b5e165a30a382720d392ffafba0bfd24f785604d7bd9d105ad7b1fb55a89b28006e17d6
 EBUILD page-1.9.10.ebuild 1301 BLAKE2B 36c33478163aa1fbeb6f01f4b945b7f516cac4b1986a390fb24f002b96919a7baf5c5262e962a31a973241e51744f293d1ba6f15a8c63db5f82bd2e275aa3e24 SHA512 86b75b18356cd8a0b650ab9939e370d9f1eb0053058250eee915faa9556ae3b63008d0c21540fd7d837ce7ece8af95ca42fa3de8ccb0ee30f48712c7066887bb
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.10-r1.ebuild b/x11-wm/page/page-1.9.10-r1.ebuild
new file mode 100644
index 000000000000..9dcfac0380fd
--- /dev/null
+++ b/x11-wm/page/page-1.9.10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="https://github.com/gschwind/page"
+SRC_URI="https://github.com/gschwind/page/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11
+	>=x11-libs/xcb-util-0.4.0
+	>=x11-libs/libXfixes-5.0.3
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXrandr-1.5.1
+	>=x11-libs/libXcomposite-0.4.4-r1
+	>=x11-libs/libXrender-0.9.10
+	>=x11-libs/libXext-1.3.3
+	>=x11-libs/cairo-1.14.6[X]
+	>=x11-libs/pango-1.40.5
+	>=dev-libs/glib-2.50.3-r1:2"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.12-r2
+	x11-base/xorg-proto"
+
+src_install() {
+	default
+
+	# Solves file collision with dev-tcltk/tcllib, bug #574074
+	ebegin "Changing references from 'page' to 'pagewm'"
+	mv "${ED}"/usr/bin/page "${ED}"/usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${ED}"/usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	eend $?
+}
+
+pkg_postinst() {
+	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
+	elog "see the following bug report: https://bugs.gentoo.org/574074."
+}